Skip to content

MultiDimFit: add option to change parameter ranges for grid points. #686

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

Open
wants to merge 1 commit into
base: 102x
Choose a base branch
from
Open

MultiDimFit: add option to change parameter ranges for grid points. #686

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions interface/MultiDimFit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class MultiDimFit : public FitterAlgoBase {
static std::string fixedPointPOIs_;
static float centeredRange_;
static std::string setParametersForGrid_;
static std::string setParameterRangesForGrid_;

static bool robustHesse_;
static std::string robustHesseLoad_;
Expand Down
10 changes: 9 additions & 1 deletion src/MultiDimFit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ std::string MultiDimFit::saveSpecifiedFuncs_;
std::string MultiDimFit::saveSpecifiedIndex_;
std::string MultiDimFit::saveSpecifiedNuis_;
std::string MultiDimFit::setParametersForGrid_;
std::string MultiDimFit::setParameterRangesForGrid_;
std::vector<std::string> MultiDimFit::specifiedFuncNames_;
std::vector<RooAbsReal*> MultiDimFit::specifiedFunc_;
std::vector<float> MultiDimFit::specifiedFuncVals_;
Expand Down Expand Up @@ -104,7 +105,8 @@ MultiDimFit::MultiDimFit() :
("saveInactivePOI", boost::program_options::value<bool>(&saveInactivePOI_)->default_value(saveInactivePOI_), "Save inactive POIs in output (1) or not (0, default)")
("startFromPreFit", boost::program_options::value<bool>(&startFromPreFit_)->default_value(startFromPreFit_), "Start each point of the likelihood scan from the pre-fit values")
("alignEdges", boost::program_options::value<bool>(&alignEdges_)->default_value(alignEdges_), "Align the grid points such that the endpoints of the ranges are included")
("setParametersForGrid", boost::program_options::value<std::string>(&setParametersForGrid_)->default_value(""), "Set the values of relevant physics model parameters. Give a comma separated list of parameter value assignments. Example: CV=1.0,CF=1.0")
("setParametersForGrid", boost::program_options::value<std::string>(&setParametersForGrid_)->default_value(""), "Set the values of relevant physics model parameters for grid points. Give a comma separated list of parameter value assignments. Example: CV=1.0,CF=1.0")
("setParameterRangesForGrid", boost::program_options::value<std::string>(&setParameterRangesForGrid_)->default_value(""), "Set the range of relevant physics model parameters for grid points. Give a colon separated list of parameter ranges. Example: CV=0.0,2.0:CF=0.0,5.0")
("saveFitResult", "Save RooFitResult to multidimfit.root")
("out", boost::program_options::value<std::string>(&out_)->default_value(out_), "Directory to put the diagnostics output file in")
("robustHesse", boost::program_options::value<bool>(&robustHesse_)->default_value(robustHesse_), "Use a more robust calculation of the hessian/covariance matrix")
Expand Down Expand Up @@ -588,6 +590,12 @@ void MultiDimFit::doGrid(RooWorkspace *w, RooAbsReal &nll)
utils::setModelParameters( setParametersForGrid_, allParams);
}

if (setParameterRangesForGrid_ != "") {
RooArgSet allParams(w->allVars());
allParams.add(w->allCats());
utils::setModelParameterRanges( setParameterRangesForGrid_, allParams);
}

if (startFromPreFit_) w->loadSnapshot("clean");

std::vector<double> p0(n), pmin(n), pmax(n);
Expand Down