Refactor plotting script and improve event sorting (#12)

* fixed plotting_script

* Refactor W+ to W- ratio calculation and improve error handling in MassReader; sort passing events in getPassingEvents function

* fixed bugs

* API consistency

Author: haddadanas

scripts/plotting_script.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import argparse
-from glob import glob
 from collections import defaultdict
+from datetime import datetime
+from glob import glob
 
 import matplotlib.pyplot as plt
 import mplhep as hep  # type: ignore
@@ -11,10 +12,10 @@
 def parser_setup() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="plotting_script.py", description="Plotting script")
     parser.add_argument("--input", "-i", type=str, help="Input Folder; defaults to './'", default="./")
-    parser.add_argument("--output", "-o", type=str, help="Output file with extension; defaults to './output.png'", default="./output.png")
+    parser.add_argument("--output", "-o", type=str, help="Output file with extension; defaults to './*current date*.png'", default=None)
     parser.add_argument(
-        "--channel", "-c", type=str, nargs="*", choices=["Higgs", "W", "Z", "all"], default=["Higgs", "Z"],
-        help="Channel to plot; default plots all channels.",
+        "--channel", "-c", type=str, nargs="*", choices=["Higgs", "W", "Z", "all"], default=None,
+        help="Channel(s) to plot; defaults to Higgs and Z channels.",
     )
     parser.add_argument("--min", "-m", type=float, default=10.0, help="minimum value for the histogram; default is 10.0")
     parser.add_argument("--unstack", "-u", action='store_true', default=False, help="Unstack the histograms; default is stacked")
@@ -23,8 +24,13 @@ def parser_setup() -> argparse.ArgumentParser:
     return parser
 
 
-def get_files_by_channel(channel: str, input_folder: str) -> dict[str, list[str]]:
-    channels = ["Higgs", "W", "Z"] if channel == "all" else [channel]
+def get_files_by_channel(channel: str | list[str] | None, input_folder: str) -> dict[str, list[str]]:
+    if not channel:
+        channels = ["Higgs", "Z"]
+    elif channel == "all":
+        channels = ["Higgs", "W", "Z"]
+    else:
+        channels = channel if isinstance(channel, list) else [channel]
     if "W" in channels:
         channels.extend(["Wp", "Wm"])
         channels.remove("W")
@@ -89,16 +95,18 @@ def _read_file(self, file: str) -> list[float]:
     def w_ratio(self):
         """ Calculates the ratio of W+ to W- events.
         """
-        wp = self.data["Wp"]
-        wm = self.data["Wm"]
+        wp = len(self.data["Wp"])
+        wm = len(self.data["Wm"])
 
         print(40 * "*")
         print("***\tCalculating W+ to W- ratio...")
-        if len(wm) == 0:
+        if wm == 0:
             print("!!!\tNo W- events found. Skipping W+ to W- ratio calculation.")
         else:
-            print(f"***\tFound: {len(wp)} W+ events and {len(wm)} W- events.")
-            print(f"***\tW+ to W- ratio: {len(wp) / len(wm)}")
+            w_ratio = wp / wm
+            w_error = np.sqrt(w_ratio / wm * (1 + w_ratio))
+            print(f"***\tFound: {wp} W+ events and {wm} W- events.")
+            print(f"***\tW+ to W- ratio: {w_ratio} ± {w_error} (stat)")
         print(40 * "*")
 
     def items(self) -> tuple[list[str], list[list[float]]]:
@@ -151,6 +159,8 @@ def plot_masses(reader: MassReader, unstack: bool, output: str, **kwargs):
 def main():
     parser = parser_setup()
     args = parser.parse_args()
+    if args.output is None:
+        args.output = f"./{datetime.now().strftime('%d%m%Y')}.png"
     files = get_files_by_channel(args.channel, args.input)
     if not files:
         raise Exception(f"No files found for channel '{args.channel}' in folder '{args.input}'")

ts/setup.ts

@@ -624,6 +624,12 @@ function initSelectionFields() {
     if (["TrackerMuons", "GsfElectrons", "Photons", "maxMETs"].includes(key)) {
       createCheckboxContainer(cont);
     }
+    if (key === "pt") {
+      cont.onFinishChange(function (this: SelectionFieldController, value: number) {
+        if (value < 0) this.setValue(0);
+        ispy.subfoldersReduced.Controllers.find((c) => c.property === "min_pt")?.setValue(value);
+      });
+    }
   });
 
   // add all controllers to the reduced subfolders for convenience

ts/uhh_selection.ts

@@ -188,7 +188,7 @@ function getPassingEvents(): string[] {
     }
   }
 
-  return passing_events;
+  return passing_events.sort((a, b) => Number(a) - Number(b));
 }
 
 /**