Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 6240)
+++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc	(revision 6241)
@@ -282,4 +282,21 @@
     }
 
+  //
+  // Slide with a window of size fWindowSizeHiGain over the sample 
+  // and multiply the entries with the corresponding weights
+  //
+  if (IsNoiseCalculation())
+    {
+      if (fRandomIter == fBinningResolutionHiGain)
+        fRandomIter = 0;
+      for (Int_t ids=0; ids < fWindowSizeHiGain; ids++)
+        {
+          const Int_t   idx = fArrBinningResHiGain[ids] + fRandomIter;
+          sum              += fAmpWeightsHiGain [idx]*fHiGainSignal[ids]; 
+        }
+      fRandomIter++;
+      return;
+    }
+  
   if (fHiLoLast != 0)
     {
@@ -303,21 +320,4 @@
   if (sat > 0)
     return;
-  
-  //
-  // Slide with a window of size fWindowSizeHiGain over the sample 
-  // and multiply the entries with the corresponding weights
-  //
-  if (IsNoiseCalculation())
-    {
-      if (fRandomIter == fBinningResolutionHiGain)
-        fRandomIter = 0;
-      for (Int_t ids=0; ids < fWindowSizeHiGain; ids++)
-        {
-          const Int_t   idx = fArrBinningResHiGain[ids] + fRandomIter;
-          sum              += fAmpWeightsHiGain [idx]*fHiGainSignal[ids]; 
-        }
-      fRandomIter++;
-      return;
-    }
   
   Float_t time_sum  = 0.;