Changeset 5193 for trunk

Timestamp:

10/05/04 19:05:25 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndCharge.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
     - fixed small bug for the case that multiple colours are found, but 
       no intensity calibration is used.
+
+  * msignal/MExtractTimeAndCharge.cc
+    - fixed small bug in the calculation of the low-gain AB flag.
+
 
  2004/10/05: Thomas Bretz

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -166 +166 @@
       const Int_t pixid = pixel.GetPixelId();
       const MPedestalPix  &ped = (*fPedestals)[pixid];
+      const Bool_t higainabflag = pixel.HasABFlag();
 
       FindTimeAndChargeHiGain(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), 
                               sumhi, deltasumhi, 
                               timehi, deltatimehi, 
-                              sathi, ped, pixel.HasABFlag());
+                              sathi, ped, higainabflag);
       
       Float_t sumlo =0., deltasumlo =0.;
       Float_t timelo=0., deltatimelo=0.;
       Byte_t satlo=0;
+      
+      const Int_t logainflag = higainabflag + pixel.GetNumHiGainSamples();
 
       FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst, 
                               sumlo, deltasumlo, 
                               timelo, deltatimelo, 
-                              satlo, ped, pixel.HasABFlag());
+                              satlo, ped, logainflag & 0x1);
 
       MExtractedSignalPix &pix = (*fSignals)[pixid];