Changeset 4371 for trunk/MagicSoft/Mars

Timestamp:

07/14/04 13:43:54 (20 years ago)

Author:

hbartko

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MArrivalTimeCalc2.cc (modified) (1 diff)
• msignal/MExtractTimeHighestIntegral.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/07/14: Hendrik Bartko
+   * msignal/MExtractTimeHighestIntegral.cc
+     - implemented the time calculation respective to the zero FADC
+       time sample, not respective to the first sample of the chosen
+       range
+   * msignal/ArrivalTimeCalc2.cc
+     - implemented the time calculation respective to the zero FADC
+       time sample, not respective to the first sample of the chosen
+       range
+
 
  2004/06/30: Thomas Bretz

trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc2.cc

@@ -244 +244 @@
             sat++;
 
-        pix.SetArrivalTime(timehi, deltatimehi, timelo, deltatimelo);
+        pix.SetArrivalTime(timehi+ Float_t(fHiGainFirst), deltatimehi, timelo + Float_t(fLoGainFirst), deltatimelo); 
         pix.SetGainSaturation(sathi, sathi, satlo);
     }

trunk/MagicSoft/Mars/msignal/MExtractTimeHighestIntegral.cc

@@ -204 +204 @@
         {
           max = sum;
-          ptrmax = p;
+          ptrmax = p+1;
         }
     }
@@ -225 +225 @@
   const Float_t pedsubtimesignalsum = timesignalsum - timesum*pedes;
 
-  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum : 1;
+  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum  + Float_t(fHiGainFirst): 1;
   deltatime = pedsubsum != 0 ? pedrms / pedsubsum * sqrt(timesquaredsum - fHiGainWindowSize*time) : 1;
 }
@@ -272 +272 @@
         {
           max = sum;
-          ptrmax = p;
+          ptrmax = p+1;
         }
     }
@@ -293 +293 @@
   const Float_t pedsubtimesignalsum = timesignalsum - timesum*pedes;
 
-  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum : 1;
+  time      = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum  + Float_t(fLoGainFirst) : 1;
   deltatime = pedsubsum != 0 ? pedrms / pedsubsum * sqrt(timesquaredsum - fLoGainWindowSize*time) : 1;
 }