Skip to content

[RF] Added offsetting to RooAbsPdf::fitTo #12001

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

Merged
guitargeek merged 2 commits into from
Jan 25, 2023
Merged

[RF] Added offsetting to RooAbsPdf::fitTo #12001

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
6da29e8
Added offsetting to `RooAbsPdf::fitTo`
Zeff020 Jan 10, 2023
85cb30b
Fix offsetting issue
Zeff020 Jan 17, 2023
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
1 change: 1 addition & 0 deletions roofit/roofitcore/inc/RooAbsPdf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ class RooAbsPdf : public RooAbsReal {
int doSumW2 = -1;
int doAsymptotic = -1;
int maxCalls = -1;
int doOffset = -1;
int parallelize = 0;
bool enableParallelGradient = true;
bool enableParallelDescent = false;
Expand Down
13 changes: 10 additions & 3 deletions roofit/roofitcore/src/RooAbsPdf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,6 +1383,7 @@ std::unique_ptr<RooFitResult> RooAbsPdf::minimizeNLL(RooAbsReal & nll,
minimizerConfig.enableParallelDescent = cfg.enableParallelDescent;
minimizerConfig.parallelize = cfg.parallelize;
minimizerConfig.timingAnalysis = cfg.timingAnalysis;
minimizerConfig.offsetting = cfg.doOffset;
RooMinimizer m(nll, minimizerConfig);

m.setMinimizerType(cfg.minType.c_str());
Expand Down Expand Up @@ -1586,10 +1587,15 @@ RooFitResult* RooAbsPdf::fitTo(RooAbsData& data, const RooLinkedList& cmdList)
RooCmdConfig pc(Form("RooAbsPdf::fitTo(%s)",GetName())) ;

RooLinkedList fitCmdList(cmdList) ;
RooLinkedList nllCmdList = pc.filterCmdList(fitCmdList,"ProjectedObservables,Extended,Range,"
std::string nllCmdListString = "ProjectedObservables,Extended,Range,"
"RangeWithName,SumCoefRange,NumCPU,SplitRange,Constrained,Constrain,ExternalConstraints,"
"CloneData,GlobalObservables,GlobalObservablesSource,GlobalObservablesTag,OffsetLikelihood,"
"BatchMode,IntegrateBins,ModularL");
"CloneData,GlobalObservables,GlobalObservablesSource,GlobalObservablesTag,"
"BatchMode,IntegrateBins,ModularL";

if (((RooCmdArg*)cmdList.FindObject("ModularL")) && !((RooCmdArg*)cmdList.FindObject("ModularL"))->getInt(0))
nllCmdListString += ",OffsetLikelihood";

RooLinkedList nllCmdList = pc.filterCmdList(fitCmdList, nllCmdListString.c_str());

// Default-initialized instance of MinimizerConfig to get the default
// minimizer parameter values.
Expand Down Expand Up @@ -1716,6 +1722,7 @@ RooFitResult* RooAbsPdf::fitTo(RooAbsData& data, const RooLinkedList& cmdList)
cfg.minosSet = pc.getSet("minosSet");
cfg.minType = pc.getString("mintype","");
cfg.minAlg = pc.getString("minalg","minuit");
cfg.doOffset = pc.getInt("doOffset");
cfg.parallelize = pc.getInt("parallelize");
cfg.enableParallelGradient = pc.getInt("enableParallelGradient");
cfg.enableParallelDescent = pc.getInt("enableParallelDescent");
Expand Down