diff --git a/NPLib/Maya/TMayaHisto.cxx b/NPLib/Maya/TMayaHisto.cxx index d97199c456a0a5956e51615217891c65ea78e9a5..fb06cb2f34887a0a36166620751add7f0a3d735b 100644 --- a/NPLib/Maya/TMayaHisto.cxx +++ b/NPLib/Maya/TMayaHisto.cxx @@ -19,7 +19,7 @@ * * *****************************************************************************/ #include "TMayaHisto.h" - +#include "TFormula.h" //______________________________________________________________________________ // TMayaHisto methods // TMayaHisto a 2-D histogram with four bytes per cell (float) @@ -1559,17 +1559,12 @@ Double_t TMayaHisto::FindRange(Int_t ID, Option_t *o, Double_t xo, Double_t yo) if (opt.Contains("Fit")) { if (strcmp(fRangeFunction->GetName(), "_dfltRangeFunction_") == 0) { - fRangeFunction->SetParameter(fRangeFunction->GetParNumber( - "base"), emax); - fRangeFunction->SetParLimits(fRangeFunction->GetParNumber( - "base"), emax / 2., emax); - fRangeFunction->SetParameter(fRangeFunction->GetParNumber( - "slope"), lmax != 0 ? -emax / lmax : 0); + fRangeFunction->SetParameter(((TFormula*)fRangeFunction)->GetParNumber("base"), emax); + fRangeFunction->SetParLimits(((TFormula*)fRangeFunction)->GetParNumber("base"), emax / 2., emax); + fRangeFunction->SetParameter(((TFormula*)fRangeFunction)->GetParNumber("slope"), lmax != 0 ? -emax / lmax : 0); } - fRangeFunction->SetParLimits(fRangeFunction->GetParNumber( - "range"), 0, lmax); - fRangeFunction->SetParameter(fRangeFunction->GetParNumber( - "range"), lmax / 2.); + fRangeFunction->SetParLimits(((TFormula*)fRangeFunction)->GetParNumber("range"), 0, lmax); + fRangeFunction->SetParameter(((TFormula*)fRangeFunction)->GetParNumber("range"), lmax / 2.); h->Fit(fRangeFunction, "b"); range = fRangeFunction->GetParameter("range"); } diff --git a/NPLib/Maya/TMayaHisto.h b/NPLib/Maya/TMayaHisto.h index 568209abb773ad98208f3cbea6d4f98d3616b129..6c814274e23f084324f3f4f377d135470889fbcc 100644 --- a/NPLib/Maya/TMayaHisto.h +++ b/NPLib/Maya/TMayaHisto.h @@ -27,6 +27,8 @@ #include "TFile.h" #include "TCutG.h" #include "TH2F.h" +#include "TF1.h" +#include "TFormula.h" #include "TArrayF.h" #include "TClonesArray.h" #include "TMath.h" @@ -34,7 +36,6 @@ #include "TString.h" #include "TStyle.h" #include "TPad.h" -#include "TF1.h" //#include "TGraph.h" #include "TGraphErrors.h" #include "TDirectory.h"