Merge pull request #94 from cms-l1-dpg/14x_dev

14x development for HLT AR24
cms-l1-dpg · Oct 17, 2024 · 8ae52a8 · 8ae52a8
2 parents 9339248 + 56bed9d
commit 8ae52a8
Show file tree

Hide file tree

Showing 161 changed files with 10,572 additions and 1,482 deletions.
diff --git a/configs/V38nano/caching.yaml b/configs/V38nano/caching.yaml
@@ -53,6 +53,7 @@ V38nano:
     ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/14X/v38/VBFHToTauTau_M-125_TuneCP5_14TeV-powheg-pythia8/VBFHToTauTau_131_200PU_IBv9_wTT/240412_210701/0000/*.root
     trees_branches:
       Events:
+        GenPart: [pt, eta, phi, pdgId, statusFlags]
         GenVisTau: "all" 
         L1nnPuppiTau: "all" 
         L1hpsTau: "all" 

diff --git a/configs/V38nano/object_performance/electron_iso.yaml b/configs/V38nano/object_performance/electron_iso.yaml
@@ -15,7 +15,7 @@ ElectronsIsolation_Barrel:
       object:
         - "abs({eta}) < 1.479"
   test_objects:
-    L1tkElectron:NoIso: "relIso"
+    L1tkElectron:NoIsoForIso: "relIso"
   xlabel: "Isolation"
   ylabel: "Efficiency (Barrel)"
   binning:

diff --git a/configs/V38nano/object_performance/electron_matching.yaml b/configs/V38nano/object_performance/electron_matching.yaml
@@ -16,6 +16,7 @@ ElectronsMatchingBarrel:
   test_objects:
     L1EG:default: "pt"
     L1tkElectron:NoIso: "pt"
+    L1tkElectron:NoIsoNoLowPtID: "pt"
     L1tkElectron:Iso: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
   ylabel: "Matching Efficiency (Barrel)"
@@ -68,6 +69,7 @@ ElectronsMatchingEndcap:
   test_objects:
     L1EG:default: "pt"
     L1tkElectron:NoIso: "pt"
+    L1tkElectron:NoIsoNoLowPtID: "pt"
     L1tkElectron:Iso: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
   ylabel: "Matching Efficiency (Endcap)"

diff --git a/configs/V38nano/object_performance/electron_matching_eta.yaml b/configs/V38nano/object_performance/electron_matching_eta.yaml
@@ -17,6 +17,7 @@ ElectronsMatching_Eta_Pt10to25:
   test_objects:
     L1EG:default: "eta"
     L1tkElectron:NoIso: "eta"
+    L1tkElectron:NoIsoNoLowPtID: "eta"
     L1tkElectron:Iso: "eta"
   xlabel: "Gen. $\\eta$"
   ylabel: "Matching Efficiency ($10 < p_T < 25$ GeV)"
@@ -43,6 +44,7 @@ ElectronsMatching_Eta_Pt25toInf:
   test_objects:
     L1EG:default: "eta"
     L1tkElectron:NoIso: "eta"
+    L1tkElectron:NoIsoNoLowPtID: "eta"
     L1tkElectron:Iso: "eta"
   xlabel: "Gen. $\\eta$"
   ylabel: "Matching Efficiency ($p_T > 25$ GeV)"

diff --git a/configs/V38nano/object_performance/electron_trigger.yaml b/configs/V38nano/object_performance/electron_trigger.yaml
@@ -16,6 +16,7 @@ ElectronsTriggerBarrel:
   test_objects:
     L1EG:default:barrel: "pt"
     L1tkElectron:NoIso:barrel: "pt"
+    # L1tkElectron:NoIsoNoLowPtID:barrel: "pt"
     L1tkElectron:Iso:barrel: "pt"
   thresholds: [10, 20, 30, 40]
   scalings:
@@ -46,6 +47,7 @@ ElectronsTriggerEndcap:
   test_objects:
     L1EG:default:endcap: "pt"
     L1tkElectron:NoIso:endcap: "pt"
+    # L1tkElectron:NoIsoNoLowPtID:endcap: "pt"
     L1tkElectron:Iso:endcap: "pt"
   thresholds: [10, 20, 30, 40]
   scalings:
@@ -57,63 +59,3 @@ ElectronsTriggerEndcap:
     min: 0
     max: 100
     step: 1.5
-
-# ElectronsTriggerBarrel_wPrunedGenPart:
-#   sample: DYLL_M50
-#   version: V38nano
-#   match_test_to_ref: True
-#   reference_object:
-#     object: "GenPart"
-#     x_arg: "pt"
-#     label: "Gen Electrons"
-#     cuts:
-#       event:
-#         - "(({statusFlags}>>7)&1) == 1"
-#         - "abs({pdgId}) == 11"
-#         - "abs({eta}) < 1.5"
-#       object:
-#         - "abs({eta}) < 2.8"
-#   test_objects:
-    # L1EG:default:barrel: "pt"
-#     L1tkElectron:NoIso:barrel: "pt"
-#     L1tkElectron:Iso:barrel: "pt"
-#   thresholds: [10, 20, 30, 40]
-#   scalings:
-#     method: "naive"
-#     threshold: 0.95
-#   xlabel: "Gen. pT (GeV)"
-#   ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
-#   binning:
-#     min: 0
-#     max: 100
-#     step: 1.5
-
-# ElectronsTriggerEndcap_wPrunedGenPart:
-#   sample: DYLL_M50
-#   version: V38nano
-#   match_test_to_ref: True
-#   reference_object:
-#     object: "GenPart"
-#     x_arg: "pt"
-#     label: "Gen Electrons"
-#     cuts:
-#       event:
-#         - "(({statusFlags}>>7)&1) == 1"
-#         - "abs({pdgId}) == 11"
-#         - "abs({eta}) > 1.5"
-#       object:
-#         - "abs({eta}) < 2.8"
-#   test_objects:
-#     # L1EG:default:endcap: "pt"
-#     L1tkElectron:NoIso:endcap: "pt"
-#     L1tkElectron:Iso:endcap: "pt"
-#   thresholds: [10, 20, 30, 40]
-#   scalings:
-#     method: "naive"
-#     threshold: 0.95
-#   xlabel: "Gen. pT (GeV)"
-#   ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
-#   binning:
-#     min: 0
-#     max: 100
-#     step: 1.5
diff --git a/configs/V38nano/object_performance/photons_matching.yaml b/configs/V38nano/object_performance/photons_matching.yaml
@@ -1,56 +1,108 @@
-PhotonsMatching_Barrel:
-  sample: Hgg
-  version: V38nano
-  match_test_to_ref: True
-  reference_object:
-    object: "GenPart"
-    x_arg: "pt"
-    label: "Gen Photons"
-    cuts:
-      event:
-        - "(({statusFlags}>>7)&1) == 1"
-        - "abs({pdgId}) == 22"
-        - "abs({eta}) < 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    L1EG:default: "pt"
-    L1tkPhoton:NoIso: "pt"
-    L1tkPhoton:Iso: "pt"
-  xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Matching Efficiency (Barrel)"
-  binning:
-    min: 0
-    max: 100
-    step: 3
+# PhotonsMatching_Barrel:
+#   sample: Hgg
+#   version: V38nano
+#   match_test_to_ref: True
+#   reference_object:
+#     object: "GenPart"
+#     x_arg: "pt"
+#     label: "Gen Photons"
+#     cuts:
+#       event:
+#         - "(({statusFlags}>>7)&1) == 1"
+#         - "abs({pdgId}) == 22"
+#         - "abs({eta}) < 1.5"
+#       object:
+#         - "abs({eta}) < 2.4"
+#   test_objects:
+#     L1EG:default: "pt"
+#     L1tkPhoton:NoIso: "pt"
+#     L1tkPhoton:Iso: "pt"
+#   xlabel: "Gen. $p_T$ (GeV)"
+#   ylabel: "Matching Efficiency (Barrel)"
+#   binning:
+#     min: 0
+#     max: 100
+#     step: 3
 
-PhotonsMatching_Endcap:
-  sample: Hgg
-  version: V38nano
-  match_test_to_ref: True
-  reference_object:
-    object: "GenPart"
-    x_arg: "pt"
-    label: "Gen Photons"
-    cuts:
-      event:
-        - "(({statusFlags}>>7)&1) == 1"
-        - "abs({pdgId}) == 22"
-        - "abs({eta}) > 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    L1EG:default: "pt"
-    L1tkPhoton:NoIso: "pt"
-    L1tkPhoton:Iso: "pt"
-  xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Matching Efficiency (Endcap)"
-  binning:
-    min: 0
-    max: 100
-    step: 3
+# PhotonsMatching_Endcap:
+#   sample: Hgg
+#   version: V38nano
+#   match_test_to_ref: True
+#   reference_object:
+#     object: "GenPart"
+#     x_arg: "pt"
+#     label: "Gen Photons"
+#     cuts:
+#       event:
+#         - "(({statusFlags}>>7)&1) == 1"
+#         - "abs({pdgId}) == 22"
+#         - "abs({eta}) > 1.5"
+#       object:
+#         - "abs({eta}) < 2.4"
+#   test_objects:
+#     L1EG:default: "pt"
+#     L1tkPhoton:NoIso: "pt"
+#     L1tkPhoton:Iso: "pt"
+#   xlabel: "Gen. $p_T$ (GeV)"
+#   ylabel: "Matching Efficiency (Endcap)"
+#   binning:
+#     min: 0
+#     max: 100
+#     step: 3
+
+# PhotonsMatching_Barrel_wPrunedGenParts:
+#   sample: Hgg
+#   version: V38nano
+#   match_test_to_ref: True
+#   reference_object:
+#     object: "GenPart"
+#     x_arg: "pt"
+#     label: "Gen Photons"
+#     cuts:
+#       event:
+#         - "(({statusFlags}>>7)&1) == 1"
+#         - "abs({pdgId}) == 22"
+#         - "abs({eta}) < 1.5"
+#       object:
+#         - "abs({eta}) < 2.4"
+#   test_objects:
+#     L1EG:default: "pt"
+#     L1tkPhoton:NoIso: "pt"
+#     L1tkPhoton:Iso: "pt"
+#   xlabel: "Gen. $p_T$ (GeV)"
+#   ylabel: "Matching Efficiency (Barrel)"
+#   binning:
+#     min: 0
+#     max: 100
+#     step: 3
+
+# PhotonsMatching_Endcap_wPrunedGenParts:
+#   sample: Hgg
+#   version: V38nano
+#   match_test_to_ref: True
+#   reference_object:
+#     object: "GenPart"
+#     x_arg: "pt"
+#     label: "Gen Photons"
+#     cuts:
+#       event:
+#         - "(({statusFlags}>>7)&1) == 1"
+#         - "abs({pdgId}) == 22"
+#         - "abs({eta}) > 1.5"
+#       object:
+#         - "abs({eta}) < 2.4"
+#   test_objects:
+#     L1EG:default: "pt"
+#     L1tkPhoton:NoIso: "pt"
+#     L1tkPhoton:Iso: "pt"
+#   xlabel: "Gen. $p_T$ (GeV)"
+#   ylabel: "Matching Efficiency (Endcap)"
+#   binning:
+#     min: 0
+#     max: 100
+#     step: 3
 
-PhotonsMatching_Barrel_wPrunedGenParts:
+PhotonsMatching_Barrel_Pt30:
   sample: Hgg
   version: V38nano
   match_test_to_ref: True
@@ -69,14 +121,16 @@ PhotonsMatching_Barrel_wPrunedGenParts:
     L1EG:default: "pt"
     L1tkPhoton:NoIso: "pt"
     L1tkPhoton:Iso: "pt"
+    L1tkPhoton:NoIsoPt30: "pt"
+    L1tkPhoton:IsoPt30: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
   ylabel: "Matching Efficiency (Barrel)"
   binning:
     min: 0
-    max: 100
+    max: 150
     step: 3
 
-PhotonsMatching_Endcap_wPrunedGenParts:
+PhotonsMatching_Endcap_Pt30:
   sample: Hgg
   version: V38nano
   match_test_to_ref: True
@@ -95,9 +149,11 @@ PhotonsMatching_Endcap_wPrunedGenParts:
     L1EG:default: "pt"
     L1tkPhoton:NoIso: "pt"
     L1tkPhoton:Iso: "pt"
+    L1tkPhoton:NoIsoPt30: "pt"
+    L1tkPhoton:IsoPt30: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
   ylabel: "Matching Efficiency (Endcap)"
   binning:
     min: 0
-    max: 100
+    max: 150
     step: 3
diff --git a/configs/V38nano/object_performance/photons_trigger.yaml b/configs/V38nano/object_performance/photons_trigger.yaml
@@ -17,7 +17,7 @@ PhotonsTrigger_Barrel:
     L1EG:default:barrel: "pt"
     L1tkPhoton:NoIso:barrel: "pt"
     L1tkPhoton:Iso:barrel: "pt"
-  thresholds: [10, 20, 30, 40]
+  thresholds: [8]
   scalings:
     method: "naive"
     threshold: 0.95
@@ -47,7 +47,7 @@ PhotonsTrigger_Endcap:
     L1EG:default:endcap: "pt"
     L1tkPhoton:NoIso:endcap: "pt"
     L1tkPhoton:Iso:endcap: "pt"
-  thresholds: [10, 20, 30, 40]
+  thresholds: [8]
   scalings:
     method: "naive"
     threshold: 0.95

diff --git a/configs/V38nano/objects/photons.yaml b/configs/V38nano/objects/photons.yaml
@@ -15,6 +15,16 @@ L1tkPhoton:
           - "{eleId} == 1"
         endcap:
           - "{phoId} == 1"
+    NoIsoPt30:
+      label: "L1tkPhoton, pt>30"
+      cuts:
+        inclusive:
+          - "abs({eta}) < 2.4"
+          - "{pt} > 30"
+        barrel:
+          - "{eleId} == 1"
+        endcap:
+          - "{phoId} == 1"
     Iso:
       label: "L1tkIsoPhoton"
       cuts:
@@ -27,3 +37,15 @@ L1tkPhoton:
         endcap:
           - "abs({relIso}) < 0.205"
           - "{phoId} == 1"
+    IsoPt30:
+      label: "L1tkIsoPhoton, Pt>30"
+      cuts:
+        inclusive:
+          - "abs({eta}) < 2.4"
+          - "{pt} > 30"
+        barrel:
+          - "abs({relIso}) < 0.25"
+          - "{eleId} == 1"
+        endcap:
+          - "abs({relIso}) < 0.205"
+          - "{phoId} == 1"
diff --git a/configs/V38nano/rate_plots/eg.yaml b/configs/V38nano/rate_plots/eg.yaml
@@ -6,6 +6,7 @@ EGRates:
     - L1tkElectron:NoIso
     - L1tkElectron:Iso
     - L1tkPhoton:Iso
+    - L1tkElectron:NoIsoNoLowPtID
   binning:
     min: 10
     max: 97