Changeset 3007 for trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h

Timestamp:

02/02/04 22:52:53 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h (modified) (6 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h

@@ -12 +12 @@
 private:
 
+  static const Float_t gkElectronicPedRms;    // The pure electronic component of the RMS
+  static const Float_t gkErrElectronicPedRms; // The error of the pure electronic component of the RMS
+  static const Float_t gkFFactor;             // The laboratory F-factor
+  static const Float_t gkFFactorError;        // The laboratory F-factor Error
+  static const Float_t gkChargeLimit;         // The limit (in units of PedRMS) for acceptance of the fitted mean charge
+  static const Float_t gkChargeErrLimit;      // The limit (in units of PedRMS) for acceptance of the fitted charge sigma
+  static const Float_t gkChargeRelErrLimit;   // The limit (in units of Error of fitted charge) for acceptance of the fitted mean  
+  static const Float_t gkTimeLimit;           // The limit (in units of FADC slices) for acceptance of the fitted time
+  static const Float_t gkTimeErrLimit;        // The limit (in units of FADC slices) for acceptance of the fitted time sigma
+   
   Int_t   fPixId;                     // the pixel Id
-  
-  const Float_t fElectronicPedRms;    // The pure electronic component of the RMS
-  const Float_t fErrElectronicPedRms; // The error of the pure electronic component of the RMS
 
-  const Float_t fFactor;              // The laboratory F-factor
-  const Float_t fFactorError;         // The laboratory F-factor Error
-
-  const Float_t fChargeLimit;         // The limit (in units of PedRMS) for acceptance of the fitted mean charge
-  const Float_t fChargeErrLimit;      // The limit (in units of PedRMS) for acceptance of the fitted charge sigma
-  const Float_t fChargeRelErrLimit;   // The limit (in units of Error of fitted charge) for acceptance of the fitted mean  
-  Byte_t  fFlags;               // Flag for the set Bits
+  UInt_t  fFlags;               // Flag for the set Bits
   
   Float_t fCharge;              // The mean reduced charge after the fit
@@ -36 +37 @@
   Float_t fErrPedRms;           // The error of the pedestal  RMS (from MPedestalPix)  
 
-  Float_t fTime;                // The mean arrival time after the fit  
+  Float_t fTime;                // The mean arrival time after the fit
+  Float_t fErrTime;             // The mean arrival time error after the fit    
   Float_t fSigmaTime;           // The error of the mean arrival time after the fit
-  Float_t fTimeChiSquare;       // The Chi Square of the fit function 
   Float_t fTimeProb;            // The probability of the fit function 
+
+  Byte_t  fTimeFirstHiGain;           // The first used FADC slice
+  Byte_t  fTimeLastHiGain;            // The last used FADC slice
+  
+  Byte_t  fTimeFirstLoGain;           // The first used FADC slice
+  Byte_t  fTimeLastLoGain;            // The last used FADC slice
   
   Float_t fPheFFactorMethod;                // The number of Phe's calculated (F-factor method)
@@ -61 +68 @@
   enum  { kHiGainSaturation,
           kExcluded, kExcludeQualityCheck,
-          kFitValid, kFitted,
+          kChargeFitValid, kTimeFitValid,
+          kFitted,
           kBlindPixelMethodValid, kFFactorMethodValid, kPINDiodeMethodValid };
   
@@ -90 +98 @@
   // Times  
   Float_t GetTime()                const { return fTime;           }
+  Float_t GetErrTime()             const { return fErrTime;        }  
   Float_t GetSigmaTime()           const { return fSigmaTime;      }
-  Float_t GetTimeChiSquare()       const { return fTimeChiSquare;  }
   Float_t GetTimeProb()            const { return fTimeProb;  }      
 
@@ -118 +126 @@
 
   Bool_t IsExcluded()              const;
-  Bool_t IsFitValid()              const;
+  Bool_t IsChargeFitValid()        const;
+  Bool_t IsTimeFitValid()          const;
   Bool_t IsFitted()                const;
   Bool_t IsBlindPixelMethodValid() const;
@@ -138 +147 @@
   void SetExcluded(Bool_t b = kTRUE);
   void SetExcludeQualityCheck(Bool_t b = kTRUE);
-  void SetFitValid(Bool_t b = kTRUE);
+  void SetChargeFitValid(Bool_t b = kTRUE);
+  void SetTimeFitValid(Bool_t b = kTRUE);
   void SetFitted(Bool_t b = kTRUE);
   void SetBlindPixelMethodValid(Bool_t b = kTRUE);
   void SetFFactorMethodValid(Bool_t b = kTRUE);
   void SetPINDiodeMethodValid(Bool_t b = kTRUE);
+  void SetAbsTimeBordersHiGain(Byte_t f, Byte_t l);
+  void SetAbsTimeBordersLoGain(Byte_t f, Byte_t l);
   
   // Fill histos
-  Bool_t FillChargeHiGain(Float_t q) const                  { return fHist->FillChargeHiGain(q); }
-  Bool_t FillTimeHiGain(Float_t t)   const                  { return fHist->FillTimeHiGain(t); }  
+  Bool_t FillChargeHiGain(Float_t q)                  const { return fHist->FillChargeHiGain(q); }
+  Bool_t FillAbsTimeHiGain(Float_t t)                 const { return fHist->FillAbsTimeHiGain(t); }
+  Bool_t FillRelTimeHiGain(Float_t t)                 const { return fHist->FillRelTimeHiGain(t); }  
   Bool_t FillRChargevsTimeHiGain(Float_t rq, Int_t t) const { return fHist->FillChargevsNHiGain(rq,t); }    
 
-  Bool_t FillChargeLoGain(Float_t q) const                  { return fHist->FillChargeLoGain(q); }
-  Bool_t FillTimeLoGain(Float_t t)   const                  { return fHist->FillTimeLoGain(t); }  
+  Bool_t FillChargeLoGain(Float_t q)                  const { return fHist->FillChargeLoGain(q); }
+  Bool_t FillAbsTimeLoGain(Float_t t)                 const { return fHist->FillAbsTimeLoGain(t); }
+  Bool_t FillRelTimeLoGain(Float_t t)                 const { return fHist->FillRelTimeLoGain(t); }    
   Bool_t FillRChargevsTimeLoGain(Float_t rq, Int_t t) const { return fHist->FillChargevsNLoGain(rq,t); }