Option eingefuegt, nur Phasenmodulation zu beachten

2 files changed, 80 insertions, 59 deletions

diff --git a/ROM.lpr b/ROM.lpr
index f7ca02c..ae493b2 100644
--- a/ROM.lpr
+++ b/ROM.lpr
@@ -15,7 +15,7 @@ uses
 var inPulsO,inPuls,refPulsO,refPuls,surTraj,cRefPuls:      tExtPointArray;
     smooth,betaSmooth:                                     longint;
     tmax,wmax,absShift,betaBound:                          extended;
-    force,fourier:                                         boolean;
+    force,fourier,mitAmplMod:                              boolean;
     f:                                                     textfile;
     s,t,u,lpicIn,rohIn,rohRef,outIn,outRef,outRefC,outSur: string;
 
@@ -34,6 +34,7 @@ begin
   absShift:=-1e9;
   betaBound:=0.95;
   fourier:=false;
+  mitAmplMod:=true;
 
   lpicIn:='';
   rohIn:='';
@@ -71,6 +72,15 @@ begin
       force:=false;
       continue;
     end;
+    if s='mit Amplitudenmodulation' then begin
+      mitAmplMod:=true;
+      continue;
+    end;
+    if (s='ohne Amplitudenmodulation') or
+       (s='nur Phasenmodulation') then begin
+      mitAmplMod:=false;
+      continue;
+    end;
     if pos('Glätte:',s)=1 then begin
       delete(s,1,pos(':',s));
       s:=trim(s);
@@ -202,8 +212,14 @@ begin
   interpoliere(refPulsO);
   writeln(stderr,' fertig');
   flip(inPulsO);
-  integrate(inPulsO,inPuls);
-  integrate(refPulsO,refPuls);
+  if mitAmplMod then begin
+    integrate(inPulsO,inPuls);
+    integrate(refPulsO,refPuls);
+  end
+  else begin
+    copyArray(inPulsO,inPuls);
+    copyArray(refPulsO,refPuls);
+  end;
   removeLinearOffset(inPuls);
   removeLinearOffset(refPuls);
   if smooth>1 then begin
diff --git a/ROM.lps b/ROM.lps
index 9211447..b493d4f 100644
--- a/ROM.lps
+++ b/ROM.lps
@@ -3,162 +3,167 @@
   <ProjectSession>
     <Version Value="9"/>
     <BuildModes Active="Default"/>
-    <Units Count="4">
+    <Units Count="5">
       <Unit0>
         <Filename Value="ROM.lpr"/>
         <IsPartOfProject Value="True"/>
-        <IsVisibleTab Value="True"/>
-        <CursorPos X="26" Y="13"/>
-        <UsageCount Value="94"/>
+        <TopLine Value="221"/>
+        <CursorPos X="11" Y="242"/>
+        <UsageCount Value="95"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="romunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="romunit"/>
         <EditorIndex Value="1"/>
-        <CursorPos X="33" Y="8"/>
+        <TopLine Value="713"/>
+        <CursorPos Y="988"/>
         <FoldState Value=" T3iD041 pkRkZ0Y2]9clZ093 piXj70G]Rj3jN0w6]9UlG0S[I4Ck10P7]aejg]+l"/>
-        <UsageCount Value="94"/>
+        <UsageCount Value="95"/>
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="mathunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="mathunit"/>
         <EditorIndex Value="-1"/>
         <CursorPos Y="10"/>
-        <UsageCount Value="93"/>
+        <UsageCount Value="94"/>
       </Unit2>
       <Unit3>
         <Filename Value="../units/matheunit.pas"/>
-        <UnitName Value="matheunit"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
-        <CursorPos Y="19"/>
+        <TopLine Value="214"/>
+        <CursorPos X="15" Y="250"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit3>
+      <Unit4>
+        <Filename Value="../Make/tools.pas"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit4>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="992" Column="42" TopLine="947"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="20" Column="56"/>
       </Position1>
       <Position2>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1003" Column="53" TopLine="973"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="196" Column="45" TopLine="175"/>
       </Position2>
       <Position3>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1001" Column="79" TopLine="719"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="199" Column="15" TopLine="178"/>
       </Position3>
       <Position4>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="20" Column="55" TopLine="10"/>
+        <Caret Line="201" Column="15" TopLine="180"/>
       </Position4>
       <Position5>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="24" Column="52" TopLine="5"/>
+        <Caret Line="203" Column="34" TopLine="182"/>
       </Position5>
       <Position6>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="20" Column="24" TopLine="12"/>
+        <Caret Line="208" Column="18" TopLine="187"/>
       </Position6>
       <Position7>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="38" Column="14" TopLine="24"/>
+        <Caret Line="157" Column="45" TopLine="127"/>
       </Position7>
       <Position8>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="163" Column="40" TopLine="121"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="1005" Column="6" TopLine="816"/>
       </Position8>
       <Position9>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="206" TopLine="191"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="990" TopLine="974"/>
       </Position9>
       <Position10>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="20" Column="56"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="994" Column="45" TopLine="973"/>
       </Position10>
       <Position11>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="196" Column="45" TopLine="175"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="1003" Column="86" TopLine="974"/>
       </Position11>
       <Position12>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="199" Column="15" TopLine="178"/>
+        <Caret Line="208" TopLine="204"/>
       </Position12>
       <Position13>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="201" Column="15" TopLine="180"/>
+        <Caret Line="207" Column="47" TopLine="186"/>
       </Position13>
       <Position14>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="203" Column="34" TopLine="182"/>
+        <Caret Line="70" Column="7" TopLine="28"/>
       </Position14>
       <Position15>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="208" Column="18" TopLine="187"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="987" Column="101" TopLine="520"/>
       </Position15>
       <Position16>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="157" Column="45" TopLine="127"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="1028" Column="50" TopLine="521"/>
       </Position16>
       <Position17>
         <Filename Value="romunit.pas"/>
-        <Caret Line="1005" Column="6" TopLine="816"/>
+        <Caret Line="1024" Column="23" TopLine="759"/>
       </Position17>
       <Position18>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="990" TopLine="974"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="63" Column="18" TopLine="25"/>
       </Position18>
       <Position19>
         <Filename Value="romunit.pas"/>
-        <Caret Line="994" Column="45" TopLine="973"/>
+        <Caret Line="202" Column="50" TopLine="183"/>
       </Position19>
       <Position20>
         <Filename Value="romunit.pas"/>
-        <Caret Line="1003" Column="86" TopLine="974"/>
+        <Caret Line="48" Column="32" TopLine="37"/>
       </Position20>
       <Position21>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="208" TopLine="204"/>
+        <Caret Line="204" Column="10" TopLine="174"/>
       </Position21>
       <Position22>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="207" Column="47" TopLine="186"/>
+        <Caret Line="225" TopLine="201"/>
       </Position22>
       <Position23>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="70" Column="7" TopLine="28"/>
+        <Caret Line="220" Column="5" TopLine="200"/>
       </Position23>
       <Position24>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="987" Column="101" TopLine="520"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="13" Column="24"/>
       </Position24>
       <Position25>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1028" Column="50" TopLine="521"/>
+        <Filename Value="../units/matheunit.pas"/>
+        <Caret Line="34"/>
       </Position25>
       <Position26>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="1024" Column="23" TopLine="759"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="17" Column="33" TopLine="4"/>
       </Position26>
       <Position27>
         <Filename Value="ROM.lpr"/>
-        <Caret Line="63" Column="18" TopLine="25"/>
+        <Caret Line="35" Column="12" TopLine="4"/>
       </Position27>
       <Position28>
-        <Filename Value="romunit.pas"/>
-        <Caret Line="202" Column="50" TopLine="183"/>
+        <Filename Value="ROM.lpr"/>
+        <Caret Line="99" Column="16" TopLine="87"/>
       </Position28>
       <Position29>
         <Filename Value="romunit.pas"/>
-        <Caret Line="48" Column="32" TopLine="37"/>
+        <Caret Line="8" Column="33"/>
       </Position29>
       <Position30>
-        <Filename Value="ROM.lpr"/>
-        <Caret Line="204" Column="10" TopLine="174"/>
+        <Filename Value="romunit.pas"/>
+        <Caret Line="32" Column="26"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>