feat: add tag & probe workflow for NTuples created using NanoAOD

scripts/run_analysis.py

@@ -165,8 +165,10 @@ def main():
             scheduler_options={"dashboard_address": args.dashboard_address},
         )
         scheduler = "distributed"
-    elif args.executor.startswith("tls:://") or args.executor.startswith("tcp://") or args.executor.startswith("ucx://"):
+    elif args.executor is not None and (args.executor.startswith("tls:://") or args.executor.startswith("tcp://") or args.executor.startswith("ucx://")):
         logger.info(f"Will use dask scheduler at {args.executor}")
+    elif args.executor is None:
+        logger.info("Running with default dask scheduler")
     else:
         logger.error(f"Unknown executor `{args.executor}`")
         raise ValueError(f"Unknown executor `{args.executor}`")
@@ -179,7 +181,7 @@ def main():
         logger.info(f"Set up cluster {cluster}")
         client = Client(cluster)
         logger.info(f"Set up client {client}")
-    if args.executor.startswith("tls://") or args.executor.startswith("tcp://") or args.executor.startswith("ucx://"):
+    if args.executor is not None and (args.executor.startswith("tls://") or args.executor.startswith("tcp://") or args.executor.startswith("ucx://")):
         client = Client(args.executor)
         logger.info(f"Set up client {client}")
 

src/egamma_tnp/__init__.py

@@ -6,13 +6,26 @@
 
 from egamma_tnp.config import binning
 from egamma_tnp.nanoaod_efficiency import ElectronTagNProbeFromNanoAOD, PhotonTagNProbeFromNanoAOD
-from egamma_tnp.ntuple_efficiency import ElectronTagNProbeFromNTuples, PhotonTagNProbeFromNTuples
+from egamma_tnp.ntuple_efficiency import (
+    ElectronTagNProbeFromMiniNTuples,
+    ElectronTagNProbeFromNanoNTuples,
+    PhotonTagNProbeFromMiniNTuples,
+    PhotonTagNProbeFromNanoNTuples,
+)
 
 from . import _version
 
 warnings.filterwarnings("ignore", category=FutureWarning, module="coffea.*")
 __version__ = _version.__version__
-__all__ = ("binning", "ElectronTagNProbeFromNTuples", "ElectronTagNProbeFromNanoAOD", "PhotonTagNProbeFromNTuples", "PhotonTagNProbeFromNanoAOD")
+__all__ = (
+    "binning",
+    "ElectronTagNProbeFromMiniNTuples",
+    "ElectronTagNProbeFromNanoAOD",
+    "PhotonTagNProbeFromMiniNTuples",
+    "PhotonTagNProbeFromNanoAOD",
+    "ElectronTagNProbeFromNanoNTuples",
+    "PhotonTagNProbeFromNanoNTuples",
+)
 
 
 def dir():

src/egamma_tnp/nanoaod_efficiency.py

@@ -152,7 +152,8 @@ def find_probes(self, events, cut_and_count, mass_range, vars):
             if "superclusterEta" in events.Electron.fields:
                 events["Electron", "eta_to_use"] = events.Electron.superclusterEta
             else:
-                events["Electron", "eta_to_use"] = events.Electron.eta + events.Electron.deltaEtaSC
+                events["Electron", "superclusterEta"] = events.Electron.eta + events.Electron.deltaEtaSC
+                events["Electron", "eta_to_use"] = events.Electron.superclusterEta
         else:
             events["Electron", "eta_to_use"] = events.Electron.eta
         if self.use_sc_phi: