Changeset 4116 for trunk/MagicSoft

Timestamp:

05/21/04 17:09:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
      - put MGeomCamMagic into the plist (MGeomApply complained not to 
        find the GeomCam(
+
+   * msignal/MExtractFixedWindowPeakSearch.cc
+     - fixed a bug affecting signals with late arrival times which use 
+       the variable fHiLoLast. 
+     - set back fgOffsetFromPeak from peak to 1 (instead of 2). Abelardo 
+       explained that this variable is not strictly the offset from the 
+        peak but the offset from the peak search window. 
 
 

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc

@@ -82 +82 @@
 const Byte_t MExtractFixedWindowPeakSearch::fgLoGainWindowSize     = 6;
 const Byte_t MExtractFixedWindowPeakSearch::fgPeakSearchWindowSize = 4;
-const Byte_t MExtractFixedWindowPeakSearch::fgOffsetFromPeak       = 2;
+const Byte_t MExtractFixedWindowPeakSearch::fgOffsetFromPeak       = 1;
 // --------------------------------------------------------------------------
 //
@@ -359 +359 @@
 // "startslice" will mark the slice at which the highest sum begins for that pixel.
 // Then define the beginning of the integration window for ALL pixels as the slice
-// before that: startslice-fOffsetFraomPeak, unless of course startslice-fOffsetFromPeak<=0,
+// before that: startslice-fOffsetFromPeak, unless of course startslice-fOffsetFromPeak<=0,
 // in which case we start at 0. We will also check that the integration window does not 
 // go beyond the FADC limits.
@@ -373 +373 @@
   Byte_t hiGainFirst = 0;
   Byte_t loGainFirst = 0;
+  Byte_t hilolastsave = fHiLoLast;
 
   while (pixel.Next())
@@ -447 +448 @@
 
 
+  fHiLoLast = hilolastsave;
   fSignals->SetReadyToSave();