Index: /trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc (revision 3169) +++ /trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc (revision 3170) @@ -151,5 +151,4 @@ if (fGraphPowerSpectrum) delete fGraphPowerSpectrum; - } @@ -201,5 +200,5 @@ -Bool_t MHGausEvents::FillHistAndArray(Float_t f) +Bool_t MHGausEvents::FillHistAndArray(const Float_t f) { @@ -208,5 +207,5 @@ } -Bool_t MHGausEvents::FillHist(Float_t f) +Bool_t MHGausEvents::FillHist(const Float_t f) { @@ -217,5 +216,5 @@ } -void MHGausEvents::FillArray(Float_t f) +void MHGausEvents::FillArray(const Float_t f) { if (fEvents.GetSize() == 0) @@ -251,4 +250,5 @@ } + const Double_t MHGausEvents::GetExpProb() const { @@ -256,4 +256,5 @@ } + const Double_t MHGausEvents::GetOffset() const { @@ -261,4 +262,5 @@ } + const Double_t MHGausEvents::GetSlope() const { @@ -266,4 +268,5 @@ } + const Bool_t MHGausEvents::IsEmpty() const { @@ -271,4 +274,5 @@ } + const Bool_t MHGausEvents::IsFourierSpectrumOK() const { @@ -276,4 +280,5 @@ } + const Bool_t MHGausEvents::IsGausFitOK() const { @@ -281,8 +286,10 @@ } + const Bool_t MHGausEvents::IsExpFitOK() const { return TESTBIT(fFlags,kExpFitOK); } + // ------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/mcalib/MHGausEvents.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MHGausEvents.h (revision 3169) +++ /trunk/MagicSoft/Mars/mcalib/MHGausEvents.h (revision 3170) @@ -61,8 +61,8 @@ // Setters - void SetPowerProbabilityBins(const Int_t nbins=fgPowerProbabilityBins) { fPowerProbabilityBins = nbins; } - void SetBinsAfterStripping(const Int_t nbins=fgBinsAfterStripping) { fBinsAfterStripping = nbins; } + void SetPowerProbabilityBins(const Int_t nbins=fgPowerProbabilityBins) { fPowerProbabilityBins = nbins; } + void SetBinsAfterStripping(const Int_t nbins=fgBinsAfterStripping) { fBinsAfterStripping = nbins; } - void DrawEvents(); // Draw a graph of the array fEvents + void DrawEvents(); // Draw a graph of the array fEvents void DrawPowerSpectrum(TVirtualPad &pad, Int_t i); // Draw a graph of the array fPowerSpectrum and the hist fHPowerProbability @@ -76,69 +76,70 @@ // Setters - void SetEventFrequency(const Float_t f=0) { fEventFrequency = f; } - void SetMean(const Double_t d) { fMean = d; } - void SetMeanErr(const Double_t d) { fMeanErr = d; } - void SetSigma(const Double_t d) { fSigma = d; } - void SetSigmaErr(const Double_t d) { fSigmaErr = d; } + void SetEventFrequency(const Float_t f=0) { fEventFrequency = f; } + + void SetMean( const Double_t d ) { fMean = d; } + void SetMeanErr( const Double_t d ) { fMeanErr = d; } + void SetSigma( const Double_t d ) { fSigma = d; } + void SetSigmaErr( const Double_t d ) { fSigmaErr = d; } - void SetProbLimit(const Float_t lim=fgProbLimit) { fProbLimit = lim; } - void SetNDFLimit(const Int_t lim=fgNDFLimit) { fNDFLimit = lim; } + void SetProbLimit( const Float_t lim=fgProbLimit ) { fProbLimit = lim; } + void SetNDFLimit( const Int_t lim=fgNDFLimit ) { fNDFLimit = lim; } // Setters ONLY for MC: - void SetGausFitOK(const Bool_t b); - void SetExpFitOK(const Bool_t b); - void SetFourierSpectrumOK(const Bool_t b); + void SetGausFitOK( const Bool_t b ); + void SetExpFitOK( const Bool_t b ); + void SetFourierSpectrumOK( const Bool_t b ); // Getters - const Double_t GetMean() const { return fMean; } - const Double_t GetMeanErr() const { return fMeanErr; } - const Double_t GetSigma() const { return fSigma; } - const Double_t GetSigmaErr() const { return fSigmaErr; } - const Double_t GetChiSquare() const; - const Double_t GetProb() const { return fProb; } - const Int_t GetNdf() const; + const Double_t GetMean() const { return fMean; } + const Double_t GetMeanErr() const { return fMeanErr; } + const Double_t GetSigma() const { return fSigma; } + const Double_t GetSigmaErr() const { return fSigmaErr; } + const Double_t GetChiSquare() const; + const Double_t GetProb() const { return fProb; } + const Int_t GetNdf() const; - const Double_t GetSlope() const; - const Double_t GetOffset() const; + const Double_t GetSlope() const; + const Double_t GetOffset() const; const Double_t GetExpChiSquare() const; - const Double_t GetExpProb() const; - const Int_t GetExpNdf() const; + const Double_t GetExpProb() const; + const Int_t GetExpNdf() const; - TH1F *GetHGausHist() { return &fHGausHist; } - const TH1F *GetHGausHist() const { return &fHGausHist; } + TH1F *GetHGausHist() { return &fHGausHist; } + const TH1F *GetHGausHist() const { return &fHGausHist; } - TArrayF *GetEvents() { return &fEvents; } - const TArrayF *GetEvents() const { return &fEvents; } + TArrayF *GetEvents() { return &fEvents; } + const TArrayF *GetEvents() const { return &fEvents; } - TArrayF *GetPowerSpectrum() { return fPowerSpectrum; } - const TArrayF *GetPowerSpectrum() const { return fPowerSpectrum; } + TArrayF *GetPowerSpectrum() { return fPowerSpectrum; } + const TArrayF *GetPowerSpectrum() const { return fPowerSpectrum; } - TF1 *GetFGausFit() { return fFGausFit; } - const TF1 *GetFGausFit() const { return fFGausFit; } + TF1 *GetFGausFit() { return fFGausFit; } + const TF1 *GetFGausFit() const { return fFGausFit; } - TH1I *GetHPowerProbability() { return fHPowerProbability; } - const TH1I *GetHPowerProbability() const { return fHPowerProbability; } + TH1I *GetHPowerProbability() { return fHPowerProbability; } + const TH1I *GetHPowerProbability() const { return fHPowerProbability; } - TF1 *GetFExpFit() { return fFExpFit; } - const TF1 *GetFExpFit() const { return fFExpFit; } + TF1 *GetFExpFit() { return fFExpFit; } + const TF1 *GetFExpFit() const { return fFExpFit; } - TGraph *GetGraphEvents() { return fGraphEvents; } - const TGraph *GetGraphEvents() const { return fGraphEvents; } + TGraph *GetGraphEvents() { return fGraphEvents; } + const TGraph *GetGraphEvents() const { return fGraphEvents; } - TGraph *GetGraphPowerSpectrum() { return fGraphPowerSpectrum; } - const TGraph *GetGraphPowerSpectrum() const { return fGraphPowerSpectrum; } + TGraph *GetGraphPowerSpectrum() { return fGraphPowerSpectrum; } + const TGraph *GetGraphPowerSpectrum() const { return fGraphPowerSpectrum; } const Bool_t IsGausFitOK() const; const Bool_t IsExpFitOK() const; const Bool_t IsEmpty() const; - const Bool_t IsFourierSpectrumOK() const; + const Bool_t IsFourierSpectrumOK() const; // Fill - void FillArray(Float_t f); // Fill only the array fEvents - Bool_t FillHist(Float_t f); // Fill only the histogram HGausHist - Bool_t FillHistAndArray(Float_t f); // Fill bothe the array fEvents and the histogram HGausHist + void FillArray(const Float_t f); // Fill only the array fEvents + Bool_t FillHist(const Float_t f); // Fill only the histogram HGausHist + Bool_t FillHistAndArray(const Float_t f); // Fill bothe the array fEvents and the histogram HGausHist // Fits - Bool_t FitGaus(Option_t *option="RQ0"); // Fit the histogram HGausHist with a Gaussian + Bool_t FitGaus(Option_t *option="RQ0"); // Fit the histogram HGausHist with a Gaussian // Draws @@ -149,9 +150,9 @@ // Miscelleaneous - void CreateFourierSpectrum(); // Create the fourier spectrum out of fEvents - void CreateGraphEvents(); // Create the TGraph fGraphEvents of fEvents - void CreateGraphPowerSpectrum(); // Create the TGraph fGraphPowerSpectrum out of fPowerSpectrum + void CreateFourierSpectrum(); // Create the fourier spectrum out of fEvents + void CreateGraphEvents(); // Create the TGraph fGraphEvents of fEvents + void CreateGraphPowerSpectrum(); // Create the TGraph fGraphPowerSpectrum out of fPowerSpectrum - ClassDef(MHGausEvents, 1) // Histograms for events with Gaussian distributed values + ClassDef(MHGausEvents, 1) // Base class for events with Gaussian distributed values };