Skip to content

[RF] Where appropriate, take titles from input objects in HistFactory #12304

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 1 commit into from
Feb 15, 2023
Merged

[RF] Where appropriate, take titles from input objects in HistFactory #12304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion roofit/histfactory/src/HistoToWorkspaceFactoryFast.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
// create observable
auto obs = static_cast<RooRealVar*>(proto->factory(
Form("%s[%f,%f]", fObsNameVec[idx].c_str(), xmin, xmax)));
if(strlen(axis->GetTitle())>0) obs->SetTitle(axis->GetTitle());
obs->setBins(nbins);
if (axis->IsVariableBinSize()) {
RooBinning binning(nbins, axis->GetXbins()->GetArray());
Expand Down Expand Up @@ -686,7 +687,7 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
name = name.substr(0, pos) + "shapes";
}

RooProduct shapeProduct(name.c_str(), name.c_str(), RooArgSet(thisSampleHistFuncs.begin(), thisSampleHistFuncs.end()));
RooProduct shapeProduct(name.c_str(), thisSampleHistFuncs.front()->GetTitle(), RooArgSet(thisSampleHistFuncs.begin(), thisSampleHistFuncs.end()));
proto->import(shapeProduct, RecycleConflictNodes());
shapeList.add(*proto->function(name.c_str()));
}
Expand Down Expand Up @@ -922,6 +923,8 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
sample.GetHistoSysList(), constraintPrefix, observables) );
}

sampleHistFuncs.front()->SetTitle( (nominal && strlen(nominal->GetTitle())>0) ? nominal->GetTitle() : sample.GetName().c_str() );

////////////////////////////////////
// Add StatErrors to this Channel //
////////////////////////////////////
Expand Down Expand Up @@ -1351,6 +1354,10 @@ RooArgList HistoToWorkspaceFactoryFast::createObservables(const TH1 *hist, RooWo
("model_"+channel_name).c_str(), // MB : have changed this into conditional pdf. Much faster for toys!
"product of Poissons accross bins for a single channel",
constraintTerms, Conditional(likelihoodTerms,observables));
// can give channel a title by setting title of corresponding data histogram
if (channel.GetData().GetHisto() && strlen(channel.GetData().GetHisto()->GetTitle())>0) {
model->SetTitle(channel.GetData().GetHisto()->GetTitle());
}
proto->import(*model,RecycleConflictNodes());

proto_config->SetPdf(*model);
Expand Down