Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 6770)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 6798)
@@ -131,6 +131,4 @@
 
   *fLog << flush << inf;
-  Print();
-  
   return kTRUE;
 }
@@ -219,5 +217,5 @@
           fLoGainFirstSave = fLoGainFirst;
           const Byte_t logainstart = sathi 
-            ? sathi + (Int_t)fLoGainStartShift
+            ? (sathi > (Int_t)fLoGainStartShift ? sathi + (Int_t)fLoGainStartShift : fLoGainFirst)
             : (Byte_t)(timehi + fLoGainStartShift);
           fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;