Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7059)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7060)
@@ -21,4 +21,12 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/05/19 Thomas Bretz
+
+   * msignal/MExtractTimeAndCharge.cc:
+     - simplified a really cryptical use of the ?:-operator when
+       the fLoGainFirst is calculated
+
+
+
  2005/05/18 Thomas Bretz
 
Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 7059)
+++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc	(revision 7060)
@@ -216,10 +216,12 @@
 
           fLoGainFirstSave = fLoGainFirst;
-          const Byte_t logainstart = sathi 
-            ? (sathi > (Int_t)(-1*fLoGainStartShift) ? sathi + (Int_t)fLoGainStartShift : fLoGainFirst)
-            : (timehi+fLoGainStartShift > 0. ? (Byte_t)(timehi + fLoGainStartShift) : fLoGainFirst);
-          fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
-
-          // *fLog << err << (Int_t)fLoGainFirst << endl;
+
+          const Float_t pos = sathi==0 ? timehi : sathi;
+
+          if (pos>-fLoGainStartShift)
+              fLoGainFirst = (Byte_t)(pos + fLoGainStartShift);
+
+          if (fLoGainFirst<fLoGainFirstSave)
+              fLoGainFirst = fLoGainFirstSave;
 
           if ( fLoGainFirst <= fLoGainLast-fWindowSizeLoGain)
@@ -227,6 +229,5 @@
               const Bool_t logainabflag = (higainabflag + pixel.GetNumHiGainSamples()) & 0x1;
               FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst,
-                                      sumlo, deltasumlo,
-                                      timelo, deltatimelo,
+                                      sumlo, deltasumlo, timelo, deltatimelo,
                                       satlo, ped, logainabflag);
           }