Skip to content

adding shapeN to the datacard parser #344

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
giacomoortona wants to merge 1 commit into
base: main
Choose a base branch
from
Open

adding shapeN to the datacard parser #344

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
12 changes: 8 additions & 4 deletions CombineTools/src/CombineHarvester_Datacards.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ int CombineHarvester::ParseDatacard(std::string const& filename,
}
sys->set_name(words[i][0]);
std::string type = words[i][1];
if (!contains(std::vector<std::string>{"shape", "shape?", "shapeN2", "shapeU", "lnN", "lnU"},
if (!contains(std::vector<std::string>{"shape", "shape?", "shapeN", "shapeN2", "shapeU", "lnN", "lnU"},
type)) {
throw std::runtime_error(
FNERROR("Systematic type " + type + " not supported"));
Expand All @@ -532,7 +532,7 @@ int CombineHarvester::ParseDatacard(std::string const& filename,
sys->set_value_u(boost::lexical_cast<double>(words[i][p]));
sys->set_asymm(false);
}
if (sys->type() == "shape" || sys->type() == "shapeN2" ||
if (sys->type() == "shape" || sys->type() == "shapeN" || sys->type() == "shapeN2" ||
sys->type() == "shapeU") {
sys->set_scale(boost::lexical_cast<double>(words[i][p]));
LoadShapes(sys.get(), hist_mapping);
Expand All @@ -553,7 +553,7 @@ int CombineHarvester::ParseDatacard(std::string const& filename,
sys->set_scale(boost::lexical_cast<double>(words[i][p]));
}
}
if (sys->type() == "shape" || sys->type() == "shapeN2" ||
if (sys->type() == "shape" || sys->type() == "shapeN" || sys->type() == "shapeN2" ||
sys->type() == "shapeU")
sys->set_asymm(true);

Expand Down Expand Up @@ -1104,6 +1104,7 @@ void CombineHarvester::WriteDatacard(std::string const& name,
bool seen_lnN = false;
bool seen_lnU = false;
bool seen_shape = false;
bool seen_shapeN = false;
bool seen_shapeN2 = false;
bool seen_shapeU = false;
if (param_set.count(sys)) continue;
Expand All @@ -1123,8 +1124,9 @@ void CombineHarvester::WriteDatacard(std::string const& name,
: (format("%g") % ptr->value_u()).str();
break;
}
if (tp == "shape" || tp == "shapeN2" || tp == "shapeU") {
if (tp == "shape" || tp == "shapeN" || tp == "shapeN2" || tp == "shapeU") {
if (tp == "shape") seen_shape = true;
if (tp == "shapeN") seen_shapeN = true;
if (tp == "shapeN2") seen_shapeN2 = true;
if (tp == "shapeU") seen_shapeU = true;
line[p + 2] = (format("%g") % ptr->scale()).str();
Expand Down Expand Up @@ -1156,6 +1158,8 @@ void CombineHarvester::WriteDatacard(std::string const& name,
}
if (seen_shapeN2) {
line[1] = "shapeN2";
} else if (seen_shapeN) {
line[1] = "shapeN";
} else if (seen_shapeU) {
line[1] = "shapeU";
} else if (seen_lnU) {
Expand Down
4 changes: 2 additions & 2 deletions CombineTools/src/CombineHarvester_Evaluate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ TH1F CombineHarvester::GetShapeInternal(ProcSystMap const& lookup,
if (sys_it->asymm()) {
p_rate *= logKappaForX(x * sys_it->scale(), sys_it->value_d(),
sys_it->value_u());
if (sys_it->type() == "shape" || sys_it->type() == "shapeN2" ||
if (sys_it->type() == "shape" || sys_it->type() == "shapeN" || sys_it->type() == "shapeN2" ||
sys_it->type() == "shapeU") {
bool linear = true;
if (sys_it->type() == "shapeN2") linear = false;
Expand Down Expand Up @@ -554,7 +554,7 @@ TH2F CombineHarvester::Get2DShapeInternal(ProcSystMap const& lookup,
if (sys_it->asymm()) {
p_rate *= logKappaForX(x * sys_it->scale(), sys_it->value_d(),
sys_it->value_u());
if (sys_it->type() == "shape" || sys_it->type() == "shapeN2" ||
if (sys_it->type() == "shape" || sys_it->type() == "shapeN" || sys_it->type() == "shapeN2" ||
sys_it->type() == "shapeU") {
bool linear = true;
if (sys_it->type() == "shapeN2") linear = false;
Expand Down