Merge pull request #71 from uhh-cms/feature/plot_updates

Feature/plot updates

Author: apaasch

hbw/plotting/s_over_b.py

@@ -44,7 +44,7 @@ def separate_sig_bkg_hists(hists: OrderedDict):
 
     if not h_sig:
         raise Exception(
-            "No signal processes given. Remember to add the 'is_signal' auxiliary to your "
+            "No signal processes given. Remember to add the 'is_signal' tag to your "
             "signal processes",
         )
     if not h_bkg:
@@ -64,6 +64,8 @@ def plot_s_over_b(
     yscale: str | None = "",
     hide_errors: bool | None = None,
     sqrt_b: bool | None = None,
+    cumsum: bool = False,
+    reversed_cumsum: bool = False,
     process_settings: dict | None = None,
     variable_settings: dict | None = None,
     **kwargs,
@@ -79,6 +81,9 @@ def plot_s_over_b(
             --plot-function hbw.plotting.s_over_b.plot_s_over_b \
             --general-settings sqrt_b
     """
+    if cumsum and reversed_cumsum:
+        raise Exception("We can only do the cumulative cumsum in one direction at the time!")
+
     remove_residual_axis(hists, "shift")
 
     variable_inst = variable_insts[0]
@@ -97,6 +102,18 @@ def plot_s_over_b(
         f"\n    Integrated S over sqrtB: {round_sig(S_over_sqrtB)}",
     )
 
+    if cumsum or reversed_cumsum:
+        # calculate the cumulative sum of the histograms
+        for h in (h_sig, h_bkg):
+            h_view = h.view()
+            h_view.value = np.cumsum(h_view.value) if cumsum else np.cumsum(h_view.value[::-1])[::-1]
+
+            # TODO: implement correct variances; in the meantime, just set them to 0
+            h_view.variance = [0] * len(h.view())
+
+            # overwrite view of original histograms
+            h[...] = h_view
+
     # NOTE: this does not take into account the variances on the background stack
     if sqrt_b:
         h_out = h_sig / np.sqrt(h_bkg.values())

hbw/tasks/plotting.py

@@ -21,6 +21,7 @@
 from columnflow.tasks.framework.plotting import (
     PlotBase, PlotBase1D, VariablePlotSettingMixin, ProcessPlotSettingMixin,
 )
+from columnflow.tasks.framework.decorators import view_output_plots
 from columnflow.tasks.plotting import PlotVariables1D
 # from columnflow.tasks.framework.remote import RemoteWorkflow
 from hbw.tasks.base import HBWTask
@@ -182,7 +183,10 @@ def plot_postfit_shapes(
     default_style_config = prepare_style_config(
         config_inst, category_inst, variable_inst, density, shape_norm, yscale,
     )
-    default_style_config["ax_cfg"].pop("xlim")
+
+    # since we are rebinning, the xlim should be defined based on the histograms itself
+    bin_edges = list(hists.values())[0].axes[0].edges
+    default_style_config["ax_cfg"]["xlim"] = (bin_edges[0], bin_edges[-1])
 
     style_config = law.util.merge_dicts(default_style_config, style_config, deep=True)
     if shape_norm:
@@ -235,6 +239,7 @@ def requires(self):
     def output(self):
         return {"plots": self.target("plots", dir=True)}
 
+    @view_output_plots
     def run(self):
         logger.warning(
             f"Note! It is important that the requested inference_model {self.inference_model} "