Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h (revision 3270) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h (revision 3271) @@ -21,7 +21,7 @@ static const Float_t gkFFactorErr; // The laboratory F-factor Error of the PMTs - static const Float_t fgChargeLimit; // The default limit (in units of PedRMS) for acceptance of the fitted mean charge - static const Float_t fgChargeErrLimit; // The default limit (in units of PedRMS) for acceptance of the fitted charge sigma - static const Float_t fgChargeRelErrLimit; // The default limit (in units of Error of fitted charge) for acceptance of the fitted mean + static const Float_t fgChargeLimit; // The default limit (in units of PedRMS) for acceptance of the fitted mean charge + static const Float_t fgChargeErrLimit; // The default limit (in units of PedRMS) for acceptance of the fitted charge sigma + static const Float_t fgChargeRelErrLimit; // The default limit (in units of Error of fitted charge) for acceptance of the fitted mean static const Float_t fgTimeLimit; // The limit (in units of FADC slices) for acceptance of the fitted time @@ -40,64 +40,64 @@ Float_t fElectronicPedRmsErr; // The error of the pure electronic component of the RMS - Int_t fPixId; // the pixel Id - - UInt_t fFlags; // Flag for the set bits + Int_t fPixId; // the pixel Id + + UInt_t fFlags; // Flag for the set bits - Float_t fAverageQE; // The average quantum efficieny (see Class description) - Float_t fAverageQEErr; // The error of the average quantum efficieny (see Class description) - - Float_t fHiGainMeanCharge; // The mean reduced charge after the fit - Float_t fHiGainMeanChargeErr; // The error of reduced mean charge after the fit - Float_t fHiGainSigmaCharge; // The sigma of the mean charge after the fit - Float_t fHiGainSigmaChargeErr; // The error of the sigma of the mean charge after the fit - Float_t fHiGainChargeProb; // The probability of the fit function - - Float_t fLoGainMeanCharge; // The mean reduced charge after the fit - Float_t fLoGainMeanChargeErr; // The error of reduced mean charge after the fit - Float_t fLoGainSigmaCharge; // The sigma of the mean charge after the fit - Float_t fLoGainSigmaChargeErr; // The error of the sigma of the mean charge after the fit - Float_t fLoGainChargeProb; // The probability of the fit function - - Float_t fRSigmaCharge; // The reduced squares of sigmas after the fit - Float_t fRSigmaChargeErr; // The reduced squares of sigmas after the fit - - Float_t fPed; // The mean pedestal (from MPedestalPix) times number of FADC slices - Float_t fPedErr; // 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 fLoGainPedRmsErr; // The pedestal RMS Error of the low gain - - Float_t fAbsTimeMean; // The mean absolute arrival time - Float_t fAbsTimeRms; // The rms of the mean absolute arrival time - - 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) - Float_t fPheFFactorMethodErr; // 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 fConversionFFactorMethodErr; // The error of the conversion factor to Phe's (F-factor method) - Float_t fConversionBlindPixelMethodErr; // The error of the conversion factor to Ph's (Blind Pixel method) - Float_t fConversionPINDiodeMethodErr; // The error of the conversion factor to Ph's (PIN Diode method) - Float_t fConversionCombinedMethodErr; // 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 fAverageQE; // The average quantum efficieny (see Class description) + Float_t fAverageQEErr; // The error of the average quantum efficieny (see Class description) + + Float_t fHiGainMeanCharge; // The mean reduced charge after the fit + Float_t fHiGainMeanChargeErr; // The error of reduced mean charge after the fit + Float_t fHiGainSigmaCharge; // The sigma of the mean charge after the fit + Float_t fHiGainSigmaChargeErr; // The error of the sigma of the mean charge after the fit + Float_t fHiGainChargeProb; // The probability of the fit function + + Float_t fLoGainMeanCharge; // The mean reduced charge after the fit + Float_t fLoGainMeanChargeErr; // The error of reduced mean charge after the fit + Float_t fLoGainSigmaCharge; // The sigma of the mean charge after the fit + Float_t fLoGainSigmaChargeErr; // The error of the sigma of the mean charge after the fit + Float_t fLoGainChargeProb; // The probability of the fit function + + Float_t fRSigmaCharge; // The reduced squares of sigmas after the fit + Float_t fRSigmaChargeErr; // The reduced squares of sigmas after the fit + + Float_t fPed; // The mean pedestal (from MPedestalPix) times number of FADC slices + Float_t fPedErr; // 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 fLoGainPedRmsErr; // The pedestal RMS Error of the low gain + + Float_t fAbsTimeMean; // The mean absolute arrival time + Float_t fAbsTimeRms; // The rms of the mean absolute arrival time + + 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) + Float_t fPheFFactorMethodErr; // 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 fConversionFFactorMethodErr; // The error of the conversion factor to Phe's (F-factor method) + Float_t fConversionBlindPixelMethodErr; // The error of the conversion factor to Ph's (Blind Pixel method) + Float_t fConversionPINDiodeMethodErr; // The error of the conversion factor to Ph's (PIN Diode method) + Float_t fConversionCombinedMethodErr; // 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 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 fTotalFFactorErrFFactorMethod; // The error of the total F-Factor to Ph's (F-factor method)