Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 4946) @@ -79,7 +79,5 @@ using namespace std; -const Int_t MHCalibrationCam::fgAverageNbins = 2000; const Int_t MHCalibrationCam::fgPulserFrequency = 500; - // -------------------------------------------------------------------------- // @@ -120,5 +118,4 @@ fAverageLoGainSectors->SetOwner(); - SetAverageNbins(); SetPulserFrequency(); @@ -384,5 +381,4 @@ cam->fPulserFrequency = fPulserFrequency; - cam->fAverageNbins = fAverageNbins; return cam; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 4946) @@ -42,8 +42,11 @@ private: - static const Int_t fgAverageNbins; //! The default for fAverageNbins (now set to: 2000) static const Int_t fgPulserFrequency; //! The default for fPulserFrequency (now set to: 500) protected: + + Int_t fNbins; // Number of bins + Axis_t fFirst; // Lower histogram limit + Axis_t fLast; // Upper histogram limit Float_t fNumHiGainSaturationLimit; // Rel. amount sat. higain FADC slices until pixel is called saturated @@ -56,5 +59,5 @@ TArrayF fAverageAreaSigma; // Re-normalized sigmas in average pixels per area TArrayF fAverageAreaSigmaVar; // Variance Re-normalized sigmas in average pixels per area - Int_t fAverageNbins; // Number of bins for the average histograms + TObjArray *fAverageHiGainAreas; //-> Array of calibration pixels, one per pixel area TObjArray *fAverageHiGainSectors; //-> Array of calibration pixels, one per camera sector @@ -142,5 +145,5 @@ void DrawPixelContent( Int_t num ) const; - const Int_t GetAverageAreas () const; + const Int_t GetAverageAreas () const; MHCalibrationPix &GetAverageHiGainArea (UInt_t i); const MHCalibrationPix &GetAverageHiGainArea (UInt_t i) const; @@ -151,5 +154,5 @@ MHCalibrationPix &GetAverageLoGainSector(UInt_t i); const MHCalibrationPix &GetAverageLoGainSector(UInt_t i) const; - const Int_t GetAverageSectors () const; + const Int_t GetAverageSectors () const; const MCalibrationCam::PulserColor_t GetColor () const { return fColor; } const Float_t GetNumHiGainSaturationLimit() const { return fNumHiGainSaturationLimit; } @@ -173,5 +176,9 @@ ? SETBIT(fFlags,kOscillations) : CLRBIT(fFlags,kOscillations); } - void SetAverageNbins ( const Int_t bins=fgAverageNbins) { fAverageNbins = bins; } + + void SetNbins ( const Int_t i ) { fNbins = i; } + void SetFirst ( const Axis_t f ) { fFirst = f; } + void SetLast ( const Axis_t f ) { fLast = f; } + void SetNumLoGainSaturationLimit( const Float_t lim ) { fNumLoGainSaturationLimit = lim; } void SetNumHiGainSaturationLimit( const Float_t lim ) { fNumHiGainSaturationLimit = lim; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 4946) @@ -137,7 +137,7 @@ SetReferencePixel(); - SetRelTimeNbins(); - SetRelTimeFirst(); - SetRelTimeLast (); + SetNbins(fgRelTimeNbins); + SetFirst(fgRelTimeFirst); + SetLast (fgRelTimeLast ); } @@ -209,7 +209,7 @@ MHCalibrationPix &pix = (*this)[i]; - pix.SetNbins(fRelTimeNbins); - pix.SetFirst(fRelTimeFirst); - pix.SetLast (fRelTimeLast); + pix.SetNbins(fNbins); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); @@ -233,7 +233,7 @@ MHCalibrationPix &pix = (*this)(i); - pix.SetNbins(fRelTimeNbins); - pix.SetFirst(fRelTimeFirst); - pix.SetLast (fRelTimeLast); + pix.SetNbins(fNbins); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); @@ -261,7 +261,7 @@ MHCalibrationPix &pix = GetAverageHiGainArea(j); - pix.SetNbins(fRelTimeNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fRelTimeFirst); - pix.SetLast (fRelTimeLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); @@ -298,7 +298,7 @@ MHCalibrationPix &pix = GetAverageLoGainArea(j); - pix.SetNbins(fRelTimeNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fRelTimeFirst); - pix.SetLast (fRelTimeLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); @@ -335,7 +335,7 @@ MHCalibrationPix &pix = GetAverageHiGainSector(j); - pix.SetNbins(fRelTimeNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); - pix.SetFirst(fRelTimeFirst); - pix.SetLast (fRelTimeLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); @@ -362,7 +362,7 @@ MHCalibrationPix &pix = GetAverageLoGainSector(j); - pix.SetNbins(fRelTimeNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); - pix.SetFirst(fRelTimeFirst); - pix.SetLast (fRelTimeLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 4946) @@ -36,7 +36,4 @@ UInt_t fReferencePixel; // The reference pixel for rel. times - Int_t fRelTimeNbins; // Number of bins (now set to: 900 ) - Axis_t fRelTimeFirst; // Lower histogram limit (now set to: -13.5 ) - Axis_t fRelTimeLast; // Upper histogram limit (now set to: 13.5 ) Bool_t ReInitHists(MParList *pList); @@ -54,7 +51,4 @@ // Setters void SetReferencePixel( const UInt_t i=fgReferencePixel) { fReferencePixel = i; } - void SetRelTimeNbins ( const Int_t i=fgRelTimeNbins ) { fRelTimeNbins = i; } - void SetRelTimeFirst ( const Axis_t f=fgRelTimeFirst ) { fRelTimeFirst = f; } - void SetRelTimeLast ( const Axis_t f=fgRelTimeLast ) { fRelTimeLast = f; } Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc (revision 4946) @@ -91,6 +91,4 @@ #include "MParList.h" -#include "MCalibrationTestCam.h" - #include "MCalibrationCam.h" #include "MCalibrationPix.h" @@ -117,7 +115,7 @@ // // Sets: -// - fTestNbins to fgTestNbins -// - fTestFirst to fgTestFirst -// - fTestLast to fgTestLast +// - fNbins to fgTestNbins +// - fFirst to fgTestFirst +// - fLast to fgTestLast // MHCalibrationTestCam::MHCalibrationTestCam(const char *name, const char *title) @@ -127,13 +125,10 @@ fTitle = title ? title : "Histogram class for testing the calibration"; - SetTestNbins(); - SetTestFirst(); - SetTestLast (); + SetNbins(fgTestNbins); + SetFirst(fgTestFirst); + SetLast (fgTestLast ); } // -------------------------------------------------------------------------- -// -// Gets or creates the pointers to: -// - MCalibrationTestCam // // Searches pointer to: @@ -180,7 +175,7 @@ MHCalibrationPix &pix = (*this)[i]; - pix.SetNbins(fTestNbins); - pix.SetFirst(fTestFirst); - pix.SetLast (fTestLast); + pix.SetNbins(fNbins); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); @@ -208,7 +203,7 @@ MHCalibrationPix &pix = GetAverageHiGainArea(j); - pix.SetNbins(fTestNbins*3); - pix.SetFirst(fTestFirst); - pix.SetLast (fTestLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); pix.InitBins(); @@ -245,7 +240,7 @@ MHCalibrationPix &pix = GetAverageHiGainSector(j); - pix.SetNbins(fTestNbins*3); - pix.SetFirst(fTestFirst); - pix.SetLast (fTestLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.h (revision 4946) @@ -22,8 +22,4 @@ static const Axis_t fgTestLast; // Default for fLast (now set to: 1999.5) - Int_t fTestNbins; // Number of bins (now set to: 2000 ) - Axis_t fTestFirst; // Lower histogram limit (now set to: -0.5 ) - Axis_t fTestLast; // Upper histogram limit (now set to: 1999.5) - TArrayF fMeanMeanPhotPerArea; TArrayF fRmsMeanPhotPerArea ; @@ -50,8 +46,4 @@ void CalcAverageSigma(); - void SetTestNbins ( const Int_t i=fgTestNbins ) { fTestNbins = i; } - void SetTestFirst ( const Axis_t f=fgTestFirst ) { fTestFirst = f; } - void SetTestLast ( const Axis_t f=fgTestLast ) { fTestLast = f; } - ClassDef(MHCalibrationTestCam, 1) // Histogram class for Relative Time Camera Calibration }; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc (revision 4946) @@ -114,7 +114,7 @@ // // Sets: -// - fTestNbins to fgTestNbins -// - fTestFirst to fgTestFirst -// - fTestLast to fgTestLast +// - fNbins to fgTestNbins +// - fFirst to fgTestFirst +// - fLast to fgTestLast // MHCalibrationTestTimeCam::MHCalibrationTestTimeCam(const char *name, const char *title) @@ -124,7 +124,7 @@ fTitle = title ? title : "Histogram class for testing the calibration of arrival times"; - SetTestNbins(); - SetTestFirst(); - SetTestLast (); + SetNbins(fgTestNbins); + SetFirst(fgTestFirst); + SetLast (fgTestLast ); } @@ -179,7 +179,7 @@ MHCalibrationPix &pix = (*this)[i]; - pix.SetNbins(fTestNbins); - pix.SetFirst(fTestFirst); - pix.SetLast (fTestLast); + pix.SetNbins(fNbins); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); @@ -206,7 +206,7 @@ MHCalibrationPix &pix = GetAverageHiGainArea(j); - pix.SetNbins(fTestNbins*3); - pix.SetFirst(fTestFirst); - pix.SetLast (fTestLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); pix.InitBins(); @@ -244,7 +244,7 @@ MHCalibrationPix &pix = GetAverageHiGainSector(j); - pix.SetNbins(fTestNbins*3); - pix.SetFirst(fTestFirst); - pix.SetLast (fTestLast); + pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); + pix.SetFirst(fFirst); + pix.SetLast (fLast); TH1F *h = pix.GetHGausHist(); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h (revision 4945) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.h (revision 4946) @@ -15,8 +15,4 @@ static const Axis_t fgTestLast; // Default for fTestLast (now set to: 29.5) - Int_t fTestNbins; // Number of bins - Axis_t fTestFirst; // Lower histogram limit - Axis_t fTestLast; // Upper histogram limit - Bool_t ReInitHists(MParList *pList); Bool_t FillHists(const MParContainer *par, const Stat_t w=1); @@ -34,8 +30,4 @@ void CalcAverageSigma(); - void SetTestNbins ( const Int_t i=fgTestNbins ) { fTestNbins = i; } - void SetTestFirst ( const Axis_t f=fgTestFirst ) { fTestFirst = f; } - void SetTestLast ( const Axis_t f=fgTestLast ) { fTestLast = f; } - ClassDef(MHCalibrationTestTimeCam, 0) // Histogram class for Relative Time Camera Calibration };