fix: add pv hists

Ming-Yan · Feb 14, 2024 · 2ddd52c · 2ddd52c
1 parent bf16c52
commit 2ddd52c
Show file tree

Hide file tree

Showing 30 changed files with 136 additions and 86 deletions.
diff --git a/condor/execute.sh b/condor/execute.sh
@@ -62,7 +62,10 @@ OPTS="--wf ${ARGS[workflow]} --year ${ARGS[year]} --campaign ${ARGS[campaign]} -
 if [ "${ARGS[voms]}" != "null" ]; then
     OPTS="$OPTS --voms ${ARGS[voms]}"
 fi
-for key in  isSyst isArray noHist overwrite skipbadfiles; do
+if [ "${ARGS[isSyst]}" != "null" ]; then
+    OPTS="$OPTS --isSyst ${ARGS[isSyst]}"
+fi
+for key in  isArray noHist overwrite skipbadfiles; do
     if [ "${ARGS[$key]}" == true ]; then
         OPTS="$OPTS --$key"
     fi

diff --git a/src/BTVNanoCommissioning/data/JME/Summer22Run3/jec_compiled.pkl.gz b/src/BTVNanoCommissioning/data/JME/Summer22Run3/jec_compiled.pkl.gz
diff --git a/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023B-22Sep2023.root b/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023B-22Sep2023.root
diff --git a/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v1.root b/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v1.root
diff --git a/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v2.root b/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v2.root
diff --git a/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v3.root b/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v3.root
diff --git a/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v4.root b/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_Data2023C-22Sep2023_v4.root
diff --git a/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_MC2023_Summer23.root b/src/BTVNanoCommissioning/data/JPCalib/Summer23/calibeHistoWrite_MC2023_Summer23.root
diff --git a/...VNanoCommissioning/data/JPCalib/Summer23BPix/calibeHistoWrite_Data2023D-22Sep2023_v1.root b/...VNanoCommissioning/data/JPCalib/Summer23BPix/calibeHistoWrite_Data2023D-22Sep2023_v1.root
diff --git a/...VNanoCommissioning/data/JPCalib/Summer23BPix/calibeHistoWrite_Data2023D-22Sep2023_v2.root b/...VNanoCommissioning/data/JPCalib/Summer23BPix/calibeHistoWrite_Data2023D-22Sep2023_v2.root
diff --git a/src/BTVNanoCommissioning/data/JPCalib/Summer23BPix/calibeHistoWrite_MC2023_Summer23BPix.root b/src/BTVNanoCommissioning/data/JPCalib/Summer23BPix/calibeHistoWrite_MC2023_Summer23BPix.root
diff --git a/src/BTVNanoCommissioning/data/PU/Summer23/puwei_Summer23.histo.root b/src/BTVNanoCommissioning/data/PU/Summer23/puwei_Summer23.histo.root
diff --git a/src/BTVNanoCommissioning/data/PU/Summer23BPix/puwei_Summer23BPix.histo.root b/src/BTVNanoCommissioning/data/PU/Summer23BPix/puwei_Summer23BPix.histo.root
diff --git a/src/BTVNanoCommissioning/utils/AK4_parameters.py b/src/BTVNanoCommissioning/utils/AK4_parameters.py
@@ -81,18 +81,31 @@
     },
     "Summer23": {
         "lumiMask": "Cert_Collisions2023_366442_370790_Golden.json",
-        # "PU": "puweight_Summer22EERun3-80p0mb.histo.root",  # 69.2mb
+        "PU": "puwei_Summer23.histo.root",
         # "JME": "jec_compiled.pkl.gz",
         "jetveto": {
             "Run2023BC jetvetomap": "jetveto2023BC.histo.root"
         },  # this is from Mikko https://indico.cern.ch/event/1315421/contributions/5532963/attachments/2697975/4683826/2023_08_16_jetvetomaps_v3.pdf
+        "JPCalib": {
+            "Run2023B-22Sep2023-v1": "calibeHistoWrite_Data2023B-22Sep2023.root",
+            "Run2023C-22Sep2023-v1": "calibeHistoWrite_Data2023C-22Sep2023_v1.root",
+            "Run2023C-22Sep2023-v2": "calibeHistoWrite_Data2023C-22Sep2023_v2.root",
+            "Run2023C-22Sep2023-v3": "calibeHistoWrite_Data2023C-22Sep2023_v3.root",
+            "Run2023C-22Sep2023-v4": "calibeHistoWrite_Data2023C-22Sep2023_v4.root",
+            "MC": "calibeHistoWrite_MC2023_Summer23.root",
+        },
     },
     "Summer23BPix": {
         "lumiMask": "Cert_Collisions2023_366442_370790_Golden.json",
-        # "PU": "puweight_Summer22EERun3-80p0mb.histo.root",  # 69.2mb
+        "PU": "puwei_Summer23BPix.histo.root",
         # "JME": "jec_compiled.pkl.gz",
         "jetveto": {
             "Run2023D jetvetomap_bpix": "jetveto2023D.histo.root"
         },  # this is from Mikko https://indico.cern.ch/event/1315421/contributions/5532963/attachments/2697975/4683826/2023_08_16_jetvetomaps_v3.pdf
+        "JPCalib": {
+            "Run2023D-22Sep2023-v1": "calibeHistoWrite_Data2023D-22Sep2023_v1.root",
+            "Run2023D-22Sep2023-v2": "calibeHistoWrite_Data2023D-22Sep2023_v2.root",
+            "MC": "calibeHistoWrite_MC2023_Summer23BPix.root",
+        },
     },
 }
diff --git a/src/BTVNanoCommissioning/utils/correction.py b/src/BTVNanoCommissioning/utils/correction.py
@@ -46,9 +46,7 @@ def load_SF(campaign, syst=False):
                             ]
                     elif str(filename).endswith(".json.gz"):
                         correct_map["PU"] = correctionlib.CorrectionSet.from_file(
-                            importlib.resources.path(
-                                f"BTVNanoCommissioning.data.PU.{campaign}", filename
-                            )
+                            str(filename)
                         )
                     elif str(filename).endswith(".histo.root"):
                         ext = extractor()

diff --git a/src/BTVNanoCommissioning/utils/histogrammer.py b/src/BTVNanoCommissioning/utils/histogrammer.py
@@ -28,8 +28,8 @@ def histogrammer(events, workflow):
     ptratio_axis = Hist.axis.Regular(50, 0, 1, name="ratio", label="ratio")
     n_axis = Hist.axis.Integer(0, 10, name="n", label="N obj")
     osss_axis = Hist.axis.IntCategory([1, -1], name="osss", label="OS(+)/SS(-)")
-    _hist_dict["npvs"] = Hist.Hist(npvs_axis, Hist.storage.Weight())
-    _hist_dict["pu"] = Hist.Hist(npvs_axis, Hist.storage.Weight())
+    _hist_dict["npvs"] = Hist.Hist(syst_axis, npvs_axis, Hist.storage.Weight())
+    _hist_dict["pu"] = Hist.Hist(syst_axis, npvs_axis, Hist.storage.Weight())
     ### Workflow specific
     if "example" == workflow:
         obj_list = [

diff --git a/src/BTVNanoCommissioning/workflows/ctag_DY_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_DY_valid_sf.py
@@ -102,10 +102,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
 
         ####################
         #    Selections    #
@@ -381,9 +382,11 @@ def process_shift(self, events, shift_name):
             output["z_eta"].fill(syst, flatten(sz.eta), weight=weight)
             output["z_phi"].fill(syst, flatten(sz.phi), weight=weight)
             output["z_mass"].fill(syst, flatten(sz.mass), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_Wc_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_Wc_valid_sf.py
@@ -106,10 +106,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
         ####################
         #    Selections    #
         ####################
@@ -512,9 +513,11 @@ def process_shift(self, events, shift_name):
             output["w_mass"].fill(syst, osss, flatten(sw.mass), weight=weight)
             output["MET_pt"].fill(syst, osss, flatten(smet.pt), weight=weight)
             output["MET_phi"].fill(syst, osss, flatten(smet.phi), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_dileptt_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_dileptt_valid_sf.py
@@ -107,10 +107,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
 
         ####################
         #    Selections    #
@@ -455,9 +456,11 @@ def process_shift(self, events, shift_name):
             output["z_mass"].fill(syst, flatten(sz.mass), weight=weight)
             output["MET_pt"].fill(syst, flatten(smet.pt), weight=weight)
             output["MET_phi"].fill(syst, flatten(smet.phi), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_eDY_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_eDY_valid_sf.py
@@ -100,10 +100,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
         ####################
         #    Selections    #
         ####################
@@ -381,9 +382,11 @@ def process_shift(self, events, shift_name):
             output["z_eta"].fill(syst, flatten(sz.eta), weight=weight)
             output["z_phi"].fill(syst, flatten(sz.phi), weight=weight)
             output["z_mass"].fill(syst, flatten(sz.mass), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_eWc_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_eWc_valid_sf.py
@@ -106,10 +106,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
         ####################
         #    Selections    #
         ####################
@@ -487,9 +488,11 @@ def process_shift(self, events, shift_name):
             output["w_mass"].fill(syst, osss, flatten(sw.mass), weight=weight)
             output["MET_pt"].fill(syst, osss, flatten(smet.pt), weight=weight)
             output["MET_phi"].fill(syst, osss, flatten(smet.phi), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_edileptt_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_edileptt_valid_sf.py
@@ -105,10 +105,11 @@ def process_shift(self, events, shift_name):
             "sumw": processor.defaultdict_accumulator(float),
             **_hist_event_dict,
         }
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
         ####################
         #    Selections    #
         ####################
@@ -451,9 +452,11 @@ def process_shift(self, events, shift_name):
             output["z_mass"].fill(syst, flatten(sz.mass), weight=weight)
             output["MET_pt"].fill(syst, flatten(smet.pt), weight=weight)
             output["MET_phi"].fill(syst, flatten(smet.phi), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_emdileptt_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_emdileptt_valid_sf.py
@@ -106,10 +106,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
         ####################
         #    Selections    #
         ####################
@@ -505,9 +506,11 @@ def process_shift(self, events, shift_name):
             output["z_mass"].fill(syst, flatten(sz.mass), weight=weight)
             output["MET_pt"].fill(syst, flatten(smet.pt), weight=weight)
             output["MET_phi"].fill(syst, flatten(smet.phi), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_ettsemilep_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_ettsemilep_valid_sf.py
@@ -108,10 +108,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
 
         ####################
         #    Selections    #
@@ -491,9 +492,11 @@ def process_shift(self, events, shift_name):
             output["w_mass"].fill(syst, flatten(sw.mass), weight=weight)
             output["MET_pt"].fill(syst, flatten(smet.pt), weight=weight)
             output["MET_phi"].fill(syst, flatten(smet.phi), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/ctag_semileptt_valid_sf.py b/src/BTVNanoCommissioning/workflows/ctag_semileptt_valid_sf.py
@@ -106,10 +106,11 @@ def process_shift(self, events, shift_name):
             **_hist_event_dict,
         }
 
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
 
         ###############
         # Event level #
@@ -507,9 +508,11 @@ def process_shift(self, events, shift_name):
             output["w_mass"].fill(syst, flatten(sw.mass), weight=weight)
             output["MET_pt"].fill(syst, flatten(smet.pt), weight=weight)
             output["MET_phi"].fill(syst, flatten(smet.phi), weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################

diff --git a/src/BTVNanoCommissioning/workflows/example.py b/src/BTVNanoCommissioning/workflows/example.py
@@ -110,10 +110,11 @@ def process_shift(self, events, shift_name):
             "sumw": processor.defaultdict_accumulator(float),
             **_hist_event_dict,
         }
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
         ####################
         #    Selections    #
         ####################

diff --git a/src/BTVNanoCommissioning/workflows/ttbar_validation.py b/src/BTVNanoCommissioning/workflows/ttbar_validation.py
@@ -104,10 +104,11 @@ def process_shift(self, events, shift_name):
             "sumw": processor.defaultdict_accumulator(float),
             **_hist_event_dict,
         }
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
 
         ####################
         #    Selections    #

diff --git a/src/BTVNanoCommissioning/workflows/ttdilep_valid_sf.py b/src/BTVNanoCommissioning/workflows/ttdilep_valid_sf.py
@@ -113,10 +113,11 @@ def process_shift(self, events, shift_name):
             "sumw": processor.defaultdict_accumulator(float),
             **_hist_event_dict,
         }
-        if isRealData:
-            output["sumw"] = len(events)
-        else:
-            output["sumw"] = ak.sum(events.genWeight)
+        if shift_name is None:
+            if isRealData:
+                output["sumw"] = len(events)
+            else:
+                output["sumw"] = ak.sum(events.genWeight)
         ####################
         #    Selections    #
         ####################
@@ -402,9 +403,11 @@ def process_shift(self, events, shift_name):
                     weight=weight,
                 )
             output["njet"].fill(syst, nseljet, weight=weight)
-            output["npvs"].fill(events[event_level].PV.npvs, weight=weight)
+            output["npvs"].fill(syst, events[event_level].PV.npvs, weight=weight)
             if not isRealData:
-                output["pu"].fill(events[event_level].Pileup.nTrueInt, weight=weight)
+                output["pu"].fill(
+                    syst, events[event_level].Pileup.nTrueInt, weight=weight
+                )
         #######################
         #  Create root files  #
         #######################