Skip to content

Adding new options for roofit: SetMaxIter(), SetMaxCalls() and SetEpsilon() #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
FableQuentin wants to merge 2 commits into from
Closed

Adding new options for roofit: SetMaxIter(), SetMaxCalls() and SetEpsilon() #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c82d7cb
New options for fit: SetMaxIter(), SetMaxCalls() and SetEpsilon()
Feb 1, 2016
629064b
Merge remote-tracking branch 'upstream/master' from official root mirror
Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions roofit/roofitcore/inc/RooAbsPdf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ class RooAbsPdf : public RooAbsReal {
// -log(L) fits to binned and unbinned data
virtual RooFitResult* fitTo(RooAbsData& data, const RooCmdArg& arg1=RooCmdArg::none(), const RooCmdArg& arg2=RooCmdArg::none(),
const RooCmdArg& arg3=RooCmdArg::none(), const RooCmdArg& arg4=RooCmdArg::none(), const RooCmdArg& arg5=RooCmdArg::none(),
const RooCmdArg& arg6=RooCmdArg::none(), const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=RooCmdArg::none()) ;
const RooCmdArg& arg6=RooCmdArg::none(), const RooCmdArg& arg7=RooCmdArg::none(), const RooCmdArg& arg8=RooCmdArg::none(),
const RooCmdArg& arg9=RooCmdArg::none(), const RooCmdArg& arg10=RooCmdArg::none()) ;

virtual RooFitResult* fitTo(RooAbsData& data, const RooLinkedList& cmdList) ;

virtual RooAbsReal* createNLL(RooAbsData& data, const RooLinkedList& cmdList) ;
Expand Down Expand Up @@ -251,15 +253,6 @@ class RooAbsPdf : public RooAbsReal {

public:
virtual const RooAbsReal* getNormObj(const RooArgSet* set, const RooArgSet* iset, const TNamed* rangeName=0) const ;

virtual RooAbsGenContext* binnedGenContext(const RooArgSet &vars, Bool_t verbose= kFALSE) const ;

virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooDataSet *prototype=0,
const RooArgSet* auxProto=0, Bool_t verbose= kFALSE) const ;

virtual RooAbsGenContext* autoGenContext(const RooArgSet &vars, const RooDataSet* prototype=0, const RooArgSet* auxProto=0,
Bool_t verbose=kFALSE, Bool_t autoBinned=kTRUE, const char* binnedTag="") const ;

protected:

RooDataSet *generate(RooAbsGenContext& context, const RooArgSet& whatVars, const RooDataSet* prototype,
Expand Down Expand Up @@ -287,6 +280,15 @@ class RooAbsPdf : public RooAbsReal {

Int_t* randomizeProtoOrder(Int_t nProto,Int_t nGen,Bool_t resample=kFALSE) const ;

virtual RooAbsGenContext* binnedGenContext(const RooArgSet &vars, Bool_t verbose= kFALSE) const ;

virtual RooAbsGenContext* genContext(const RooArgSet &vars, const RooDataSet *prototype=0,
const RooArgSet* auxProto=0, Bool_t verbose= kFALSE) const ;

virtual RooAbsGenContext* autoGenContext(const RooArgSet &vars, const RooDataSet* prototype=0, const RooArgSet* auxProto=0,
Bool_t verbose=kFALSE, Bool_t autoBinned=kTRUE, const char* binnedTag="") const ;


friend class RooExtendPdf ;
// This also forces the definition of a copy ctor in derived classes
RooAbsPdf(const RooAbsPdf& other, const char* name = 0);
Expand Down
5 changes: 5 additions & 0 deletions roofit/roofitcore/inc/RooGlobalFunc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,11 @@ RooCmdArg Integrate(Bool_t flag) ;
RooCmdArg Minimizer(const char* type, const char* alg=0) ;
RooCmdArg Offset(Bool_t flag=kTRUE) ;

// RooAbsPdf::fitTo new arguments
RooCmdArg SetEpsilon(Double_t eps);
RooCmdArg SetMaxIter(Int_t maxiter);
RooCmdArg SetMaxCalls(Int_t maxcalls);

// RooAbsPdf::paramOn arguments
RooCmdArg Label(const char* str) ;
RooCmdArg Layout(Double_t xmin, Double_t xmax=0.99, Double_t ymin=0.95) ;
Expand Down
6 changes: 6 additions & 0 deletions roofit/roofitcore/inc/RooMinuit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ class RooMinuit : public TObject {
void setStrategy(Int_t strat) ;
void setErrorLevel(Double_t level) ;
void setEps(Double_t eps) ;
void setMaxIter(Int_t niter=5000) ; //Modified
inline Double_t getEps() const { return _eps ; } //Modified
inline Int_t getNMaxIter() const { return _niter ; } //Modified
void optimizeConst(Int_t flag) ;
void setEvalErrorWall(Bool_t flag) { _doEvalErrorWall = flag ; }
void setOffsetting(Bool_t flag) ;
Expand Down Expand Up @@ -97,6 +100,9 @@ class RooMinuit : public TObject {
inline std::ofstream* logfile() const { return _logfile ; }
inline Double_t& maxFCN() { return _maxFCN ; }

Double_t _eps; //Modified
Int_t _niter; //Modified

Double_t getPdfParamVal(Int_t index) ;
Double_t getPdfParamErr(Int_t index) ;
virtual Bool_t setPdfParamVal(Int_t index, Double_t value, Bool_t verbose=kFALSE) ;
Expand Down
Loading