Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 7881)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 7883)
@@ -270,7 +270,4 @@
       if (pixel.HasLoGain() && (fMaxBinContent > fLoGainSwitch /*|| sathi>0*/) )
       {
-          deltasumlo  = 0; // make logain of MExtractedSignalPix valid
-          deltatimelo = 0; // make logain of MArrivalTimePix valid
-
           fLoGainFirstSave = fLoGainFirst;
 
@@ -281,5 +278,5 @@
           const Float_t pos = sathi==0 ? timehi : (int)(sathi)-3;
 
-          if (pos>-fLoGainStartShift)
+          if (pos+fLoGainStartShift>0)
               fLoGainFirst = (Byte_t)(pos + fLoGainStartShift);
 
@@ -289,4 +286,7 @@
           if (fLoGainFirst <= fLoGainLast-fWindowSizeLoGain)
           {
+              deltasumlo  = 0; // make logain of MExtractedSignalPix valid
+              deltatimelo = 0; // make logain of MArrivalTimePix valid
+
               const Bool_t logainabflag = (higainabflag + pixel.GetNumHiGainSamples()) & 0x1;
               FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst,