Changeset 3628 for trunk

Timestamp:

04/01/04 21:11:50 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MArrivalTimeCalc.cc (modified) (5 diffs)
• msignal/MArrivalTimeCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
  2004/04/01: Markus Gaug
+
+   * msignal/MArrivalTimeCalc.[h,cc]
+     - set fSaturationLimit as a variable with default (instead of 0xff)
 
    * mcalib/MHCalibrationChargeCam.[h,cc]

trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc.cc

@@ -15 +15 @@
 ! *
 !
-!
 !   Author(s): Sebastian Raducci 12/2003 <mailto:raducci@fisica.uniud.it>
 !
@@ -62 +61 @@
 using namespace std;
 
+const Byte_t MArrivalTimeCalc::fgSaturationLimit = 254;
 // --------------------------------------------------------------------------
 //
@@ -72 +72 @@
     fName  = name  ? name  : "MArrivalTimeCalc";
     fTitle = title ? title : "Calculate photons arrival time";
-
+    
+    SetSaturationLimit();
 }
 
@@ -149 +150 @@
       // If pixel is saturated we use LoGains
       //
-      if (pixel.GetMaxHiGainSample() == 0xff && pixel.HasLoGain())
+      if ((pixel.GetMaxHiGainSample() >= fSaturationLimit) && pixel.HasLoGain())
         {
           
@@ -191 +192 @@
   // Initialize the spline
   //
-    MCubicSpline *spline = new MCubicSpline(fadcSamples);  
+  MCubicSpline *spline = new MCubicSpline(fadcSamples);  
 
   //
   // Now find the maximum  
   //
-    Double_t abMaximum = spline->EvalAbMax();
-    Double_t maximum = spline->EvalMax();
-    const MPedestalPix &ped = (*fPedestals)[idx];
-    const Double_t pedestal = ped.GetPedestal();
-    const Double_t halfMax = (maximum + pedestal)/2.;
-    Float_t time = (halfMax > pedestal) ? (Float_t ) spline->FindVal(halfMax,abMaximum,'l'): 0.0;
-    delete spline;
-    return time;
-    
-}
-
+  Double_t abMaximum = spline->EvalAbMax();
+  Double_t maximum = spline->EvalMax();
+  const MPedestalPix &ped = (*fPedestals)[idx];
+  const Double_t pedestal = ped.GetPedestal();
+  const Double_t halfMax = (maximum + pedestal)/2.;
+  Float_t time = (halfMax > pedestal) ? (Float_t ) spline->FindVal(halfMax,abMaximum,'l'): 0.0;
+  delete spline;
+  return time;
+    
+}
+

trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc.h

@@ -13 +13 @@
 {
 
-    MRawEvtData    *fRawEvt;     // raw event data (time slices)
-    MRawRunHeader  *fRunHeader;  // RunHeader information
-    MPedestalCam   *fPedestals;  // pedestal information
-
-    MArrivalTimeCam *fArrTime;   // Container with the photons arrival times
-
-    Int_t PreProcess(MParList *pList);
-    Bool_t ReInit(MParList *pList);
-    Int_t Process();
-    Int_t PostProcess() {return kTRUE;}
-
-    Float_t Calc(const Byte_t *fadcSamples, const Short_t nslices, const UInt_t idx);
- 
+  static const Byte_t fgSaturationLimit; // Default for fSaturationLimit
+  Byte_t              fSaturationLimit; // Maximum FADC counts before being considered as saturated
+  
+  MRawEvtData    *fRawEvt;     // raw event data (time slices)
+  MRawRunHeader  *fRunHeader;  // RunHeader information
+  MPedestalCam   *fPedestals;  // pedestal information
+  
+  MArrivalTimeCam *fArrTime;   // Container with the photons arrival times
+  
+  Int_t PreProcess(MParList *pList);
+  Bool_t ReInit(MParList *pList);
+  Int_t Process();
+  Int_t PostProcess() {return kTRUE;}
+  
+  Float_t Calc(const Byte_t *fadcSamples, const Short_t nslices, const UInt_t idx);
+  
 public:
     MArrivalTimeCalc(const char *name=NULL, const char *title=NULL);
     ~MArrivalTimeCalc(){}
  
+    void SetSaturationLimit(const Byte_t lim=fgSaturationLimit) { fSaturationLimit = lim; }
+    
     ClassDef(MArrivalTimeCalc, 0)   // Task to calculate Arrival Times from raw data
 };