Changeset 5992

Timestamp:

01/25/05 14:11:07 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -249 +249 @@
   const Byte_t *end = ptr + range;
   Byte_t *p     = ptr;
+  Byte_t maxpos = 0;
 
   //
@@ -258 +259 @@
   const Float_t pedmean[2] = { pedes + ABoffs, pedes - ABoffs };
 
+  range += fHiLoLast;
   fMaxBinContent = 0;
   //
@@ -269 +271 @@
 
       if (*p > fMaxBinContent)
-        fMaxBinContent = *p;
+        {
+          maxpos = p-ptr;
+          if (maxpos > 1 && maxpos < (range - fWindowSizeHiGain + 1))
+            fMaxBinContent = *p;
+        }
 
       if (*p++ >= fSaturationLimit)
@@ -286 +292 @@
           *sample++ = (Float_t)*logain - pedmean[(ids++ + abflag) & 0x1];
 
-          if (*logain > fMaxBinContent)
-            fMaxBinContent = *logain;
-
           if (*logain++ >= fSaturationLimit)
             if (!sat)
               sat = ids-4;
-
-          range++;
         }
     }