Ability to define merged channels in PostFitShapesFromWorkspace (+ a few random fixes)

CombineTools/bin/PostFitShapesFromWorkspace.cpp

@@ -47,6 +47,7 @@ int main(int argc, char* argv[]) {
   bool skip_proc_errs = false;
   bool total_shapes = false;
   std::vector<std::string> reverse_bins_;
+  std::vector<std::string> merged_bins_;
 
   po::options_description help_config("Help");
   help_config.add_options()
@@ -103,7 +104,8 @@ int main(int argc, char* argv[]) {
     ("total-shapes",
       po::value<bool>(&total_shapes)->default_value(total_shapes)->implicit_value(true),
       "Save signal- and background shapes added for all channels/categories")
-    ("reverse-bins", po::value<vector<string>>(&reverse_bins_)->multitoken(), "List of bins to reverse the order for");
+    ("reverse-bins", po::value<vector<string>>(&reverse_bins_)->multitoken(), "List of bins to reverse the order for")
+    ("merged-channels", po::value<vector<string>>(&merged_bins_)->multitoken(), "List of [label]=[regex] for merged channels");
 
 
   po::variables_map vm;
@@ -140,6 +142,8 @@ int main(int argc, char* argv[]) {
   // Create CH instance and parse the workspace
   ch::CombineHarvester cmb;
   cmb.SetFlag("workspaces-use-clone", true);
+  cmb.SetFlag("filters-use-regex", true);
+
   ch::ParseCombineWorkspace(cmb, *ws, "ModelConfig", data, false);
 
   // Only evaluate in case parameters to freeze are provided
@@ -186,7 +190,16 @@ int main(int argc, char* argv[]) {
     return no_shape;
   });
 
-  auto bins = cmb.cp().bin_set();
+  auto bins = ch::Set2Vec(cmb.cp().bin_set());
+  auto bin_patterns = bins;
+  for (unsigned i = 0; i < merged_bins_.size(); ++i) {
+    vector<string> parts;
+    boost::split(parts, merged_bins_[i], boost::is_any_of("="));
+    if (parts.size() == 2) {
+      bins.push_back(parts[0]);
+      bin_patterns.push_back(parts[1]);
+    }
+  }
 
   TFile outfile(output.c_str(), "RECREATE");
   TH1::AddDirectory(false);
@@ -229,8 +242,10 @@ int main(int argc, char* argv[]) {
         ch::WriteToTFile(&(iter.second), &outfile, "prefit/" + iter.first);
       }
     }
-    for (auto bin : bins) {
-      ch::CombineHarvester cmb_bin = cmb.cp().bin({bin});
+    for (unsigned ib = 0; ib < bins.size(); ++ib) {
+      std::string bin = bins[ib];
+      std::string bin_pattern = bin_patterns[ib];
+      ch::CombineHarvester cmb_bin = cmb.cp().bin({bin_pattern});
       // This next line is a temporary fix for models with parameteric RooFit pdfs
       // - we try and set the number of bins to evaluate the pdf to be the same as
       // the number of bins in data
@@ -346,8 +361,10 @@ int main(int argc, char* argv[]) {
     }
 
 
-    for (auto bin : bins) {
-      ch::CombineHarvester cmb_bin = cmb.cp().bin({bin});
+    for (unsigned ib = 0; ib < bins.size(); ++ib) {
+      std::string bin = bins[ib];
+      std::string bin_pattern = bin_patterns[ib];
+      ch::CombineHarvester cmb_bin = cmb.cp().bin({bin_pattern});
       post_shapes[bin]["data_obs"] = cmb_bin.GetObservedShape();
       for (auto proc : cmb_bin.process_set()) {
         auto cmb_proc = cmb_bin.cp().process({proc});

CombineTools/python/combine/EnhancedCombine.py

@@ -43,7 +43,6 @@ def attach_intercept_args(self, group):
         group.add_argument(
             '--setParameterRanges', help='Some other options will modify or add to the list of parameter ranges')
 
-
     def attach_args(self, group):
         CombineToolBase.attach_args(self, group)
         group.add_argument(

CombineTools/python/plotting.py

@@ -383,6 +383,7 @@ def MultiRatioSplit(split_points, gaps_low, gaps_high):
         pad.Draw()
         pads.append(pad)
     pads.reverse()
+    pads[0].cd()
     return pads
 
 
@@ -1191,6 +1192,9 @@ def FixTopRange(pad, fix_y, fraction):
         if ymin == 0.:
             print('Cannot adjust log-scale y-axis range if the minimum is zero!')
             return
+        if fix_y <= 0:
+            print('Cannot adjust log-scale y-axis range if the maximum is zero!')
+            return
         maxval = (math.log10(fix_y) - fraction * math.log10(ymin)) / \
             (1 - fraction)
         maxval = math.pow(10, maxval)
@@ -1355,6 +1359,8 @@ def FixBoxPadding(pad, box, frac):
     # Convert this to a normalised frame value
     f_max_h = (a_max_h - ymin) / (ymax - ymin);
     if R.gPad.GetLogy() and f_max_h > 0.:
+        if a_max_h <= 0. or ymin <= 0. or ymax <= 0.:
+            return
         f_max_h = (math.log10(a_max_h) - math.log10(ymin)) / (math.log10(ymax) - math.log10(ymin))
 
     if f_y1 - f_max_h < frac:

CombineTools/src/CombineHarvester_Evaluate.cc

@@ -446,7 +446,9 @@ TH1F CombineHarvester::GetObservedShape() {
       tmp->SetBinErrorOption(TH1::kPoisson);
       proc_shape = *tmp;
       delete tmp;
-      proc_shape.Scale(1. / proc_shape.Integral());
+      if (proc_shape.Integral() > 0.) {
+        proc_shape.Scale(1. / proc_shape.Integral());
+      }
     }
     proc_shape.Scale(p_rate);
     if (!shape_init) {