Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc (revision 3660) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc (revision 3661) @@ -77,6 +77,4 @@ const Float_t MCalibrationChargePINDiode::gkPINDiodeQEUVErr = -1.0; const Float_t MCalibrationChargePINDiode::gkPINDiodeQECT1Err = -1.0; - -const Float_t MCalibrationChargePINDiode::gkPINDiodeArea = 100; // -------------------------------------------------------------------------- // Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h (revision 3660) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h (revision 3661) @@ -10,37 +10,36 @@ private: - static const Float_t fgChargeToPhotons; //! Default for fChargeToPhotons - static const Float_t fgChargeToPhotonsErr; //! Default for fChargeToPhotonsVar - static const Float_t gkPINDiodeArea; //! PIN Diode Effective Area in mm^2 - static const Float_t gkPINDiodeQEGreen; //! Quantum Efficiency at 520 nm - static const Float_t gkPINDiodeQEBlue; //! Quantum Efficiency at 460 nm - static const Float_t gkPINDiodeQEUV; //! Quantum Efficiency at 370 nm - static const Float_t gkPINDiodeQECT1; //! Quantum Efficiency at 370 nm - static const Float_t gkPINDiodeQEGreenErr; //! Uncertainty QE at 520 nm - static const Float_t gkPINDiodeQEBlueErr; //! Uncertainty QE at 460 nm - static const Float_t gkPINDiodeQEUVErr; //! Uncertainty QE at 370 nm - static const Float_t gkPINDiodeQECT1Err; //! Uncertainty QE at 370 nmu - static const Float_t gkSolidAngleRatio; //! Solid angles ratio PIN Diode - inner pixel - static const Float_t gkSolidAngleRatioErr; //! Error solid angle ratio PIN Diode - inn. pix. + static const Float_t fgChargeToPhotons; //! Default for fChargeToPhotons + static const Float_t fgChargeToPhotonsErr; //! Default for fChargeToPhotonsVar + static const Float_t gkPINDiodeQEGreen; //! Quantum Efficiency at 520 nm + static const Float_t gkPINDiodeQEBlue; //! Quantum Efficiency at 460 nm + static const Float_t gkPINDiodeQEUV; //! Quantum Efficiency at 370 nm + static const Float_t gkPINDiodeQECT1; //! Quantum Efficiency at 370 nm + static const Float_t gkPINDiodeQEGreenErr; //! Uncertainty QE at 520 nm + static const Float_t gkPINDiodeQEBlueErr; //! Uncertainty QE at 460 nm + static const Float_t gkPINDiodeQEUVErr; //! Uncertainty QE at 370 nm + static const Float_t gkPINDiodeQECT1Err; //! Uncertainty QE at 370 nmu + static const Float_t gkSolidAngleRatio; //! Solid angles ratio PIN Diode - inner pixel + static const Float_t gkSolidAngleRatioErr; //! Error solid angle ratio PIN Diode - inn. pix. - 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 fChargeLimit; // Limit (in units of PedRMS) for acceptance fitted mean charge - Float_t fChargeErrLimit; // Limit (in units of PedRMS) for acceptance fitted charge sigma - Float_t fChargeRelErrLimit; // Limit (in units of Error of fitted charge) for acceptance fitted mean - Float_t fChargeToPhotons; // Mean conv. PIN Diode charge to number of incident photons - Float_t fChargeToPhotonsVar; // Variance of mean conv. PIN Diode charge to nr. incident photons - Float_t fNumPhotons; // Number photons incidident on PIN Diode - Float_t fNumPhotonsVar; // Variance nr. photons incid. on PIN Diode - Float_t fFluxOutsidePlexiglass; // Mean number photons in INNER PIXEL outside plexiglass - Float_t fFluxOutsidePlexiglassVar; // Error on nr. photons in INNER PIXEL outside plexiglass - Float_t fPed; // Mean pedestal (from MPedestalPix) - Float_t fPedRms; // Pedestal RMS (from MPedestalPix) - Float_t fRmsChargeMean; // Mean of RMS of summed FADC slices distribution - Float_t fRmsChargeMeanErr; // Error on Mean RMS summed FADC slices distribution - Float_t fRmsChargeSigma; // Sigma of RMS of summed FADC slices distribution - Float_t fRmsChargeSigmaErr; // Error on Sigma RMS summed FADC slices distribution - PulserColor_t fColor; // Colour of the pulsed LEDs + 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 fChargeLimit; // Limit (in units of PedRMS) for acceptance fitted mean charge + Float_t fChargeErrLimit; // Limit (in units of PedRMS) for acceptance fitted charge sigma + Float_t fChargeRelErrLimit; // Limit (in units of Error of fitted charge) for acceptance fitted mean + Float_t fChargeToPhotons; // Mean conv. PIN Diode charge to number of incident photons + Float_t fChargeToPhotonsVar; // Variance of mean conv. PIN Diode charge to nr. incident photons + Float_t fNumPhotons; // Number photons incidident on PIN Diode + Float_t fNumPhotonsVar; // Variance nr. photons incid. on PIN Diode + Float_t fFluxOutsidePlexiglass; // Mean number photons in INNER PIXEL outside plexiglass + Float_t fFluxOutsidePlexiglassVar; // Error on nr. photons in INNER PIXEL outside plexiglass + Float_t fPed; // Mean pedestal (from MPedestalPix) + Float_t fPedRms; // Pedestal RMS (from MPedestalPix) + Float_t fRmsChargeMean; // Mean of RMS of summed FADC slices distribution + Float_t fRmsChargeMeanErr; // Error on Mean RMS summed FADC slices distribution + Float_t fRmsChargeSigma; // Sigma of RMS of summed FADC slices distribution + Float_t fRmsChargeSigmaErr; // Error on Sigma RMS summed FADC slices distribution + PulserColor_t fColor; // Colour of the pulsed LEDs enum { kOscillating,