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

Adding fix for case where param and rateParam have same name #310

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Adding fix for case where param and rateParam have same name #310

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
4 changes: 4 additions & 0 deletions CombineTools/interface/Systematic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ class Systematic : public Object {
void set_shapes(TH1 const& shape_u, TH1 const& shape_d,
TH1 const& nominal);

void set_param_str_ext(std::string const& param_str_ext) { param_str_ext_ = param_str_ext; }
std::string const& param_str_ext() const { return param_str_ext_; }

std::string to_string() const;
friend std::ostream& operator<< (std::ostream &out, Systematic const& val);
static std::ostream& PrintHeader(std::ostream &out);
Expand All @@ -85,6 +88,7 @@ class Systematic : public Object {
RooAbsReal * pdf_d_;
RooDataHist * data_u_;
RooDataHist * data_d_;
std::string param_str_ext_;

friend void swap(Systematic& first, Systematic& second);
};
Expand Down
24 changes: 23 additions & 1 deletion CombineTools/src/CombineHarvester_Datacards.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,18 @@ int CombineHarvester::ParseDatacard(std::string const& filename,
auto sys = std::make_shared<Systematic>();
sys->set_name(param_name);
sys->set_type("param");
sys->set_analysis(analysis);
sys->set_era(era);
sys->set_channel(channel);
sys->set_bin_id(bin_id);
sys->set_mass(mass);
// Add string extension for edge case where param and rateParam have the same name
std::string syst_str_ext = (boost::format("%g %g") % param->val() % ((param->err_u() - param->err_d()) / 2.0)).str();
if (param->range_d() != std::numeric_limits<double>::lowest() &&
param->range_u() != std::numeric_limits<double>::max()) {
syst_str_ext += (boost::format(" [%.4g,%.4g]") % param->range_d() % param->range_u()).str();
}
sys->set_param_str_ext(syst_str_ext);
systs_.push_back(sys);
continue; // skip the rest of this now
}
Expand Down Expand Up @@ -1019,6 +1031,7 @@ void CombineHarvester::WriteDatacard(std::string const& name,
}
}

// Write parameters here that feature in param set but not in the syst set
for (auto par : params_) {
Parameter const* p = par.second.get();
if (p->err_d() != 0.0 && p->err_u() != 0.0 &&
Expand All @@ -1033,6 +1046,14 @@ void CombineHarvester::WriteDatacard(std::string const& name,
}
}

// Write members of syst collection here that feature in both param set and rateParam set (constraint on rateParam term)
for (auto syst : systs_) {
if (syst->type() == "param" && param_set.count(syst->name()) && rateparam_set.count(syst->name())) {
txt_file << format((format("%%-%is param %%s") % sys_str_len).str()) %
syst->name() % syst->param_str_ext();
txt_file << "\n";
}
}

for (auto const& sys : sys_set) {
std::vector<std::string> line(procs_.size() + 2);
Expand Down Expand Up @@ -1254,10 +1275,11 @@ void CombineHarvester::WriteDatacard(std::string const& name,
// - it has non-zero errors
// - it appears in the first list
// - it doesn't appear in the second list
// - it doesn't appear in the third list
for (auto par : params_) {
Parameter const* p = par.second.get();
if (p->err_d() != 0.0 && p->err_u() != 0.0 &&
all_dependents_pars.count(p->name()) && !sys_set.count(p->name())) {
all_dependents_pars.count(p->name()) && !sys_set.count(p->name()) && !param_set.count(p->name())) {
txt_file << format((format("%%-%is param %%g %%g") % sys_str_len).str()) %
p->name() % p->val() % ((p->err_u() - p->err_d()) / 2.0);
if (p->range_d() != std::numeric_limits<double>::lowest() &&
Expand Down