Skip to content
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

Jump to bottom

[RF] Fix automatic plotting range for RooAbsPdf. #5469

Merged
merged 2 commits into from
Apr 27, 2020
Merged

[RF] Fix automatic plotting range for RooAbsPdf. #5469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
832198a
[RF] Fix automatic plotting range selection for RooAbsPdf.
hageboeck Apr 27, 2020
8ea45bf
[RF][NFC] Small cleanups in RooAbsPdf.
hageboeck Apr 27, 2020
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
23 changes: 10 additions & 13 deletions roofit/roofitcore/src/RooAbsPdf.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,9 @@ RooAbsReal* RooAbsPdf::createNLL(RooAbsData& data, const RooLinkedList& cmdList)
}
}

// Clear possible range attributes from previous fits.
setStringAttribute("fitrange", nullptr);

if (pc.hasProcessed("Range")) {
Double_t rangeLo = pc.getDouble("rangeLo") ;
Double_t rangeHi = pc.getDouble("rangeHi") ;
Expand All @@ -1022,9 +1025,6 @@ RooAbsReal* RooAbsPdf::createNLL(RooAbsData& data, const RooLinkedList& cmdList)
if (rrv) rrv->setRange("fit",rangeLo,rangeHi) ;
}

// Clear possible range attributes from previous fits.
setStringAttribute("fitrange", nullptr);

// Set range name to be fitted to "fit"
rangeName = "fit" ;
}
Expand Down Expand Up @@ -1871,6 +1871,9 @@ RooAbsReal* RooAbsPdf::createChi2(RooDataHist& data, const RooCmdArg& arg1, con
RooAbsReal* chi2 ;
string baseName = Form("chi2_%s_%s",GetName(),data.GetName()) ;

// Clear possible range attributes from previous fits.
setStringAttribute("fitrange", nullptr);

if (!rangeName || strchr(rangeName,',')==0) {
// Simple case: default range, or single restricted range

Expand All @@ -1892,22 +1895,16 @@ RooAbsReal* RooAbsPdf::createChi2(RooDataHist& data, const RooCmdArg& arg1, con

// Composite case: multiple ranges
RooArgList chi2List ;
const size_t bufSize = strlen(rangeName)+1;
char* buf = new char[bufSize] ;
strlcpy(buf,rangeName,bufSize) ;
char* token = strtok(buf,",") ;
while(token) {
RooCmdArg subRangeCmd = RooFit::Range(token) ;
for (std::string& token : RooHelpers::tokenise(rangeName, ",")) {
RooCmdArg subRangeCmd = RooFit::Range(token.c_str()) ;
// Construct chi2 while substituting original RangeWithName argument with subrange argument created above
RooAbsReal* chi2Comp = new RooChi2Var(Form("%s_%s",baseName.c_str(),token),"chi^2",*this,data,
RooAbsReal* chi2Comp = new RooChi2Var(Form("%s_%s", baseName.c_str(), token.c_str()), "chi^2", *this, data,
&arg1==rarg?subRangeCmd:arg1,&arg2==rarg?subRangeCmd:arg2,
&arg3==rarg?subRangeCmd:arg3,&arg4==rarg?subRangeCmd:arg4,
&arg5==rarg?subRangeCmd:arg5,&arg6==rarg?subRangeCmd:arg6,
&arg7==rarg?subRangeCmd:arg7,&arg8==rarg?subRangeCmd:arg8) ;
chi2List.add(*chi2Comp) ;
token = strtok(0,",") ;
}
delete[] buf ;
chi2 = new RooAddition(baseName.c_str(),"chi^2",chi2List,kTRUE) ;
}
RooAbsReal::setEvalErrorLoggingMode(RooAbsReal::PrintErrors) ;
Expand All @@ -1925,7 +1922,7 @@ RooAbsReal* RooAbsPdf::createChi2(RooDataHist& data, const RooCmdArg& arg1, con
RooAbsReal* RooAbsPdf::createChi2(RooDataSet& data, const RooLinkedList& cmdList)
{
// Select the pdf-specific commands
RooCmdConfig pc(Form("RooAbsPdf::fitTo(%s)",GetName())) ;
RooCmdConfig pc(Form("RooAbsPdf::createChi2(%s)",GetName())) ;

pc.defineInt("integrate","Integrate",0,0) ;
pc.defineObject("yvar","YVar",0,0) ;
Expand Down