Changeset 7883 for trunk/MagicSoft/Mars/msignal

Timestamp:

08/17/06 20:40:37 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -270 +270 @@
       if (pixel.HasLoGain() && (fMaxBinContent > fLoGainSwitch /*|| sathi>0*/) )
       {
-          deltasumlo  = 0; // make logain of MExtractedSignalPix valid
-          deltatimelo = 0; // make logain of MArrivalTimePix valid
-
           fLoGainFirstSave = fLoGainFirst;
 
@@ -281 +278 @@
           const Float_t pos = sathi==0 ? timehi : (int)(sathi)-3;
 
-          if (pos>-fLoGainStartShift)
+          if (pos+fLoGainStartShift>0)
               fLoGainFirst = (Byte_t)(pos + fLoGainStartShift);
 
@@ -289 +286 @@
           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,