Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 5048) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 5049) @@ -31,5 +31,4 @@ ///////////////////////////////////////////////////////////////////////////// #include "MHCalibrationChargeBlindCam.h" -#include "MHCalibrationChargeBlindPix.h" #include @@ -200,5 +199,5 @@ pix.SetLast ( integ ? ((fLast+0.5)*samples)-0.5 : fLast ); pix.SetSinglePheCut ( integ ? fSPheCut * samples : fSPheCut ); - pix.SetFitFunc ( integ ? kEPoisson5 : fFitFunc ); + pix.SetFitFunc ( integ ? MHCalibrationChargeBlindPix::kEPoisson5 : fFitFunc ); h = pix.GetHGausHist(); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h (revision 5048) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h (revision 5049) @@ -4,4 +4,8 @@ #ifndef MARS_MHCalibrationCam #include "MHCalibrationCam.h" +#endif + +#ifndef MARS_MHCalibrationChargeBlindPix +#include "MHCalibrationChargeBlindPix.h" #endif @@ -23,4 +27,6 @@ static const TString gsHistXTitle; //! Default Histogram x-axis titles static const TString gsHistYTitle; //! Default Histogram y-axis titles + static const MHCalibrationChargeBlindPix::FitFunc_t fgFitFunc + = MHCalibrationChargeBlindPix::kEPoisson4; //! Default for fFitFunc Axis_t fSPheCut; // Signal value upon which event considered as single-phe @@ -28,15 +34,5 @@ MRawEvtData *fRawEvt; //! Raw event data -public: - - enum FitFunc_t { kEPoisson4, kEPoisson5, - kEPoisson6, kEPoisson7, - kEPolya, kEMichele }; // Possible fit functions types (see MHCalibrationChargeBlindPix) - - static const FitFunc_t fgFitFunc = kEPoisson4; //! Default for fFitFunc - -private: - - FitFunc_t fFitFunc; // The actual fit function type + MHCalibrationChargeBlindPix::FitFunc_t fFitFunc; // The actual fit function type Bool_t SetupHists (const MParList *pList ); @@ -58,5 +54,5 @@ // Draw void Draw(Option_t *opt=""); - void SetFitFunc( const FitFunc_t func=fgFitFunc ) { fFitFunc = func; } + void SetFitFunc( const MHCalibrationChargeBlindPix::FitFunc_t func=fgFitFunc ) { fFitFunc = func; } void SetSPheCut( const Axis_t a =fgSPheCut ) { fSPheCut = a; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc (revision 5048) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc (revision 5049) @@ -69,5 +69,4 @@ ////////////////////////////////////////////////////////////////////////////// #include "MHCalibrationChargeBlindPix.h" -#include "MHCalibrationChargeBlindCam.h" #include @@ -192,5 +191,5 @@ fLambdaCheckErr = gkSignalInitializer; - fFitFunc = MHCalibrationChargeBlindCam::kEPoisson5; + fFitFunc = kEPoisson5; fNumSinglePhes = 0; @@ -519,19 +518,19 @@ switch (fFitFunc) { - case MHCalibrationChargeBlindCam::kEPoisson4: + case kEPoisson4: fSinglePheFit = new TF1("SinglePheFit",&fPoissonKto4,rmin,rmax,6); rmin += 6.5; break; - case MHCalibrationChargeBlindCam::kEPoisson5: + case kEPoisson5: fSinglePheFit = new TF1("SinglePheFit",&fPoissonKto5,rmin,rmax,6); rmin = 0.; break; - case MHCalibrationChargeBlindCam::kEPoisson6: + case kEPoisson6: fSinglePheFit = new TF1("SinglePheFit",&fPoissonKto6,rmin,rmax,6); break; - case MHCalibrationChargeBlindCam::kEPolya: + case kEPolya: fSinglePheFit = new TF1("SinglePheFit",&fPolya,rmin,rmax,8); break; - case MHCalibrationChargeBlindCam::kEMichele: + case kEMichele: fSinglePheFit = new TF1("SinglePheFit",&fFitFuncMichele,rmin,rmax,9); break; @@ -572,5 +571,5 @@ { - case MHCalibrationChargeBlindCam::kEPoisson4: + case kEPoisson4: fSinglePheFit->SetParNames( "#lambda", "#mu_{0}", "#mu_{1}", "#sigma_{0}", "#sigma_{1}","Area"); fSinglePheFit->SetParameters(lambda_guess,mu_0_guess,mu_1_guess,si_0_guess,si_1_guess,norm); @@ -582,6 +581,6 @@ fSinglePheFit->SetParLimits(5,norm-(0.5*norm),norm+(0.7*norm)); break; - case MHCalibrationChargeBlindCam::kEPoisson5: - case MHCalibrationChargeBlindCam::kEPoisson6: + case kEPoisson5: + case kEPoisson6: fSinglePheFit->SetParNames("#lambda","#mu_{0}","#mu_{1}","#sigma_{0}","#sigma_{1}","Area"); fSinglePheFit->SetParameters(lambda_guess,mu_0_guess,800.,si_0_guess,500.,norm); @@ -594,5 +593,5 @@ break; - case MHCalibrationChargeBlindCam::kEPolya: + case kEPolya: fSinglePheFit->SetParameters(lambda_guess, excessPoisson_guess, delta1_guess,delta2_guess, @@ -615,5 +614,5 @@ fSinglePheFit->SetParLimits(7,-10.,10.); break; - case MHCalibrationChargeBlindCam::kEMichele: + case kEMichele: fSinglePheFit->SetParNames("#lambda_{cat}","#lambda_{dyn}", "#mu_{0}","#mu_{1cat}","#mu_{1dyn}", @@ -661,8 +660,8 @@ { - case MHCalibrationChargeBlindCam::kEPoisson4: - case MHCalibrationChargeBlindCam::kEPoisson5: - case MHCalibrationChargeBlindCam::kEPoisson6: - case MHCalibrationChargeBlindCam::kEPoisson7: + case kEPoisson4: + case kEPoisson5: + case kEPoisson6: + case kEPoisson7: fLambda = fSinglePheFit->GetParameter(0); fMu0 = fSinglePheFit->GetParameter(1); @@ -677,5 +676,5 @@ fSigma1Err = fSinglePheFit->GetParError(4); break; - case MHCalibrationChargeBlindCam::kEPolya: + case kEPolya: fLambda = fSinglePheFit->GetParameter(0); fMu0 = fSinglePheFit->GetParameter(7); @@ -689,5 +688,5 @@ fSigma0Err = fSinglePheFit->GetParError(5); fSigma1Err = 0.; - case MHCalibrationChargeBlindCam::kEMichele: + case kEMichele: fLambda = fSinglePheFit->GetParameter(0); fMu0 = fSinglePheFit->GetParameter(2); @@ -819,9 +818,9 @@ fFitLegend = new TPaveText(0.05,0.05,0.95,0.95); fFitLegend->SetLabel(Form("%s%s", "Results of the single PhE Fit (", - (fFitFunc == MHCalibrationChargeBlindCam::kEPoisson4) ? "Poisson(k=4))" : - (fFitFunc == MHCalibrationChargeBlindCam::kEPoisson5) ? "Poisson(k=5))" : - (fFitFunc == MHCalibrationChargeBlindCam::kEPoisson6) ? "Poisson(k=6))" : - (fFitFunc == MHCalibrationChargeBlindCam::kEPolya ) ? "Polya(k=4))" : - (fFitFunc == MHCalibrationChargeBlindCam::kEMichele ) ? "Michele)" + (fFitFunc == kEPoisson4) ? "Poisson(k=4))" : + (fFitFunc == kEPoisson5) ? "Poisson(k=5))" : + (fFitFunc == kEPoisson6) ? "Poisson(k=6))" : + (fFitFunc == kEPolya ) ? "Polya(k=4))" : + (fFitFunc == kEMichele ) ? "Michele)" : " none )" )); fFitLegend->SetTextSize(0.05); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h (revision 5048) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h (revision 5049) @@ -2,11 +2,6 @@ #define MARS_MHCalibrationChargeBlindPix - #ifndef MARS_MHCalibrationPix #include "MHCalibrationPix.h" -#endif - -#ifndef MARS_MHCalibrationChargeBlindCam -#include "MHCalibrationChargeBlindCam.h" #endif @@ -65,6 +60,14 @@ enum { kSinglePheFitOK, kPedestalFitOK }; // Possible bits to be set - MHCalibrationChargeBlindCam::FitFunc_t fFitFunc; - +public: + + enum FitFunc_t { kEPoisson4, kEPoisson5, + kEPoisson6, kEPoisson7, + kEPolya, kEMichele }; // Possible fit functions types (see MHCalibrationChargeBlindPix) + +private: + + FitFunc_t fFitFunc; + TPaveText *fFitLegend; //! Some legend to display the fit results TH1F *fHSinglePheFADCSlices; //! A histogram created and deleted only in Draw() @@ -112,5 +115,5 @@ // Setters - void SetFitFunc(const MHCalibrationChargeBlindCam::FitFunc_t func) { fFitFunc = func; } + void SetFitFunc ( const FitFunc_t func ) { fFitFunc = func; } void SetSinglePheCut ( const Float_t cut = 0. ) { fSinglePheCut = cut; } void SetNumSinglePheLimit ( const Float_t lim =fgNumSinglePheLimit ) { fNumSinglePheLimit = lim; }