Changeset 5240 for trunk/MagicSoft

Timestamp:

10/12/04 13:27:39 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndCharge.cc (modified) (2 diffs)
• msignal/MExtractTimeAndCharge.h (modified) (1 diff)
• msignal/MExtractTimeAndChargeSlidingWindow.cc (modified) (2 diffs)
• msignal/MExtractTimeAndChargeSlidingWindow.h (modified) (1 diff)
• msignal/MExtractTimeAndChargeSpline.cc (modified) (4 diffs)
• msignal/MExtractTimeAndChargeSpline.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -35 +35 @@
      - fixed a bug in the binning of the low-gain events, affected 
        the relative times in case of high-gain saturation.
+
+   * msignal/MExtractTimeAndCharge.[h,cc]
+     - fix the range for the low-gain extraction dynamically by 
+       using the calculated time of the high-gain extraction. This 
+       should solve the problem reported by Nuria for the extractors
+       deriving from this class.   
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -121 +121 @@
                               fLoGainFirst, fLoGainLast, fNumLoGainSamples);
 
-  *fLog << endl;
+  *fLog << dec << endl;
   *fLog << inf << GetDescriptor() << ": Taking " << fNumHiGainSamples
         << " HiGain samples from slice " << (Int_t)fHiGainFirst
@@ -185 +185 @@
       Byte_t satlo=0;
       
-      const Bool_t logainabflag = (higainabflag + pixel.GetNumHiGainSamples()) & 0x1;
-
-      FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst, 
-                              sumlo, deltasumlo, 
-                              timelo, deltatimelo, 
-                              satlo, ped, logainabflag);
-
+      //
+      // Adapt the low-gain extraction range from the obtained high-gain time
+      //
+      if (pixel.HasLoGain())
+        {
+          fLoGainFirstSave = fLoGainFirst;
+          fLoGainFirst     = (Int_t)(timehi+fOffsetLoGain-2.);
+          fLoGainFirst     = fLoGainFirst < fLoGainFirstSave ? fLoGainFirstSave : fLoGainFirst;
+          
+          if ( fLoGainFirst < fLoGainLast )
+            {
+              const Bool_t logainabflag = (higainabflag + pixel.GetNumHiGainSamples()) & 0x1;
+              FindTimeAndChargeLoGain(pixel.GetLoGainSamples()+fLoGainFirst, 
+                                      sumlo, deltasumlo, 
+                                      timelo, deltatimelo, 
+                                      satlo, ped, logainabflag);
+            }
+          
+          fLoGainFirst     = fLoGainFirstSave;
+        }
+      
       MExtractedSignalPix &pix = (*fSignals)[pixid];
       MArrivalTimePix     &tix = (*fArrTime)[pixid];      

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -9 +9 @@
 class MExtractTimeAndCharge : public MExtractTime
 {
+private:
+
+  Byte_t fLoGainFirstSave;            // First Low-Gain FADC slice obtained by position of high-gain signal
+
 protected:
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.cc

@@ -37 +37 @@
 //   fHiGainFirst =  fgHiGainFirst =  0 
 //   fHiGainLast  =  fgHiGainLast  =  14
-//   fLoGainFirst =  fgLoGainFirst =  3 
+//   fLoGainFirst =  fgLoGainFirst =  2 
 //   fLoGainLast  =  fgLoGainLast  =  14
 //
@@ -63 +63 @@
 const Byte_t  MExtractTimeAndChargeSlidingWindow::fgHiGainFirst  = 2;
 const Byte_t  MExtractTimeAndChargeSlidingWindow::fgHiGainLast   = 14;
-const Byte_t  MExtractTimeAndChargeSlidingWindow::fgLoGainFirst  = 3;
+const Byte_t  MExtractTimeAndChargeSlidingWindow::fgLoGainFirst  = 2;
 const Byte_t  MExtractTimeAndChargeSlidingWindow::fgLoGainLast   = 14;
 const Byte_t  MExtractTimeAndChargeSlidingWindow::fgHiGainWindowSize = 6;

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.h

@@ -14 +14 @@
   static const Byte_t fgHiGainFirst;      //! Default for fHiGainFirst  (now set to: 2)
   static const Byte_t fgHiGainLast;       //! Default for fHiGainLast   (now set to: 14)
-  static const Byte_t fgLoGainFirst;      //! Default for fLOGainFirst  (now set to: 3)
+  static const Byte_t fgLoGainFirst;      //! Default for fLOGainFirst  (now set to: 2)
   static const Byte_t fgLoGainLast;       //! Default for fLoGainLast   (now set to: 14)
   static const Byte_t fgHiGainWindowSize; //! The extraction window Hi-Gain

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -118 +118 @@
 //        fHiGainFirst =  2 
 //        fHiGainLast  =  14
-//        fLoGainFirst =  3 
+//        fLoGainFirst =  2 
 //        fLoGainLast  =  14
 //
@@ -157 +157 @@
 const Byte_t  MExtractTimeAndChargeSpline::fgHiGainFirst  = 2;
 const Byte_t  MExtractTimeAndChargeSpline::fgHiGainLast   = 14;
-const Byte_t  MExtractTimeAndChargeSpline::fgLoGainFirst  = 3;
+const Byte_t  MExtractTimeAndChargeSpline::fgLoGainFirst  = 2;
 const Byte_t  MExtractTimeAndChargeSpline::fgLoGainLast   = 14;
 const Float_t MExtractTimeAndChargeSpline::fgResolution   = 0.01;
@@ -762 +762 @@
   // Don't start if the maxpos is too close to the left limit.
   //
-  if (sat || maxpos < 2)
+  if (sat || maxpos < 1)
     {
       time =  IsExtractionType(kMaximum) 
@@ -770 +770 @@
     }
       
+  if (maxpos < 2 && IsExtractionType(kHalfMaximum))
+    {
+      time = (Float_t)(fLoGainFirst + maxpos - 1);
+      return;
+    }
+
   Float_t pp;
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -14 +14 @@
   static const Byte_t  fgHiGainFirst;    //! Default for fHiGainFirst  (now set to: 2)
   static const Byte_t  fgHiGainLast;     //! Default for fHiGainLast   (now set to: 14)
-  static const Byte_t  fgLoGainFirst;    //! Default for fLOGainFirst  (now set to: 3)
+  static const Byte_t  fgLoGainFirst;    //! Default for fLoGainFirst  (now set to: 2)
   static const Byte_t  fgLoGainLast;     //! Default for fLoGainLast   (now set to: 14)
   static const Float_t fgResolution;     //! Default for fResolution   (now set to: 0.003)