Changeset 5863

Timestamp:

01/16/05 18:14:27 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/MCalibCalcFromPast.cc (modified) (1 diff)
• mhcalib/MHCalibrationCam.h (modified) (2 diffs)
• mhcalib/MHCalibrationRelTimeCam.cc (modified) (4 diffs)
• mhcalib/MHCalibrationRelTimeCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -78 +78 @@
 MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title)
     : fGeom(NULL), fParList(NULL), 
-      fIntensCharge(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
+      fIntensCharge(NULL), fIntensBlind(NULL), fIntensRelTime(NULL), fIntensBad(NULL),
       fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL),
       fNumEvents(0), fNumCam(0)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

@@ -64 +64 @@
   Float_t fNumHiGainSaturationLimit;      // Rel. amount sat. higain FADC slices until pixel is called saturated 
   Float_t fNumLoGainSaturationLimit;      // Rel. amount sat. logain FADC slices until pixel is called saturated
-
+  Float_t fNumOverflowLimit;              // Part of maximum allowed overflow events
+  
   MArrayI fRunNumbers;                    // Numbers of runs used
 
@@ -215 +216 @@
   void SetProbLimit               ( const Float_t f=fgProbLimit) { fProbLimit = f; }    
 
-  void SetNumLoGainSaturationLimit( const Float_t lim )    { fNumLoGainSaturationLimit  = lim;   }
-  void SetNumHiGainSaturationLimit( const Float_t lim )    { fNumHiGainSaturationLimit  = lim;   }
-  void SetPulserFrequency         ( const Int_t f=fgPulserFrequency) { fPulserFrequency = f;     }
-  
-  ClassDef(MHCalibrationCam, 3) // Base Histogram class for Calibration Camera
+  void SetNumLoGainSaturationLimit( const Float_t lim )    { fNumLoGainSaturationLimit  = lim; }
+  void SetNumHiGainSaturationLimit( const Float_t lim )    { fNumHiGainSaturationLimit  = lim; }
+  void SetNumOverflowLimit        ( const Float_t lim )    { fNumOverflowLimit          = lim; }
+  void SetPulserFrequency         ( const Int_t f=fgPulserFrequency) { fPulserFrequency = f;   }
+  
+  ClassDef(MHCalibrationCam, 4) // Base Histogram class for Calibration Camera
 };
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -130 +130 @@
 const Axis_t  MHCalibrationRelTimeCam::fgLast       =  5.;
 const Float_t MHCalibrationRelTimeCam::fgProbLimit  = 0.;
+const Float_t MHCalibrationRelTimeCam::fgNumOverflowLimit = 0.005;
 const TString MHCalibrationRelTimeCam::gsHistName   = "RelTime";
 const TString MHCalibrationRelTimeCam::gsHistTitle  = "Rel. Arr. Times";
@@ -163 +164 @@
   SetLast (fgLast );
 
+  SetNumOverflowLimit(fgNumOverflowLimit);
   SetProbLimit(fgProbLimit);
 
@@ -679 +681 @@
   
   Stat_t overflow = hist->GetBinContent(hist->GetNbinsX()+1);
-  if (overflow > 0.0005*hist->GetEntries())
+  if (overflow > fNumOverflowLimit*hist->GetEntries())
     {
       *fLog << warn << "HiGain Hist-overflow " << overflow
@@ -686 +688 @@
   
   overflow = hist->GetBinContent(0);
-  if (overflow > 0.0005*hist->GetEntries())
+  if (overflow > fNumOverflowLimit*hist->GetEntries())
     {
       *fLog << warn << "HiGain Hist-underflow " << overflow

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h

@@ -22 +22 @@
 
   static const Float_t fgNumHiGainSaturationLimit;   //! The default for fNumHiGainSaturationLimit (now at: 0.25)
+  static const Float_t fgNumOverflowLimit;           //! The default for fNumOverflowLimit         (now at: 0.005)
   static const UInt_t  fgReferencePixel;             //! Default for fReferencePixel   (now set to: 1)
   static const Int_t   fgNbins;                      //! Default number of bins        (now set to: 900   )