Changeset 5528 for trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

Timestamp:

11/30/04 20:14:21 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -209 +209 @@
 
   fHiGainSignal.Set(range);
+
   range = (Int_t)(fLoGainLast - fLoGainFirst + 1);
 
@@ -324 +325 @@
   // Calculate the sum of the first fWindowSize slices
   //
-  for (Int_t i=0;i<range-fWindowSizeHiGain;i++)
+  for (Int_t i=0;i<range-fWindowSizeHiGain+1;i++)
     {
       sum      = 0.;
@@ -347 +348 @@
         max_p     = i;
       }
-    } /*   for (Int_t i=0;i<range-fWindowSizeHiGain;i++) */
+    } /*   for (Int_t i=0;i<range-fWindowSizeHiGain+1;i++) */
 
   time = 0;
@@ -384 +385 @@
     const Int_t   ids = max_p + sample;
     
-    const Float_t pex = ids < 0 ? 0. : ( ids > range ? 0. : fHiGainSignal[ids]);
+    const Float_t pex = ids < 0 ? 0. : ( ids >= range ? 0. : fHiGainSignal[ids]);
     sum              += fAmpWeightsHiGain [idx]*pex; 
     time_sum         += fTimeWeightsHiGain[idx]*pex;
@@ -405 +406 @@
 {
 
-  Int_t range = fLoGainLast - fLoGainFirst + 1;
+  const Int_t range = fLoGainLast - fLoGainFirst + 1;
+
   const Byte_t *end = ptr + range;
   Byte_t *p     = ptr;
@@ -443 +445 @@
         sat++;
     }
-  
+
   //
   // Slide with a window of size fWindowSizeHiGain over the sample 
@@ -466 +468 @@
   // Calculate the sum of the first fWindowSize slices
   //
-  for (Int_t i=0;i<range-fWindowSizeLoGain;i++)
+  for (Int_t i=0;i<range-fWindowSizeLoGain+1;i++)
     {
       sum      = 0.;
@@ -489 +491 @@
         max_p     = i;
       }
-    } /*   for (Int_t i=0;i<range-fWindowSizeLoGain;i++) */
+    } /*   for (Int_t i=0;i<range-fWindowSizeLoGain+1;i++) */
 
   time = 0;
@@ -526 +528 @@
     const Int_t   idx = fBinningResolutionLoGain*sample + fBinningResolutionHalfLoGain + t_iter;
     const Int_t   ids = max_p + sample;;
-    const Float_t pex = ids < 0 ? 0. : ( ids > range ? 0. : fLoGainSignal[ids]);
+    const Float_t pex = ids < 0 ? 0. : ( ids >= range ? 0. : fLoGainSignal[ids]);
     sum              += fAmpWeightsLoGain [idx]*pex; 
     time_sum         += fTimeWeightsLoGain[idx]*pex;