Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 5991)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 5992)
@@ -249,4 +249,5 @@
   const Byte_t *end = ptr + range;
   Byte_t *p     = ptr;
+  Byte_t maxpos = 0;
 
   //
@@ -258,4 +259,5 @@
   const Float_t pedmean[2] = { pedes + ABoffs, pedes - ABoffs };
 
+  range += fHiLoLast;
   fMaxBinContent = 0;
   //
@@ -269,5 +271,9 @@
 
       if (*p > fMaxBinContent)
-	fMaxBinContent = *p;
+	{
+	  maxpos = p-ptr;
+	  if (maxpos > 1 && maxpos < (range - fWindowSizeHiGain + 1))
+	    fMaxBinContent = *p;
+	}
 
       if (*p++ >= fSaturationLimit)
@@ -286,12 +292,7 @@
           *sample++ = (Float_t)*logain - pedmean[(ids++ + abflag) & 0x1];
 
-          if (*logain > fMaxBinContent)
-	    fMaxBinContent = *logain;
-
           if (*logain++ >= fSaturationLimit)
             if (!sat)
               sat = ids-4;
-
-          range++;
         }
     }