Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 3636) +++ trunk/MagicSoft/Mars/Changelog (revision 3637) @@ -24,8 +24,10 @@ * mcalib/MHCalibrationChargeHiGainPix.[h,cc] * mcalib/MHCalibrationChargeLoGainPix.[h,cc] - * mcalib/MHCalibrationRelTimePix.[h,cc] + * mcalib/MHCalibrationChargeBlindPix.[h,cc] + * mcalib/MHCalibrationChargePINDiode.[h,cc] - put fPixId, fPickup, fPickupLimt, CountPickup(), RepeatFit() and ChangeHistId() into MHGausEvents (before in the derived classes) - put fChargeNbins, fChargeFirst, fChargeLast, + * mcalib/MHCalibrationRelTimePix.[h,cc] - put fRelTimeNbins, fRelTimeFirst, fRelTimeLast together into MHGausEvents as fNbins, fFirst and fLast Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc (revision 3636) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc (revision 3637) @@ -111,6 +111,5 @@ // MCalibrationChargePix::MCalibrationChargePix(const char *name, const char *title) - : fPixId(-1), - fFlags(0) + : fCalibFlags(0) { @@ -138,6 +137,4 @@ { - SetHiGainSaturation ( kFALSE ); - SetExcluded ( kFALSE ); SetBlindPixelMethodValid ( kFALSE ); SetFFactorMethodValid ( kFALSE ); @@ -145,22 +142,7 @@ SetCombinedMethodValid ( kFALSE ); - fHiGainMeanCharge = -1.; - fHiGainMeanChargeVar = -1.; - fHiGainSigmaCharge = -1.; - fHiGainSigmaChargeVar = -1.; - fHiGainChargeProb = -1.; - - fLoGainMeanCharge = -1.; - fLoGainMeanChargeVar = -1.; - fLoGainSigmaCharge = -1.; - fLoGainSigmaChargeVar = -1.; - fLoGainChargeProb = -1.; - - fRSigmaCharge = -1.; - fRSigmaChargeVar = -1.; - - fHiGainNumPickup = -1; - fLoGainNumPickup = -1; - + fRSigma = -1.; + fRSigmaVar = -1.; + fPed = -1.; fPedRms = -1.; @@ -196,4 +178,5 @@ fTotalFFactorCombinedMethod = -1.; + MCalibrationPix::Clear(); } @@ -212,38 +195,4 @@ -void MCalibrationChargePix::SetMeanCharge( const Float_t f ) -{ - if (IsHiGainSaturation()) - fLoGainMeanCharge = f; - else - fHiGainMeanCharge = f; -} - -void MCalibrationChargePix::SetMeanChargeErr( const Float_t f ) -{ - if (IsHiGainSaturation()) - fLoGainMeanChargeVar = f*f; - else - fHiGainMeanChargeVar = f*f; - -} - -void MCalibrationChargePix::SetSigmaCharge( const Float_t f ) -{ - if (IsHiGainSaturation()) - fLoGainSigmaCharge = f; - else - fHiGainSigmaCharge = f; -} - - -void MCalibrationChargePix::SetSigmaChargeErr( const Float_t f ) -{ - if (IsHiGainSaturation()) - fLoGainSigmaChargeVar = f*f; - else - fHiGainSigmaChargeVar = f*f; - -} // -------------------------------------------------------------------------- @@ -294,29 +243,18 @@ // -------------------------------------------------------------------------- // -// Set the Hi Gain Saturation Bit from outside -// -void MCalibrationChargePix::SetHiGainSaturation(Bool_t b) -{ - b ? SETBIT(fFlags, kHiGainSaturation) : CLRBIT(fFlags, kHiGainSaturation); -} - - -// -------------------------------------------------------------------------- -// // Set the Excluded Bit from outside // -void MCalibrationChargePix::SetExcluded(Bool_t b ) -{ - b ? SETBIT(fFlags, kExcluded) : CLRBIT(fFlags, kExcluded); -} - - +void MCalibrationChargePix::SetBlindPixelMethodValid(const Bool_t b ) +{ + b ? SETBIT(fCalibFlags, kBlindPixelMethodValid) : CLRBIT(fCalibFlags, kBlindPixelMethodValid); +} + // -------------------------------------------------------------------------- // // Set the Excluded Bit from outside // -void MCalibrationChargePix::SetBlindPixelMethodValid(const Bool_t b ) -{ - b ? SETBIT(fFlags, kBlindPixelMethodValid) : CLRBIT(fFlags, kBlindPixelMethodValid); +void MCalibrationChargePix::SetFFactorMethodValid(const Bool_t b ) +{ + b ? SETBIT(fCalibFlags, kFFactorMethodValid) : CLRBIT(fCalibFlags, kFFactorMethodValid); } @@ -325,8 +263,8 @@ // Set the Excluded Bit from outside // -void MCalibrationChargePix::SetFFactorMethodValid(const Bool_t b ) -{ - b ? SETBIT(fFlags, kFFactorMethodValid) : CLRBIT(fFlags, kFFactorMethodValid); -} +void MCalibrationChargePix::SetPINDiodeMethodValid(const Bool_t b ) +{ + b ? SETBIT(fCalibFlags, kPINDiodeMethodValid) : CLRBIT(fCalibFlags, kPINDiodeMethodValid); +} // -------------------------------------------------------------------------- @@ -334,16 +272,7 @@ // Set the Excluded Bit from outside // -void MCalibrationChargePix::SetPINDiodeMethodValid(const Bool_t b ) -{ - b ? SETBIT(fFlags, kPINDiodeMethodValid) : CLRBIT(fFlags, kPINDiodeMethodValid); -} - -// -------------------------------------------------------------------------- -// -// Set the Excluded Bit from outside -// void MCalibrationChargePix::SetCombinedMethodValid(const Bool_t b ) { - b ? SETBIT(fFlags, kCombinedMethodValid) : CLRBIT(fFlags, kCombinedMethodValid); + b ? SETBIT(fCalibFlags, kCombinedMethodValid) : CLRBIT(fCalibFlags, kCombinedMethodValid); } @@ -364,90 +293,56 @@ } -Float_t MCalibrationChargePix::GetMeanCharge() const -{ - return IsHiGainSaturation() ? GetLoGainMeanCharge() : GetHiGainMeanCharge() ; -} - -Float_t MCalibrationChargePix::GetMeanChargeErr() const -{ - return IsHiGainSaturation() ? GetLoGainMeanChargeErr() : GetHiGainMeanChargeErr() ; -} - -Float_t MCalibrationChargePix::GetChargeProb() const -{ - return IsHiGainSaturation() ? fLoGainChargeProb : fHiGainChargeProb ; -} - -Float_t MCalibrationChargePix::GetSigmaCharge() const -{ - return IsHiGainSaturation() ? GetLoGainSigmaCharge() : GetHiGainSigmaCharge() ; -} - -Float_t MCalibrationChargePix::GetSigmaChargeErr() const -{ - return IsHiGainSaturation() ? GetLoGainSigmaChargeErr() : GetHiGainSigmaChargeErr() ; -} - -Float_t MCalibrationChargePix::GetHiGainMeanChargeErr() const -{ - return TMath::Sqrt(fHiGainMeanChargeVar); -} - -Float_t MCalibrationChargePix::GetLoGainMeanCharge() const -{ - return fLoGainMeanCharge * fConversionHiLo; -} - -Float_t MCalibrationChargePix::GetLoGainMeanChargeErr() const -{ - - const Float_t chargeRelVar = fLoGainMeanChargeVar - /( fLoGainMeanCharge * fLoGainMeanCharge ); + +Float_t MCalibrationChargePix::GetLoGainMean() const +{ + return fLoGainMean * fConversionHiLo; +} + +Float_t MCalibrationChargePix::GetLoGainMeanErr() const +{ + + const Float_t chargeRelVar = fLoGainMeanVar + /( fLoGainMean * fLoGainMean ); const Float_t conversionRelVar = fConversionHiLoVar /( fConversionHiLo * fConversionHiLo ); - return TMath::Sqrt(chargeRelVar+conversionRelVar) * GetLoGainMeanCharge(); -} - -Float_t MCalibrationChargePix::GetLoGainSigmaCharge() const -{ - return fLoGainSigmaCharge * fConversionHiLo; -} - -Float_t MCalibrationChargePix::GetLoGainSigmaChargeErr() const -{ - - const Float_t sigmaRelVar = fLoGainSigmaChargeVar - /( fLoGainSigmaCharge * fLoGainSigmaCharge ); + return TMath::Sqrt(chargeRelVar+conversionRelVar) * GetLoGainMean(); +} + +Float_t MCalibrationChargePix::GetLoGainSigma() const +{ + return fLoGainSigma * fConversionHiLo; +} + +Float_t MCalibrationChargePix::GetLoGainSigmaErr() const +{ + + const Float_t sigmaRelVar = fLoGainSigmaVar + /( fLoGainSigma * fLoGainSigma ); const Float_t conversionRelVar = fConversionHiLoVar /( fConversionHiLo * fConversionHiLo ); - return TMath::Sqrt(sigmaRelVar+conversionRelVar) * GetLoGainSigmaCharge(); -} - -Float_t MCalibrationChargePix::GetHiGainSigmaChargeErr() const -{ - return TMath::Sqrt(fHiGainSigmaChargeVar); -} - -Float_t MCalibrationChargePix::GetRSigmaCharge() const -{ - return IsHiGainSaturation() ? fRSigmaCharge*fConversionHiLo : fRSigmaCharge ; + return TMath::Sqrt(sigmaRelVar+conversionRelVar) * GetLoGainSigma(); +} + +Float_t MCalibrationChargePix::GetRSigma() const +{ + return IsHiGainSaturation() ? fRSigma*fConversionHiLo : fRSigma ; } -Float_t MCalibrationChargePix::GetRSigmaChargeErr() const +Float_t MCalibrationChargePix::GetRSigmaErr() const { if (IsHiGainSaturation()) { - const Float_t rsigmaRelVar = fRSigmaChargeVar - /( fRSigmaCharge * fRSigmaCharge ); + const Float_t rsigmaRelVar = fRSigmaVar + /( fRSigma * fRSigma ); const Float_t conversionRelVar = fConversionHiLoVar /( fConversionHiLo * fConversionHiLo ); - return TMath::Sqrt(rsigmaRelVar+conversionRelVar) * GetRSigmaCharge(); + return TMath::Sqrt(rsigmaRelVar+conversionRelVar) * GetRSigma(); } else - return TMath::Sqrt(fRSigmaChargeVar); + return TMath::Sqrt(fRSigmaVar); } @@ -523,32 +418,22 @@ } -Bool_t MCalibrationChargePix::IsExcluded() const -{ - return TESTBIT(fFlags,kExcluded); -} - -Bool_t MCalibrationChargePix::IsHiGainSaturation() const -{ - return TESTBIT(fFlags,kHiGainSaturation); -} - Bool_t MCalibrationChargePix::IsBlindPixelMethodValid() const { - return TESTBIT(fFlags, kBlindPixelMethodValid); + return TESTBIT(fCalibFlags, kBlindPixelMethodValid); } Bool_t MCalibrationChargePix::IsFFactorMethodValid() const { - return TESTBIT(fFlags, kFFactorMethodValid); + return TESTBIT(fCalibFlags, kFFactorMethodValid); } Bool_t MCalibrationChargePix::IsPINDiodeMethodValid() const { - return TESTBIT(fFlags, kPINDiodeMethodValid); + return TESTBIT(fCalibFlags, kPINDiodeMethodValid); } Bool_t MCalibrationChargePix::IsCombinedMethodValid() const { - return TESTBIT(fFlags, kCombinedMethodValid); + return TESTBIT(fCalibFlags, kCombinedMethodValid); } @@ -559,9 +444,9 @@ { - const Float_t sigmacharge = IsHiGainSaturation() ? fLoGainSigmaCharge : fHiGainSigmaCharge ; - const Float_t sigmachargevar = IsHiGainSaturation() ? fLoGainSigmaChargeVar : fHiGainSigmaChargeVar; - - const Float_t sigmaSquare = sigmacharge * sigmacharge; - const Float_t sigmaSquareVar = 4.* sigmachargevar * sigmaSquare; + const Float_t sigma = IsHiGainSaturation() ? fLoGainSigma : fHiGainSigma ; + const Float_t sigmavar = IsHiGainSaturation() ? fLoGainSigmaVar : fHiGainSigmaVar; + + const Float_t sigmaSquare = sigma * sigma; + const Float_t sigmaSquareVar = 4.* sigmavar * sigmaSquare; Float_t pedRmsSquare ; @@ -581,6 +466,6 @@ // Calculate the reduced sigmas // - const Float_t rsigmachargesquare = sigmaSquare - pedRmsSquare; - if (rsigmachargesquare <= 0.) + const Float_t rsigmasquare = sigmaSquare - pedRmsSquare; + if (rsigmasquare <= 0.) { *fLog << warn @@ -591,6 +476,6 @@ - fRSigmaCharge = TMath::Sqrt(rsigmachargesquare); - fRSigmaChargeVar = 0.25 * (sigmaSquareVar + pedRmsSquareVar) / rsigmachargesquare; + fRSigma = TMath::Sqrt(rsigmasquare); + fRSigmaVar = 0.25 * (sigmaSquareVar + pedRmsSquareVar) / rsigmasquare; return kTRUE; @@ -604,5 +489,5 @@ { - if (fRSigmaCharge < 0.) + if (fRSigma < 0.) { SetFFactorMethodValid(kFALSE); @@ -610,6 +495,6 @@ } - const Float_t charge = IsHiGainSaturation() ? fLoGainMeanCharge : fHiGainMeanCharge ; - const Float_t chargevar = IsHiGainSaturation() ? fLoGainMeanChargeVar : fHiGainMeanChargeVar; + const Float_t mean = IsHiGainSaturation() ? fLoGainMean : fHiGainMean ; + const Float_t var = IsHiGainSaturation() ? fLoGainMeanVar : fHiGainMeanVar; // @@ -618,12 +503,12 @@ // First the relative error squares // - const Float_t chargeSquare = charge * charge; - const Float_t chargeSquareRelVar = 4.* chargevar/ chargeSquare; + const Float_t meanSquare = mean * mean; + const Float_t meanSquareRelVar = 4.* var/ meanSquare; const Float_t ffactorsquare = gkFFactor * gkFFactor; const Float_t ffactorsquareRelVar = 4.*gkFFactorErr * gkFFactorErr / ffactorsquare; - const Float_t rsigmaSquare = fRSigmaCharge * fRSigmaCharge; - const Float_t rsigmaSquareRelVar = 4.* fRSigmaChargeVar / rsigmaSquare; + const Float_t rsigmaSquare = fRSigma * fRSigma; + const Float_t rsigmaSquareRelVar = 4.* fRSigmaVar / rsigmaSquare; // @@ -631,5 +516,5 @@ // (independent on Hi Gain or Lo Gain) // - fPheFFactorMethod = ffactorsquare * chargeSquare / rsigmaSquare; + fPheFFactorMethod = ffactorsquare * meanSquare / rsigmaSquare; if (fPheFFactorMethod < fPheFFactorMethodLimit) @@ -642,5 +527,5 @@ // Calculate the Error of Nphe // - fPheFFactorMethodVar = (ffactorsquareRelVar + chargeSquareRelVar + rsigmaSquareRelVar) + fPheFFactorMethodVar = (ffactorsquareRelVar + meanSquareRelVar + rsigmaSquareRelVar) * fPheFFactorMethod * fPheFFactorMethod; Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h (revision 3636) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h (revision 3637) @@ -2,10 +2,10 @@ #define MARS_MCalibrationChargePix -#ifndef MARS_MParContainer -#include "MParContainer.h" +#ifndef MARS_MCalibrationPix +#include "MCalibrationPix.h" #endif class MBadPixelsPix; -class MCalibrationChargePix : public MParContainer +class MCalibrationChargePix : public MCalibrationPix { private: @@ -27,22 +27,6 @@ Float_t fPheFFactorMethodLimit; // The minimum number of Photo-electrons for a pixel to be accepted. - Int_t fPixId; // the pixel Id - - UInt_t fFlags; // Flag for the set bits - - Float_t fHiGainMeanCharge; // The mean reduced charge after the fit - Float_t fHiGainMeanChargeVar; // The error of reduced mean charge after the fit - Float_t fHiGainSigmaCharge; // The sigma of the mean charge after the fit - Float_t fHiGainSigmaChargeVar; // 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 fLoGainMeanChargeVar; // The error of reduced mean charge after the fit - Float_t fLoGainSigmaCharge; // The sigma of the mean charge after the fit - Float_t fLoGainSigmaChargeVar; // 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 fRSigmaChargeVar; // The reduced squares of sigmas after the fit + 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 @@ -90,9 +74,7 @@ Float_t fConversionHiLoVar; // The error of the conversion factor between Hi Gain and Lo Gain - Float_t fHiGainNumPickup; - Float_t fLoGainNumPickup; + Byte_t fCalibFlags; - enum { kHiGainSaturation, kExcluded, - kBlindPixelMethodValid, kFFactorMethodValid, + enum { kBlindPixelMethodValid, kFFactorMethodValid, kPINDiodeMethodValid, kCombinedMethodValid }; @@ -105,6 +87,4 @@ // Setter - void SetPixId( const Int_t i ) { fPixId = i; } - void SetPedestal(const Float_t ped, const Float_t pedrms, const Float_t pederr); @@ -114,25 +94,4 @@ void SetPheFFactorMethodLimit ( const Float_t f=fgPheFFactorMethodLimit ) { fPheFFactorMethodLimit = f; } - // Charges - void SetHiGainMeanCharge ( const Float_t f ) { fHiGainMeanCharge = f; } - void SetHiGainMeanChargeErr ( const Float_t f ) { fHiGainMeanChargeVar = f*f; } - void SetHiGainChargeProb ( const Float_t f ) { fHiGainChargeProb = f; } - void SetHiGainSigmaCharge ( const Float_t f ) { fHiGainSigmaCharge = f; } - void SetHiGainSigmaChargeErr ( const Float_t f ) { fHiGainSigmaChargeVar = f*f; } - - void SetLoGainMeanCharge ( const Float_t f ) { fLoGainMeanCharge = f; } - void SetLoGainMeanChargeErr ( const Float_t f ) { fLoGainMeanChargeVar = f*f; } - void SetLoGainChargeProb ( const Float_t f ) { fLoGainChargeProb = f; } - void SetLoGainSigmaCharge ( const Float_t f ) { fLoGainSigmaCharge = f; } - void SetLoGainSigmaChargeErr ( const Float_t f ) { fLoGainSigmaChargeVar = f*f; } - - void SetMeanCharge ( const Float_t f ); - void SetMeanChargeErr ( const Float_t f ); - void SetSigmaCharge ( const Float_t f ); - void SetSigmaChargeErr ( const Float_t f ); - - void SetHiGainNumPickup ( const Float_t f ) { fHiGainNumPickup = f; } - void SetLoGainNumPickup ( const Float_t f ) { fLoGainNumPickup = f; } - // Times void SetAbsTimeMean ( const Float_t f ) { fAbsTimeMean = f; } @@ -154,6 +113,4 @@ // Bit Setters - void SetHiGainSaturation ( const Bool_t b = kTRUE ); - void SetExcluded ( const Bool_t b = kTRUE ); void SetBlindPixelMethodValid( const Bool_t b = kTRUE ); void SetFFactorMethodValid ( const Bool_t b = kTRUE ); @@ -161,28 +118,11 @@ void SetCombinedMethodValid ( const Bool_t b = kTRUE ); - // Charges - Float_t GetHiGainMeanCharge() const { return fHiGainMeanCharge; } - Float_t GetHiGainMeanChargeErr() const; - Float_t GetHiGainChargeProb() const { return fHiGainChargeProb; } - Float_t GetHiGainSigmaCharge() const { return fHiGainSigmaCharge; } - Float_t GetHiGainSigmaChargeErr() const; + Float_t GetLoGainMean () const; + Float_t GetLoGainMeanErr () const; + Float_t GetLoGainSigma () const; + Float_t GetLoGainSigmaErr () const; - Float_t GetLoGainMeanCharge() const; - Float_t GetLoGainMeanChargeErr() const; - Float_t GetLoGainChargeProb() const { return fLoGainChargeProb; } - Float_t GetLoGainSigmaCharge() const; - Float_t GetLoGainSigmaChargeErr() const; - - Float_t GetMeanCharge() const; - Float_t GetMeanChargeErr() const; - Float_t GetChargeProb() const; - Float_t GetSigmaCharge() const; - Float_t GetSigmaChargeErr() const; - - Float_t GetRSigmaCharge() const; - Float_t GetRSigmaChargeErr() const; - - Float_t GetHiGainNumPickup() const { return fHiGainNumPickup; } - Float_t GetLoGainNumPickup() const { return fLoGainNumPickup; } + Float_t GetRSigma() const; + Float_t GetRSigmaErr() const; Float_t GetAbsTimeMean() const { return fAbsTimeMean; } @@ -212,6 +152,4 @@ Float_t GetPheFFactorMethodErr() const; - Int_t GetPixId() const { return fPixId; } - Float_t GetPed() const { return fPed; } Float_t GetPedErr() const; @@ -231,6 +169,4 @@ Float_t GetTotalFFactorCombinedMethodErr() const; - Bool_t IsExcluded() const; - Bool_t IsHiGainSaturation() const; Bool_t IsBlindPixelMethodValid() const; Bool_t IsPINDiodeMethodValid() const; Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc (revision 3636) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc (revision 3637) @@ -105,7 +105,7 @@ // // Sets: -// - the default number for fChargeNbins (fgChargeNbins) -// - the default number for fChargeFirst (fgChargeFirst) -// - the default number for fChargeLast (fgChargeLast) +// - the default number for MHGausEvents::fNbins (fgChargeNbins) +// - the default number for MHGausEvents::fFirst (fgChargeFirst) +// - the default number for MHGausEvents::fLast (fgChargeLast) // - the default number for fSinglePheCut (fgSingePheCut) // - the default number for fNumSinglePheLimit (fgNumSinglePheLimit) @@ -132,7 +132,7 @@ fTitle = title ? title : "Fill the accumulated charges and times of all Blind Pixel events and perform fits"; - SetChargeNbins(); - SetChargeFirst(); - SetChargeLast(); + SetNbins( fgChargeNbins ); + SetFirst( fgChargeFirst ); + SetLast ( fgChargeLast ); SetSinglePheCut(); @@ -278,6 +278,5 @@ // - fAPedestalFADCSlices(0); // -// Sets Binning of the following histograms: -// - fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast); +// Sets Binning of the fHGausHist // Bool_t MHCalibrationChargeBlindPix::SetupFill(const MParList *pList) @@ -301,5 +300,5 @@ fAPedestalFADCSlices(0); - fHGausHist.SetBins( fChargeNbins, fChargeFirst, fChargeLast); + InitBins(); return kTRUE; @@ -403,5 +402,5 @@ CreateFourierSpectrum(); fBlindPix->SetOscillating ( !IsFourierSpectrumOK() ); - + fMeanPedestal = fSignal->GetPed(); fMeanPedestalErr = fSignal->GetPedErr(); Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h (revision 3636) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h (revision 3637) @@ -27,9 +27,9 @@ private: - static const Int_t fgChargeNbins; // Default for fChargeNBins (now set to: 5300 ) - static const Axis_t fgChargeFirst; // Default for fChargeFirst (now set to: -100.5 ) - static const Axis_t fgChargeLast; // Default for fChargeLast (now set to: 5199.5 ) - static const Float_t fgSinglePheCut; // Default for fSinglePheCut (now set to: 200 ) - static const Float_t fgNumSinglePheLimit; // Default for fNumSinglePheLimit (now set to: 50 ) + static const Int_t fgChargeNbins; //! Default for MHGausEvents::fNBins (now set to: 5300 ) + static const Axis_t fgChargeFirst; //! Default for MHGausEvents::fFirst (now set to: -100.5 ) + static const Axis_t fgChargeLast; //! Default for MHGausEvents::fLast (now set to: 5199.5 ) + static const Float_t fgSinglePheCut; //! Default for fSinglePheCut (now set to: 200 ) + static const Float_t fgNumSinglePheLimit; //! Default for fNumSinglePheLimit (now set to: 50 ) static const Double_t gkElectronicAmp; // Electronic Amplification after the PMT (in FADC counts/N_e) @@ -103,7 +103,4 @@ // Setters - void SetChargeNbins ( const Int_t bins =fgChargeNbins ) { fChargeNbins = bins; } - void SetChargeFirst ( const Axis_t first=fgChargeFirst ) { fChargeFirst = first; } - void SetChargeLast ( const Axis_t last =fgChargeLast ) { fChargeLast = last; } void SetSinglePheCut ( const Float_t cut =fgSinglePheCut ) { fSinglePheCut = cut; } void SetNumSinglePheLimit ( const Float_t lim =fgNumSinglePheLimit ) { fNumSinglePheLimit = lim; } Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc (revision 3636) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc (revision 3637) @@ -65,13 +65,13 @@ // // Sets: -// - the default number for fChargeNbins (fgChargeNbins) -// - the default number for fChargeFirst (fgChargeFirst) -// - the default number for fChargeLast (fgChargeLast) -// - the default number for fRmsChargeNbins (fgRmsChargeNbins) -// - the default number for fRmsChargeFirst (fgRmsChargeFirst) -// - the default number for fRmsChargeLast (fgRmsChargeLast) -// - the default number for fAbsTimeNbins (fgAbsTimeNbins) -// - the default number for fAbsTimeFirst (fgAbsTimeFirst) -// - the default number for fAbsTimeLast (fgAbsTimeLast) +// - the default number for MHGausEvents::fNbins (fgChargeNbins) +// - the default number for MHGausEvents::fFirst (fgChargeFirst) +// - the default number for MHGausEvents::fLast (fgChargeLast) +// - the default number for fRmsChargeNbins (fgRmsChargeNbins) +// - the default number for fRmsChargeFirst (fgRmsChargeFirst) +// - the default number for fRmsChargeLast (fgRmsChargeLast) +// - the default number for fAbsTimeNbins (fgAbsTimeNbins) +// - the default number for fAbsTimeFirst (fgAbsTimeFirst) +// - the default number for fAbsTimeLast (fgAbsTimeLast) // // - the default name of the fHGausHist ("HCalibrationChargePINDiode") @@ -102,7 +102,7 @@ fTitle = title ? title : "Fill the FADC sums of the PINDiode events and perform the fits"; - SetChargeNbins(); - SetChargeFirst(); - SetChargeLast(); + SetNbins( fgChargeNbins ); + SetFirst( fgChargeFirst ); + SetLast ( fgChargeLast ); SetRmsChargeNbins(); @@ -137,5 +137,5 @@ // // Initializes Binning of the following histograms: -// - fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast); +// - fHGausHist.SetBins(fNbins,fFirst,fLast); // - fHAbsTime.SetBins(fAbsTimeNbins,fAbsTimeFirst,fAbsTimeLast); // - fHRmsCharge.SetBins(fRmsChargeNbins,fRmsChargeFirst,fRmsChargeLast); @@ -144,5 +144,6 @@ { - fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast); + MHGausEvents::InitBins(); + fHAbsTime.SetBins(fAbsTimeNbins,fAbsTimeFirst,fAbsTimeLast); fHRmsCharge.SetBins(fRmsChargeNbins,fRmsChargeFirst,fRmsChargeLast); Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.h (revision 3636) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.h (revision 3637) @@ -13,13 +13,13 @@ private: - static const Int_t fgChargeNbins; // Default for fChargeNBins (now set to: 200 ) - static const Axis_t fgChargeFirst; // Default for fChargeFirst (now set to: -0.5 ) - static const Axis_t fgChargeLast; // Default for fChargeLast (now set to: 199.5 ) - static const Int_t fgRmsChargeNbins; // Default for fChargeNBins (now set to: 100 ) - static const Axis_t fgRmsChargeFirst; // Default for fChargeFirst (now set to: 0. ) - static const Axis_t fgRmsChargeLast; // Default for fChargeLast (now set to: 100. ) - static const Int_t fgAbsTimeNbins; // Default for fChargeNBins (now set to: 30 ) - static const Axis_t fgAbsTimeFirst; // Default for fChargeFirst (now set to: -0.5 ) - static const Axis_t fgAbsTimeLast; // Default for fChargeLast (now set to: 29.5 ) + static const Int_t fgChargeNbins; //! Default for MHGausEvents::fNBins (now set to: 200 ) + static const Axis_t fgChargeFirst; //! Default for MHGausEvents::fFirst (now set to: -0.5 ) + static const Axis_t fgChargeLast; //! Default for MHGausEvents::fLast (now set to: 199.5 ) + static const Int_t fgRmsChargeNbins; //! Default for fRmsChargeNBins (now set to: 100 ) + static const Axis_t fgRmsChargeFirst; //! Default for fRmsChargeFirst (now set to: 0. ) + static const Axis_t fgRmsChargeLast; //! Default for fRmsChargeLast (now set to: 100. ) + static const Int_t fgAbsTimeNbins; //! Default for fAbsTimeNBins (now set to: 30 ) + static const Axis_t fgAbsTimeFirst; //! Default for fAbsTimeFirst (now set to: -0.5 ) + static const Axis_t fgAbsTimeLast; //! Default for fAbsTimeLast (now set to: 29.5 ) MCalibrationChargePINDiode *fPINDiode; //! Storage container of the results @@ -47,8 +47,4 @@ // Setters - void SetChargeNbins(const Int_t bins =fgChargeNbins) { fChargeNbins = bins; } - void SetChargeFirst(const Axis_t first=fgChargeFirst) { fChargeFirst = first; } - void SetChargeLast( const Axis_t last =fgChargeLast) { fChargeLast = last; } - void SetAbsTimeNbins(const Int_t bins =fgAbsTimeNbins) { fAbsTimeNbins = bins; } void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst) { fAbsTimeFirst = first; }