summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2014-09-24 16:45:03 +0200
committerErich Eckner <git@eckner.net>2014-09-24 16:45:03 +0200
commit77672c5be2dc0e07c67cb9d3b039572d58082511 (patch)
tree01e8e757da61616e248e2f670173ba075f219bae
parentdf39e91c2ceba6bc3595e9b718bf513599e6fab7 (diff)
downloadROM-77672c5be2dc0e07c67cb9d3b039572d58082511.tar.xz
Eingangspuls flippen statt reflektiertem Puls (sieht in den Diagrammen
sinnvoller aus) Amplituden mit Faktor korrigieren
-rw-r--r--ROM.lpr2
-rw-r--r--ROM.lps80
-rw-r--r--romunit.pas6
3 files changed, 44 insertions, 44 deletions
diff --git a/ROM.lpr b/ROM.lpr
index 98ead8c..38ae920 100644
--- a/ROM.lpr
+++ b/ROM.lpr
@@ -201,7 +201,7 @@ begin
interpoliere(inPulsO);
interpoliere(refPulsO);
writeln(stderr,' fertig');
- flip(refPulsO);
+ flip(inPulsO);
integrate(inPulsO,inPuls);
integrate(refPulsO,refPuls);
removeLinearOffset(inPuls);
diff --git a/ROM.lps b/ROM.lps
index 6c4702e..d5de911 100644
--- a/ROM.lps
+++ b/ROM.lps
@@ -11,8 +11,8 @@
<IsVisibleTab Value="True"/>
<EditorIndex Value="0"/>
<WindowIndex Value="0"/>
- <TopLine Value="36"/>
- <CursorPos X="25" Y="59"/>
+ <TopLine Value="174"/>
+ <CursorPos X="10" Y="204"/>
<UsageCount Value="94"/>
<Loaded Value="True"/>
</Unit0>
@@ -22,8 +22,8 @@
<UnitName Value="romunit"/>
<EditorIndex Value="1"/>
<WindowIndex Value="0"/>
- <TopLine Value="689"/>
- <CursorPos X="1" Y="1019"/>
+ <TopLine Value="37"/>
+ <CursorPos X="13" Y="62"/>
<FoldState Value=" T3iD041 pkRkZ0Y2]9clZ093 piXj70G]Rj3jN0w6]9UlG0S[I4Ck10P7]aejg]+l"/>
<UsageCount Value="94"/>
<Loaded Value="True"/>
@@ -46,123 +46,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="romunit.pas"/>
- <Caret Line="1001" Column="69" TopLine="946"/>
+ <Caret Line="987" Column="11" TopLine="947"/>
</Position1>
<Position2>
<Filename Value="romunit.pas"/>
- <Caret Line="987" Column="11" TopLine="947"/>
+ <Caret Line="32" Column="33" TopLine="22"/>
</Position2>
<Position3>
<Filename Value="romunit.pas"/>
- <Caret Line="32" Column="33" TopLine="22"/>
+ <Caret Line="992" Column="42" TopLine="947"/>
</Position3>
<Position4>
<Filename Value="romunit.pas"/>
- <Caret Line="992" Column="42" TopLine="947"/>
+ <Caret Line="1003" Column="53" TopLine="973"/>
</Position4>
<Position5>
<Filename Value="romunit.pas"/>
- <Caret Line="1003" Column="53" TopLine="973"/>
+ <Caret Line="1001" Column="79" TopLine="719"/>
</Position5>
<Position6>
- <Filename Value="romunit.pas"/>
- <Caret Line="1001" Column="79" TopLine="719"/>
+ <Filename Value="ROM.lpr"/>
+ <Caret Line="20" Column="55" TopLine="10"/>
</Position6>
<Position7>
<Filename Value="ROM.lpr"/>
- <Caret Line="20" Column="55" TopLine="10"/>
+ <Caret Line="24" Column="52" TopLine="5"/>
</Position7>
<Position8>
<Filename Value="ROM.lpr"/>
- <Caret Line="24" Column="52" TopLine="5"/>
+ <Caret Line="20" Column="24" TopLine="12"/>
</Position8>
<Position9>
<Filename Value="ROM.lpr"/>
- <Caret Line="20" Column="24" TopLine="12"/>
+ <Caret Line="38" Column="14" TopLine="24"/>
</Position9>
<Position10>
<Filename Value="ROM.lpr"/>
- <Caret Line="38" Column="14" TopLine="24"/>
+ <Caret Line="163" Column="40" TopLine="121"/>
</Position10>
<Position11>
<Filename Value="ROM.lpr"/>
- <Caret Line="163" Column="40" TopLine="121"/>
+ <Caret Line="206" Column="1" TopLine="191"/>
</Position11>
<Position12>
<Filename Value="ROM.lpr"/>
- <Caret Line="206" Column="1" TopLine="191"/>
+ <Caret Line="20" Column="56" TopLine="1"/>
</Position12>
<Position13>
<Filename Value="ROM.lpr"/>
- <Caret Line="20" Column="56" TopLine="1"/>
+ <Caret Line="196" Column="45" TopLine="175"/>
</Position13>
<Position14>
<Filename Value="ROM.lpr"/>
- <Caret Line="196" Column="45" TopLine="175"/>
+ <Caret Line="199" Column="15" TopLine="178"/>
</Position14>
<Position15>
<Filename Value="ROM.lpr"/>
- <Caret Line="199" Column="15" TopLine="178"/>
+ <Caret Line="201" Column="15" TopLine="180"/>
</Position15>
<Position16>
<Filename Value="ROM.lpr"/>
- <Caret Line="201" Column="15" TopLine="180"/>
+ <Caret Line="203" Column="34" TopLine="182"/>
</Position16>
<Position17>
<Filename Value="ROM.lpr"/>
- <Caret Line="203" Column="34" TopLine="182"/>
+ <Caret Line="208" Column="18" TopLine="187"/>
</Position17>
<Position18>
<Filename Value="ROM.lpr"/>
- <Caret Line="208" Column="18" TopLine="187"/>
+ <Caret Line="157" Column="45" TopLine="127"/>
</Position18>
<Position19>
- <Filename Value="ROM.lpr"/>
- <Caret Line="157" Column="45" TopLine="127"/>
+ <Filename Value="romunit.pas"/>
+ <Caret Line="1005" Column="6" TopLine="816"/>
</Position19>
<Position20>
<Filename Value="romunit.pas"/>
- <Caret Line="1005" Column="6" TopLine="816"/>
+ <Caret Line="990" Column="1" TopLine="974"/>
</Position20>
<Position21>
<Filename Value="romunit.pas"/>
- <Caret Line="990" Column="1" TopLine="974"/>
+ <Caret Line="994" Column="45" TopLine="973"/>
</Position21>
<Position22>
<Filename Value="romunit.pas"/>
- <Caret Line="994" Column="45" TopLine="973"/>
+ <Caret Line="1003" Column="86" TopLine="974"/>
</Position22>
<Position23>
- <Filename Value="romunit.pas"/>
- <Caret Line="1003" Column="86" TopLine="974"/>
+ <Filename Value="ROM.lpr"/>
+ <Caret Line="208" Column="1" TopLine="204"/>
</Position23>
<Position24>
<Filename Value="ROM.lpr"/>
- <Caret Line="208" Column="1" TopLine="204"/>
+ <Caret Line="207" Column="47" TopLine="186"/>
</Position24>
<Position25>
<Filename Value="ROM.lpr"/>
- <Caret Line="207" Column="47" TopLine="186"/>
+ <Caret Line="70" Column="7" TopLine="28"/>
</Position25>
<Position26>
- <Filename Value="ROM.lpr"/>
- <Caret Line="70" Column="7" TopLine="28"/>
+ <Filename Value="romunit.pas"/>
+ <Caret Line="987" Column="101" TopLine="520"/>
</Position26>
<Position27>
<Filename Value="romunit.pas"/>
- <Caret Line="987" Column="101" TopLine="520"/>
+ <Caret Line="1028" Column="50" TopLine="521"/>
</Position27>
<Position28>
<Filename Value="romunit.pas"/>
- <Caret Line="1028" Column="50" TopLine="521"/>
+ <Caret Line="1024" Column="23" TopLine="759"/>
</Position28>
<Position29>
- <Filename Value="romunit.pas"/>
- <Caret Line="1024" Column="23" TopLine="759"/>
- </Position29>
- <Position30>
<Filename Value="ROM.lpr"/>
<Caret Line="63" Column="18" TopLine="25"/>
+ </Position29>
+ <Position30>
+ <Filename Value="romunit.pas"/>
+ <Caret Line="202" Column="50" TopLine="183"/>
</Position30>
</JumpHistory>
</ProjectSession>
diff --git a/romunit.pas b/romunit.pas
index 5e1bf79..132b1cb 100644
--- a/romunit.pas
+++ b/romunit.pas
@@ -115,7 +115,7 @@ begin
if odd(i shr 6) and (pos('.frequency :',s)=1) then begin
delete(s,1,pos(':',s));
while (length(s)>0) and (s[1]=' ') do
- delete(s,1,1); writeln('bla'+s+'blu');
+ delete(s,1,1);
factor:=strtofloat(s);
end;
case j of
@@ -194,12 +194,12 @@ begin
blockread(f,buff[0],sizeof(single)*steps); // fp
for k:=0 to steps-1 do begin
d1[k+length(d1)-steps].x:=(i-1+k/steps)*factor;
- d1[k+length(d1)-steps].y:=buff[k];
+ d1[k+length(d1)-steps].y:=buff[k]/factor;
end;
blockread(f,buff[0],sizeof(single)*steps); // fm
for k:=0 to steps-1 do begin
d2[k+length(d2)-steps].x:=(i-1+k/steps)*factor;
- d2[k+length(d2)-steps].y:=buff[k];
+ d2[k+length(d2)-steps].y:=buff[k]/factor;
end;
end;
for k:=0 to 7+2*byte(j<>0) do // (fp,fm,)gp,gm,ex,de,di,jx,jy,jz