Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h (revision 3645) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h (revision 3646) @@ -24,6 +24,4 @@ TClonesArray *fAverageBadAreas; //-> Array of MBadPixelsPix, one per pixel area TClonesArray *fAverageBadSectors; //-> Array of MBadPixelsPix, one per camera sector - - Byte_t fFlags; // Byte to hold the flags public: Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h (revision 3645) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h (revision 3646) @@ -10,66 +10,51 @@ private: - static const Float_t gkElectronicPedRms; //! Electronic component of ped. RMS (now set to: 1.5) - static const Float_t gkElectronicPedRmsErr; //! Error Electronic component of ped. RMS (now set to: 0.3) - static const Float_t gkFFactor; //! Laboratory F-factor PMTs (now set to: 1.15) - static const Float_t gkFFactorErr; //! Laboratory F-factor Error PMTs (now set to: 0.02) + static const Float_t gkElectronicPedRms; //! Electronic component of ped. RMS (now set to: 1.5) + static const Float_t gkElectronicPedRmsErr; //! Error Electr. component ped. RMS (now set to: 0.3) + static const Float_t gkFFactor; //! Laboratory F-factor PMTs (now set to: 1.15) + static const Float_t gkFFactorErr; //! Laboratory F-factor Error PMTs (now set to: 0.02) - static const Float_t fgConversionHiLo; //! Default for fConversionHiLo (now set to: 10.) - static const Float_t fgConversionHiLoErr; //! Default for fConversionHiLoVar (now set to: 2.5) - static const Float_t fgPheFFactorMethodLimit; //! Default for fPheFFactorMethodLimit (now set to: 5.) + static const Float_t fgConversionHiLo; //! Default fConversionHiLo (now set to: 10.) + static const Float_t fgConversionHiLoErr; //! Default fConversionHiLoVar (now set to: 2.5) + static const Float_t fgPheFFactorMethodLimit; //! Default fPheFFactorMethodLimit (now set to: 5.) - Float_t fPheFFactorMethodLimit; // The minimum number of Photo-electrons for a pixel to be accepted. + Float_t fAbsTimeMean; // Mean Absolute Arrival Time + Float_t fAbsTimeRms; // RMS Mean Absolute Arrival Time + Byte_t fCalibFlags; // Bit-field for the class-own bits + Float_t fConversionFFactorMethodVar; // Variance conversion factor (F-factor method) + Float_t fConversionBlindPixelMethodVar; // Variance conversion factor (Blind Pixel method) + Float_t fConversionPINDiodeMethodVar; // Variance conversion factor (PIN Diode method) + Float_t fConversionCombinedMethodVar; // Variance conversion factor (all methods combined) + Float_t fConversionHiLo; // Conversion factor betw. Hi Gain and Lo Gain + Float_t fConversionHiLoVar; // Variance Conversion factor betw. Hi and Lo Gain + Float_t fLoGainPedRms; // Pedestal RMS of Low Gain + Float_t fLoGainPedRmsVar; // Pedestal RMS Variance of Low Gain + Float_t fMeanConversionFFactorMethod; // Conversion factor (F-factor method) + Float_t fMeanConversionBlindPixelMethod; // Conversion factor (Blind Pixel method) + Float_t fMeanConversionPINDiodeMethod; // Conversion factor (PIN Diode method) + Float_t fMeanConversionCombinedMethod; // Conversion factor (all methods combined) + Float_t fPed; // Pedestal (from MPedestalPix) times number FADC slices + Float_t fPedVar; // Variance of pedestal + Float_t fPedRms; // Pedestal RMS (from MPedestalPix) times sqrt nr. FADC slices + Float_t fPheFFactorMethod; // Number Phe's calculated (F-factor method) + Float_t fPheFFactorMethodVar; // Variance number of Phe's (F-factor method) + Float_t fPheFFactorMethodLimit; // Min. number Photo-electrons for pix to be accepted. + Float_t fRSigma; // Reduced sigma + Float_t fRSigmaVar; // Variance Reduced sigma + Float_t fSigmaConversionFFactorMethod; // Sigma Conversion factor (F-factor method) + Float_t fSigmaConversionBlindPixelMethod; // Sigma Conversion factor (Blind Pixel method) + Float_t fSigmaConversionPINDiodeMethod; // Sigma Conversion factor (PIN Diode method) + Float_t fSigmaConversionCombinedMethod; // Sigma Conversion factor (all methods combined) + Float_t fTotalFFactorFFactorMethod; // Total F-Factor to Ph's (F-factor method) + Float_t fTotalFFactorBlindPixelMethod; // Total F-Factor to Ph's (Blind Pixel method) + Float_t fTotalFFactorPINDiodeMethod; // Total F-Factor to Ph's (PIN Diode method) + Float_t fTotalFFactorCombinedMethod; // Total F-Factor to Ph's (all methods combined) + Float_t fTotalFFactorFFactorMethodVar; // Variance total F-Factor (F-factor method) + Float_t fTotalFFactorBlindPixelMethodVar; // Variance total F-Factor (Blind Pixel method) + Float_t fTotalFFactorPINDiodeMethodVar; // Variance total F-Factor (PIN Diode method) + Float_t fTotalFFactorCombinedMethodVar; // Variance total F-Factor (all methods combined) - Float_t fRSigma; // The reduced squares of sigmas after the fit - Float_t fRSigmaVar; // The reduced squares of sigmas after the fit - - Float_t fPed; // The mean pedestal (from MPedestalPix) times number of FADC slices - Float_t fPedVar; // The error of the pedestal - Float_t fPedRms; // The pedestal RMS (from MPedestalPix) times sqrt of number of FADC slices - - Float_t fLoGainPedRms; // The pedestal RMS of the low gain - Float_t fLoGainPedRmsVar; // The pedestal RMS Variance of the low gain - - Float_t fAbsTimeMean; // The mean absolute arrival time - Float_t fAbsTimeRms; // The rms of the mean absolute arrival time - - Float_t fPheFFactorMethod; // The number of Phe's calculated (F-factor method) - Float_t fPheFFactorMethodVar; // The error on the number of Phe's calculated (F-factor method) - - Float_t fMeanConversionFFactorMethod; // The conversion factor to Phe's (F-factor method) - Float_t fMeanConversionBlindPixelMethod; // The conversion factor to Ph's (Blind Pixel method) - Float_t fMeanConversionPINDiodeMethod; // The conversion factor to Ph's (PIN Diode method) - Float_t fMeanConversionCombinedMethod; // The conversion factor to Ph's (all methods combined) - - Float_t fConversionFFactorMethodVar; // The error of the conversion factor to Phe's (F-factor method) - Float_t fConversionBlindPixelMethodVar; // The error of the conversion factor to Ph's (Blind Pixel method) - Float_t fConversionPINDiodeMethodVar; // The error of the conversion factor to Ph's (PIN Diode method) - Float_t fConversionCombinedMethodVar; // The error of the conversion factor to Ph's (all methods combined) - - Float_t fSigmaConversionFFactorMethod; // The sigma of conversion factor to Phe's (F-factor method) - Float_t fSigmaConversionBlindPixelMethod; // The conversion factor to Ph's (Blind Pixel method) - Float_t fSigmaConversionPINDiodeMethod; // The conversion factor to Ph's (PIN Diode method) - Float_t fSigmaConversionCombinedMethod; // The conversion factor to Ph's (all methods combined) - - Float_t fTotalFFactorFFactorMethod; // The total F-Factor to Ph's (F-factor method) - Float_t fTotalFFactorBlindPixelMethod; // The total F-Factor to Ph's (Blind Pixel method) - Float_t fTotalFFactorPINDiodeMethod; // The total F-Factor to Ph's (PIN Diode method) - Float_t fTotalFFactorCombinedMethod; // The total F-Factor to Ph's (all methods combined) - - Float_t fTotalFFactorFFactorMethodVar; // The variance of the total F-Factor to Ph's (F-factor method) - Float_t fTotalFFactorBlindPixelMethodVar; // The variance of the total F-Factor to Ph's (Blind Pixel method) - Float_t fTotalFFactorPINDiodeMethodVar; // The variance of the total F-Factor to Ph's (PIN Diode method) - Float_t fTotalFFactorCombinedMethodVar; // The variance of the total F-Factor to Ph's (all methods combined) - - Float_t fTotalFFactor; // The F-Factor of the total readout system (Sigma(out)/mean(out)*Mean(in)/sigma(in) - Float_t fTotalFFactorVar; // The variance on the F-Factor of the total readout system - - Float_t fConversionHiLo; // The conversion factor between Hi Gain and Lo Gain - Float_t fConversionHiLoVar; // The error of the conversion factor between Hi Gain and Lo Gain - - Byte_t fCalibFlags; // The bit-field for the class-own bits - enum { kBlindPixelMethodValid, kFFactorMethodValid, - kPINDiodeMethodValid, kCombinedMethodValid }; // The possible bits to be set + kPINDiodeMethodValid, kCombinedMethodValid }; // Possible bits to be set public: @@ -81,16 +66,8 @@ // Setter - void SetPedestal(const Float_t ped, const Float_t pedrms, const Float_t pederr); - - void SetConversionHiLo( const Float_t c = fgConversionHiLo) { fConversionHiLo = c; } - void SetConversionHiLoErr( const Float_t e = fgConversionHiLoErr) { fConversionHiLoVar = e*e; } - - void SetPheFFactorMethodLimit ( const Float_t f=fgPheFFactorMethodLimit ) { fPheFFactorMethodLimit = f; } - - // Times - void SetAbsTimeMean ( const Float_t f ) { fAbsTimeMean = f; } - void SetAbsTimeRms ( const Float_t f ) { fAbsTimeRms = f; } - - // Conversion Factors + void SetAbsTimeMean ( const Float_t f ) { fAbsTimeMean = f; } + void SetAbsTimeRms ( const Float_t f ) { fAbsTimeRms = f; } + void SetConversionHiLo ( const Float_t c=fgConversionHiLo ) { fConversionHiLo = c; } + void SetConversionHiLoErr ( const Float_t e=fgConversionHiLoErr ) { fConversionHiLoVar = e*e; } void SetConversionFFactorMethod ( Float_t c, Float_t err, Float_t sig ); void SetConversionBlindPixelMethod( Float_t c, Float_t err, Float_t sig ); @@ -98,69 +75,56 @@ void SetConversionCombinedMethod ( Float_t c, Float_t err, Float_t sig ); - void SetTotalFFactorFFactorMethod ( const Float_t f) { fTotalFFactorFFactorMethod = f; } - void SetTotalFFactorBlindPixelMethod ( const Float_t f) { fTotalFFactorBlindPixelMethod = f; } - void SetTotalFFactorPINDiodeMethod ( const Float_t f) { fTotalFFactorPINDiodeMethod = f; } + void SetBlindPixelMethodValid( const Bool_t b = kTRUE ); + void SetFFactorMethodValid ( const Bool_t b = kTRUE ); + void SetPINDiodeMethodValid ( const Bool_t b = kTRUE ); + void SetCombinedMethodValid ( const Bool_t b = kTRUE ); + + void SetPedestal ( const Float_t ped, const Float_t pedrms, const Float_t pederr); + void SetPheFFactorMethodLimit ( const Float_t f=fgPheFFactorMethodLimit ) { fPheFFactorMethodLimit = f; } + void SetTotalFFactorFFactorMethod ( const Float_t f) { fTotalFFactorFFactorMethod = f; } + void SetTotalFFactorBlindPixelMethod ( const Float_t f) { fTotalFFactorBlindPixelMethod = f; } + void SetTotalFFactorPINDiodeMethod ( const Float_t f) { fTotalFFactorPINDiodeMethod = f; } + void SetTotalFFactorFFactorMethodErr ( const Float_t f) { fTotalFFactorFFactorMethodVar = f*f; } + void SetTotalFFactorBlindPixelMethodErr ( const Float_t f) { fTotalFFactorBlindPixelMethodVar = f*f; } + void SetTotalFFactorPINDiodeMethodErr ( const Float_t f) { fTotalFFactorPINDiodeMethodVar = f*f; } - void SetTotalFFactorFFactorMethodErr ( const Float_t f) { fTotalFFactorFFactorMethodVar = f*f; } - void SetTotalFFactorBlindPixelMethodErr ( const Float_t f) { fTotalFFactorBlindPixelMethodVar = f*f; } - void SetTotalFFactorPINDiodeMethodErr ( const Float_t f) { fTotalFFactorPINDiodeMethodVar = f*f; } - - // Bit Setters - void SetBlindPixelMethodValid( const Bool_t b = kTRUE ); - void SetFFactorMethodValid ( const Bool_t b = kTRUE ); - void SetPINDiodeMethodValid ( const Bool_t b = kTRUE ); - void SetCombinedMethodValid ( const Bool_t b = kTRUE ); - - Float_t GetLoGainMean () const; - Float_t GetLoGainMeanErr () const; - Float_t GetLoGainSigma () const; - Float_t GetLoGainSigmaErr () const; - - Float_t GetRSigma() const; - Float_t GetRSigmaErr() const; - - Float_t GetAbsTimeMean() const { return fAbsTimeMean; } - Float_t GetAbsTimeRms() const { return fAbsTimeRms; } - - // Conversion Factors - Float_t GetConversionHiLo() const { return fConversionHiLo; } - Float_t GetConversionHiLoErr() const; - + // Getters + Float_t GetAbsTimeMean () const { return fAbsTimeMean; } + Float_t GetAbsTimeRms () const { return fAbsTimeRms; } + Float_t GetConversionHiLo () const { return fConversionHiLo; } + Float_t GetConversionHiLoErr() const; + Float_t GetConversionBlindPixelMethodErr() const; + Float_t GetConversionFFactorMethodErr() const; + Float_t GetConversionPINDiodeMethodErr() const; + Float_t GetConversionCombinedMethodErr() const; + Float_t GetLoGainMean () const; + Float_t GetLoGainMeanErr () const; + Float_t GetLoGainSigma () const; + Float_t GetLoGainSigmaErr () const; Float_t GetMeanConversionBlindPixelMethod() const { return fMeanConversionBlindPixelMethod ; } - Float_t GetConversionBlindPixelMethodErr() const; + Float_t GetMeanConversionCombinedMethod() const { return fMeanConversionCombinedMethod ; } + Float_t GetMeanConversionFFactorMethod() const { return fMeanConversionFFactorMethod; } + Float_t GetMeanConversionPINDiodeMethod() const { return fMeanConversionPINDiodeMethod ; } Float_t GetSigmaConversionBlindPixelMethod() const { return fSigmaConversionBlindPixelMethod ; } - - Float_t GetMeanConversionFFactorMethod() const { return fMeanConversionFFactorMethod; } - Float_t GetConversionFFactorMethodErr() const; + Float_t GetSigmaConversionCombinedMethod() const { return fSigmaConversionCombinedMethod ; } Float_t GetSigmaConversionFFactorMethod() const { return fSigmaConversionFFactorMethod; } - - Float_t GetMeanConversionPINDiodeMethod() const { return fMeanConversionPINDiodeMethod ; } - Float_t GetConversionPINDiodeMethodErr() const; Float_t GetSigmaConversionPINDiodeMethod() const { return fSigmaConversionPINDiodeMethod ; } - - Float_t GetMeanConversionCombinedMethod() const { return fMeanConversionCombinedMethod ; } - Float_t GetConversionCombinedMethodErr() const; - Float_t GetSigmaConversionCombinedMethod() const { return fSigmaConversionCombinedMethod ; } - - Float_t GetPheFFactorMethod() const { return fPheFFactorMethod; } + Float_t GetPed () const { return fPed; } + Float_t GetPedErr () const; + Float_t GetPedRms () const; + Float_t GetPedRmsErr () const; + Float_t GetPheFFactorMethod () const { return fPheFFactorMethod; } Float_t GetPheFFactorMethodErr() const; - - Float_t GetPed() const { return fPed; } - Float_t GetPedErr() const; - Float_t GetPedRms() const; - Float_t GetPedRmsErr() const; - + Float_t GetRSigma () const; + Float_t GetRSigmaErr () const; + Float_t GetTotalFFactorBlindPixelMethod() const { return fTotalFFactorBlindPixelMethod; } + Float_t GetTotalFFactorBlindPixelMethodErr() const; + Float_t GetTotalFFactorCombinedMethod() const { return fTotalFFactorCombinedMethod; } + Float_t GetTotalFFactorCombinedMethodErr() const; Float_t GetTotalFFactorFFactorMethod() const { return fTotalFFactorFFactorMethod; } Float_t GetTotalFFactorFFactorMethodErr() const; - - Float_t GetTotalFFactorBlindPixelMethod() const { return fTotalFFactorBlindPixelMethod; } - Float_t GetTotalFFactorBlindPixelMethodErr() const; - Float_t GetTotalFFactorPINDiodeMethod() const { return fTotalFFactorPINDiodeMethod; } Float_t GetTotalFFactorPINDiodeMethodErr() const; - Float_t GetTotalFFactorCombinedMethod() const { return fTotalFFactorCombinedMethod; } - Float_t GetTotalFFactorCombinedMethodErr() const; - Bool_t IsBlindPixelMethodValid() const; Bool_t IsPINDiodeMethodValid() const; Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h (revision 3645) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h (revision 3646) @@ -93,5 +93,5 @@ Bool_t IsValid () const; - ClassDef(MCalibrationPix, 1) // Base class container for Calibration Results Pixel + ClassDef(MCalibrationPix, 1) // Base class Container for Calibration Results Pixel };