Fix small bug in --isArray mode (#110)

* Fix small bug in --isArray mode * Linting * Add latest 2022 veto maps (summer22 instead of winter22) * Fix 2022 veto maps
cms-btv-pog · Jan 23, 2025 · 1725016 · 1725016
1 parent 08d8565
commit 1725016
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/BTVNanoCommissioning/data/JME/2022_Summer22/Summer22_23Sep2023_RunCD_v1.root b/src/BTVNanoCommissioning/data/JME/2022_Summer22/Summer22_23Sep2023_RunCD_v1.root
diff --git a/src/BTVNanoCommissioning/data/JME/2022_Summer22EE/Summer22EE_23Sep2023_RunEFG_v1.root b/src/BTVNanoCommissioning/data/JME/2022_Summer22EE/Summer22EE_23Sep2023_RunEFG_v1.root
diff --git a/src/BTVNanoCommissioning/helpers/func.py b/src/BTVNanoCommissioning/helpers/func.py
@@ -257,5 +257,6 @@ def uproot_writeable(events, include=["events", "run", "luminosityBlock"]):
                 b_nest[n] = ak.fill_none(
                     ak.packed(ak.without_parameters(events[bname][n])), -99
                 )
-            ev[bname] = ak.zip(b_nest)
+            if bool(b_nest):
+                ev[bname] = ak.zip(b_nest)
     return ev
diff --git a/src/BTVNanoCommissioning/utils/AK4_parameters.py b/src/BTVNanoCommissioning/utils/AK4_parameters.py
@@ -61,7 +61,7 @@
             "Run2022D": "calibeHistoWrite_Data2022D_NANO130X_v1.root",
             "MC": "calibeHistoWrite_MC2022_NANO130X_v2.root",
         },
-        "jetveto": {"Run2022CD jetvetomap": "Winter22Run3_RunCD_v1.histo.root"},
+        "jetveto": {"Run2022CD jetvetomap": "Summer22_23Sep2023_RunCD_v1.root"},
     },
     "Summer22EE": {
         "lumiMask": "Cert_Collisions2022_355100_362760_Golden.json",
@@ -80,7 +80,7 @@
             "ele_Reco_med 2022Re-recoE+PromptFG Electron-ID-SF": "Reco20to75",
             "ele_Reco_high 2022Re-recoE+PromptFG Electron-ID-SF": "RecoAbove75",
         },
-        "jetveto": {"Run2022E jetvetomap_eep": "Winter22Run3_RunE_v1.histo.root"},
+        "jetveto": {"Run2022E jetvetomap_eep": "Summer22EE_23Sep2023_RunEFG_v1.root"},
         # use for BTA production, jet probablity
         "JPCalib": {
             "Run2022E": "calibeHistoWrite_Data2022F_NANO130X_v1.root",

diff --git a/src/BTVNanoCommissioning/utils/correction.py b/src/BTVNanoCommissioning/utils/correction.py
@@ -539,9 +539,11 @@ def JME_shifts(
                     if k in events.metadata["dataset"]
                 ]
                 if len(jecname) > 1:
-                    raise ("Multiple uncertainties match to this era")
+                    raise ValueError("Multiple uncertainties match to this era")
                 elif len(jecname) == 0:
-                    raise ("no uncertainty match to this era")
+                    raise ValueError(
+                        "Available JEC variations in this era are not compatible with this file. Did you choose the correct dataset-era combination?"
+                    )
                 else:
                     jecname = jecname[0] + "_DATA"
             else: