Changeset 11568 for trunk/Mars

Timestamp:

07/24/11 18:33:54 (13 years ago)

Author:

tbretz

Message:

Changed fHiGainFirst/fHiGainLast from Byte_t to UShort_t to support the DRS with 1024 samples.

Location:

trunk/Mars/msignal

Files:

• MExtractBlindPixel.cc (modified) (1 diff)
• MExtractBlindPixel.h (modified) (1 diff)
• MExtractPINDiode.cc (modified) (1 diff)
• MExtractPINDiode.h (modified) (1 diff)
• MExtractTimeAndCharge.cc (modified) (2 diffs)
• MExtractTimeAndChargeSpline.cc (modified) (2 diffs)
• MExtractTimeAndChargeSpline.h (modified) (1 diff)
• MExtractor.cc (modified) (2 diffs)
• MExtractor.h (modified) (3 diffs)

trunk/Mars/msignal/MExtractBlindPixel.cc

@@ -150 +150 @@
 }
 
-void MExtractBlindPixel::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
+void MExtractBlindPixel::SetRange(UShort_t hifirst, UShort_t hilast, Int_t lofirst, Byte_t lolast)
 {
 

trunk/Mars/msignal/MExtractBlindPixel.h

@@ -87 +87 @@
 //  void SetNumBlindPixels( const Int_t   num=1 )  { fNumBlindPixels = num;   }
   
-  void SetRange         ( const Byte_t  hifirst=0, const Byte_t hilast=0, 
-                          const Int_t   lofirst=0, const Byte_t lolast=0 );
+  void SetRange         ( const UShort_t hifirst=0, const UShort_t hilast=0,
+                          const Int_t    lofirst=0, const Byte_t   lolast=0 );
   void SetResolution    ( const Float_t f=fgResolution       )  { fResolution     = f;     }
   

trunk/Mars/msignal/MExtractPINDiode.cc

@@ -146 +146 @@
 // - fSqrtLoGainSamples to: 0.
 //  
-void MExtractPINDiode::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
+void MExtractPINDiode::SetRange(UShort_t hifirst, UShort_t hilast, Int_t lofirst, Byte_t lolast)
 {
 

trunk/Mars/msignal/MExtractPINDiode.h

@@ -56 +56 @@
 
   // Setters
-  void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Int_t lofirst=0, Byte_t lolast=0);
+  void SetRange(UShort_t hifirst=0, UShort_t hilast=0, Int_t lofirst=0, Byte_t lolast=0);
   void SetPINDiodeIdx  ( const UInt_t idx=fgPINDiodeIdx    ) { fPINDiodeIdx   = idx; }
   void SetLowerFitLimit( const Byte_t lim=fgLowerFitLimit  ) { fLowerFitLimit = lim; }

trunk/Mars/msignal/MExtractTimeAndCharge.cc

@@ -237 +237 @@
     const UInt_t satlim = fSaturationLimit*fRunHeader->GetScale();
 
+    // Do not even try to extract the hi-gain if we have
+    // more than one saturating slice
+    const Int_t rangehi = fHiGainLast - fHiGainFirst + 1;
+
     MRawEvtPixelIter pixel(fRawEvt);
     while (pixel.Next())
@@ -251 +255 @@
         Float_t sumhi =0., deltasumhi =-1; // Set hi-gain of MExtractedSignalPix valid
         Float_t timehi=0., deltatimehi=-1; // Set hi-gain of MArrivalTimePix valid
-
-        // Do not even try to extract the hi-gain if we have
-        // more than one saturating slice
-        const Int_t rangehi = fHiGainLast - fHiGainFirst + 1;
 
         if (numsathi<2)

trunk/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -201 +201 @@
 // explicit call to SetChargeType().
 //
-void MExtractTimeAndChargeSpline::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
+void MExtractTimeAndChargeSpline::SetRange(UShort_t hifirst, UShort_t hilast, Int_t lofirst, Byte_t lolast)
 {
   MExtractor::SetRange(hifirst, hilast, lofirst, lolast);
@@ -347 +347 @@
     s.GetTime(time, dtime);
     s.GetSignal(sum, dsum);
-
 }
 

trunk/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -61 +61 @@
     Float_t GetFallTimeHiGain() const { return fFallTimeHiGain; }
 
-    void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Int_t lofirst=0, Byte_t lolast=0 );
+    void SetRange(UShort_t hifirst=0, UShort_t hilast=0, Int_t lofirst=0, Byte_t lolast=0 );
 
     void SetResolution(const Float_t f=fgResolution)  { fResolution  = f;  }

trunk/Mars/msignal/MExtractor.cc

@@ -147 +147 @@
 }
 
-void MExtractor::SetRange(Byte_t hifirst, Byte_t hilast, Int_t lofirst, Byte_t lolast)
+void MExtractor::SetRange(UShort_t hifirst, UShort_t hilast, Int_t lofirst, Byte_t lolast)
 {
     fHiGainFirst = hifirst;
@@ -303 +303 @@
 Int_t MExtractor::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    Byte_t hf = fHiGainFirst;
-    Int_t  lf = fLoGainFirst;
-    Byte_t hl = fHiGainLast;
-    Byte_t ll = fLoGainLast;
+    UShort_t hf = fHiGainFirst;
+    UShort_t hl = fHiGainLast;
+    Int_t    lf = fLoGainFirst;
+    Byte_t   ll = fLoGainLast;
 
     Bool_t rc = kFALSE;

trunk/Mars/msignal/MExtractor.h

@@ -43 +43 @@
   MPedestalSubtractedEvt *fSignal;         //!
 
-  Byte_t   fHiGainFirst;                   // First FADC slice nr. to extract the High Gain signal
-  Byte_t   fHiGainLast;                    // Last FADC slice nr. to extract the High Gain signal
+  UShort_t fHiGainFirst;                   // First FADC slice nr. to extract the High Gain signal
+  UShort_t fHiGainLast;                    // Last FADC slice nr. to extract the High Gain signal
   Int_t    fLoGainFirst;                   // First FADC slice nr. to extract the Low Gain signal
   Byte_t   fLoGainLast;                    // Last FADC slice nr. to extract the Low Gain signal
@@ -81 +81 @@
   
   // getter
-  Byte_t  GetHiGainFirst()      const { return fHiGainFirst;      }
-  Byte_t  GetHiGainLast ()      const { return fHiGainLast ;      }
-  Int_t   GetLoGainFirst()      const { return fLoGainFirst;      }
-  Byte_t  GetLoGainLast ()      const { return fLoGainLast ;      }
-  Float_t GetNumHiGainSamples() const { return fNumHiGainSamples; }
-  Float_t GetNumLoGainSamples() const { return fNumLoGainSamples; }
-  Float_t GetOffsetLoGain()     const { return fOffsetLoGain;     }
-  Float_t GetResolutionPerPheHiGain() const { return fResolutionPerPheHiGain; }
-  Float_t GetResolutionPerPheLoGain() const { return fResolutionPerPheLoGain; }
-  UInt_t  GetSaturationLimit() const { return fSaturationLimit; }
+  UShort_t GetHiGainFirst()      const { return fHiGainFirst;      }
+  UShort_t GetHiGainLast ()      const { return fHiGainLast ;      }
+  Int_t    GetLoGainFirst()      const { return fLoGainFirst;      }
+  Byte_t   GetLoGainLast ()      const { return fLoGainLast ;      }
+  Float_t  GetNumHiGainSamples() const { return fNumHiGainSamples; }
+  Float_t  GetNumLoGainSamples() const { return fNumLoGainSamples; }
+  Float_t  GetOffsetLoGain()     const { return fOffsetLoGain;     }
+  Float_t  GetResolutionPerPheHiGain() const { return fResolutionPerPheHiGain; }
+  Float_t  GetResolutionPerPheLoGain() const { return fResolutionPerPheLoGain; }
+  UInt_t   GetSaturationLimit() const { return fSaturationLimit; }
 
   Bool_t  HasLoGain() const { return fLoGainFirst>0 || fLoGainLast>0; }
@@ -99 +99 @@
   Float_t SetResolutionPerPheLoGain() const { return fResolutionPerPheLoGain; }
 
-  virtual void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Int_t lofirst=0, Byte_t lolast=0);
+  virtual void SetRange(UShort_t hifirst=0, UShort_t hilast=0, Int_t lofirst=0, Byte_t lolast=0);
 
   void SetOffsetLoGain    ( const Float_t  f=fgOffsetLoGain          ) { fOffsetLoGain     = f;    }