Index: trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 8192)
+++ trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 8207)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.58 2006-11-01 15:48:31 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.59 2006-11-02 17:44:09 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -294,7 +294,6 @@
             //
             // The jitter in the hi-/lo-gain offset ssems to be around +/-0.5
-            if (deltatimehi>-0.5)
-                first = TMath::FloorNint(timehi+numh+fOffsetLoGain+fLoGainStartShift);
-            //else ???
+            const Float_t tm = deltatimehi<0 ? -1.+fHiGainFirst : timehi;
+            first = TMath::FloorNint(tm+numh+fOffsetLoGain+fLoGainStartShift);
 
             if (first<0)