Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4115)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4116)
@@ -37,4 +37,11 @@
      - 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. 
 
 
Index: /trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc	(revision 4115)
+++ /trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc	(revision 4116)
@@ -82,5 +82,5 @@
 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,5 +359,5 @@
 // "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,4 +373,5 @@
   Byte_t hiGainFirst = 0;
   Byte_t loGainFirst = 0;
+  Byte_t hilolastsave = fHiLoLast;
 
   while (pixel.Next())
@@ -447,4 +448,5 @@
 
 
+  fHiLoLast = hilolastsave;
   fSignals->SetReadyToSave();