Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 6292)
+++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 6293)
@@ -322,5 +322,5 @@
   
   Float_t time_sum  = 0.;
-  Float_t fmax      = 0.;
+  Float_t fmax      = -9999.;
   Float_t ftime_max = 0.;
   Int_t   max_p     = 0;
@@ -379,4 +379,8 @@
   sum = 0.;
   time_sum = 0.;
+  if (max_p < 0)
+    max_p = 0;
+  if (max_p+fWindowSizeHiGain > range)
+    max_p = range-fWindowSizeHiGain;
   //
   // Slide with a window of size fWindowSizeHiGain over the sample 
@@ -387,5 +391,5 @@
     const Int_t   idx = fArrBinningResHalfHiGain[sample] + t_iter;
     const Int_t   ids = max_p + sample;
-    const Float_t pex = ids < 0 ? 0. : ( ids >= range ? 0. : fHiGainSignal[ids]);
+    const Float_t pex = fHiGainSignal[ids];
     sum              += fAmpWeightsHiGain [idx]*pex; 
     time_sum         += fTimeWeightsHiGain[idx]*pex;