Merge branch 'cms-l1-dpg:dev_nano_14x_rebase_mai' into dev_nano_14x_r…

…ebase_mai
cms-l1-dpg · Mar 13, 2024 · f293224 · f293224
2 parents aa94d82 + c92303a
commit f293224
Show file tree

Hide file tree

Showing 39 changed files with 569 additions and 229 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ outputs
 menu_tools.egg-info
 dist
 ph2-menu-tools
+prod_ph2-menu-tools
+dev_ph2-menu-tools
diff --git a/configs/V31/caching.yaml b/configs/V31/caching.yaml
@@ -65,19 +65,26 @@ V31:
     trees_branches:
       l1PhaseIITree/L1PhaseIITree:
         puppiMET: "all"
-        # phase1PuppiJet: "all"
-        # phase1PuppiMHT: "all"
-        # phase1PuppiHT: "all"
+        phase1PuppiJet: "all"
+        phase1PuppiMHT: "all"
+        phase1PuppiHT: "all"
         seededConePuppiJet: [Pt, Et, Eta, Phi]
         seededConeExtendedPuppiJet: [Pt, Et, Eta, Phi, BJetNN]
         seededConeExtendedPuppiHT: "all"
         seededConePuppiHT: "all"
         seededConePuppiMHT: "all"
+        caloJet: [Et, Pt, Eta, Phi]
         tkElectron: [Pt, Et, Eta, Phi, Chg, TrkIso, PfIso, PuppiIso, zVtx, HwQual, HGC, PassesEleID, PassesPhoID]
         EG: [Pt, Et, Eta, Phi, Iso, HwQual, HGC, PassesEleID, PassesSaID]
         gmtTkMuon: [Pt, Eta, Phi, Z0, D0, Chg, Qual ]
+        gmtMuon: [Pt, Eta, Phi, Z0, D0, Chg, Qual ]
         nnTau: [Et, Eta, Pt, Phi, Z0, PassTightNN, Chg, DXY, PassLooseNN]
         tkPhoton: [Pt, Et, Eta, Phi, TrkIso, HwQual, HGC, PassesEleID, PassesPhoID]
         z0L1TkPV: "all"
         caloTau: [Et, Eta, Pt, Phi, Iso, HwQual]
+        trackerJet: [Pt, Eta, Phi]
+        trackerMET: "all"
+        trackerMHT: "all"
+        trackerHT: "all"
+
 
diff --git a/configs/V31/object_performance/bJetEff.yaml → ...bject_performance/comparisons/bJetEff.yml b/configs/V31/object_performance/bJetEff.yaml → ...bject_performance/comparisons/bJetEff.yml
diff --git a/...bject_performance/version_comparison.yaml → ...mance/comparisons/version_comparison.yaml b/...bject_performance/version_comparison.yaml → ...mance/comparisons/version_comparison.yaml
diff --git a/configs/V31/object_performance/jets_trigger.yaml b/configs/V31/object_performance/jets_trigger.yaml
@@ -14,7 +14,7 @@ JetTurnonBarrel:
   test_objects:
     phase1PuppiJet:default:barrel: "Pt"
     seededConePuppiJet:default:barrel: "Pt"
-    caloJet:default: "Pt"
+    caloJet:default:barrel: "Pt"
     trackerJet:default:barrel: "Pt"
   thresholds: [50, 100]
   scalings:
@@ -43,7 +43,7 @@ JetTurnonEndcap:
   test_objects:
     phase1PuppiJet:default:endcap: "Pt"
     seededConePuppiJet:default:endcap: "Pt"
-    caloJet:default: "Pt"
+    caloJet:default:endcap: "Pt"
     trackerJet:default:endcap: "Pt"
   thresholds: [50, 100]
   scalings:
@@ -72,7 +72,7 @@ JetTurnonForward:
   test_objects:
     phase1PuppiJet:default:forward: "Pt"
     seededConePuppiJet:default:forward: "Pt"
-    caloJet:default: "Pt"
+    caloJet:default:forward: "Pt"
   thresholds: [50, 100]
   scalings:
     method: "naive"

diff --git a/configs/V31/object_performance/jets_trigger_fwd.yaml b/configs/V31/object_performance/jets_trigger_fwd.yaml
@@ -12,7 +12,7 @@ JetTurnonFwd_3p7to7:
       object:
         - "abs({eta}) < 7"
   test_objects:
-    phase1PuppiJet:default:forward: "Pt"
+    #phase1PuppiJet:default:forward: "Pt"
     seededConePuppiJet:default:forward: "Pt"
   thresholds: [50,100]
   scalings:

diff --git a/configs/V31/object_performance/mht.yaml b/configs/V31/object_performance/mht.yaml
@@ -1,29 +1,3 @@
-MHT30_90perc:
-  sample: TT
-  version: V31
-  reference_object:
-    object: "jet"
-    x_arg: "Pt"
-    label: "Gen MHT"
-    cuts:
-      object:
-        - "abs({eta}) < 2.4"
-        - "{pt} > 30"
-    trafo: "MHT"
-  test_objects:
-    phase1PuppiMHT:default: "et"
-    seededConePuppiMHT:default: "et"
-  thresholds: [70, 150]
-  scalings:
-    method: "naive"
-    threshold: 0.90
-  xlabel: "Gen. MHT30 (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV)"
-  binning:
-    min: 0
-    max: 500
-    step: 20
-
 MHT30_50perc:
   sample: TT
   version: V31
@@ -40,7 +14,7 @@ MHT30_50perc:
     phase1PuppiMHT:default: "et"
     seededConePuppiMHT:default: "et"
     trackerMHT:default: ""
-  thresholds: [70, 150]
+  thresholds: [70]
   scalings:
     method: "naive"
     threshold: 0.50

diff --git a/configs/V31/object_performance/tau_trigger.yaml b/configs/V31/object_performance/tau_trigger.yaml
@@ -53,59 +53,3 @@ TauTriggerEndcap_90perc:
     min: 0
     max: 150
     step: 6
-
-TauTriggerBarrel_50perc:
-  sample: VBFHToTauTau
-  version: V31
-  match_test_to_ref: True
-  reference_object:
-    object: "part_tau"
-    x_arg: "Pt"
-    label: "Gen Taus"
-    cuts:
-      event:
-        - "{dr_0.3} < 0.15"
-        - "abs({eta}) < 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    nnTau:default:barrel: "Pt"
-    caloTau:default:barrel: "Pt"
-  xlabel: "Gen. pT (GeV)"
-  ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
-  thresholds: [20, 30]
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  binning:
-    min: 0
-    max: 150
-    step: 6
-
-TauTriggerEndcap_50perc:
-  sample: VBFHToTauTau
-  version: V31
-  match_test_to_ref: True
-  reference_object:
-    object: "part_tau"
-    x_arg: "Pt"
-    label: "Gen Taus"
-    cuts:
-      event:
-        - "{dr_0.3} < 0.15"
-        - "abs({eta}) > 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    nnTau:default:endcap: "Pt"
-    caloTau:default:endcap: "Pt"
-  xlabel: "Gen. pT (GeV)"
-  ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
-  thresholds: [20, 30]
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  binning:
-    min: 0
-    max: 150
-    step: 6
diff --git a/configs/V31/objects/jets.yaml b/configs/V31/objects/jets.yaml
@@ -3,6 +3,9 @@ caloJet:
   label: "Calo Jet"
   eta_ranges:
     inclusive: [0, 7]
+    barrel: [0, 1.5]
+    endcap: [1.5, 2.4]
+    forward: [2.4, 5]
   cuts:
     inclusive:
       - "abs({eta}) < 7"

diff --git a/configs/V31/objects/taus.yaml b/configs/V31/objects/taus.yaml
@@ -24,6 +24,8 @@ caloTau:
     endcap: [1.5, 2.4]
   ids:
     default:
+      label: "Calo Tau, pt>20"
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"
+          - "{pt} > 20"
diff --git a/configs/V31/rate_plots/eg.yaml b/configs/V31/rate_plots/eg.yaml
@@ -0,0 +1,12 @@
+EGRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - EG:default
+    - tkElectron:NoIso
+    - tkElectron:Iso
+    - tkPhoton:Iso
+  binning:
+    min: 10
+    max: 97
+    step: 3
diff --git a/configs/V31/rate_plots/ht.yaml b/configs/V31/rate_plots/ht.yaml
@@ -0,0 +1,23 @@
+HTRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - phase1PuppiHT:default
+    - seededConePuppiHT:default
+    - trackerHT:default
+  binning:
+    min: 50
+    max: 975
+    step: 25
+
+MHTRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - phase1PuppiMHT:default
+    - seededConePuppiMHT:default
+    - trackerMHT:default
+  binning:
+    min: 50
+    max: 975
+    step: 25
diff --git a/configs/V31/rate_plots/jets.yaml b/configs/V31/rate_plots/jets.yaml
@@ -0,0 +1,27 @@
+JetDefaultRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - phase1PuppiJet:default
+    - seededConePuppiJet:default
+    # - seededConeExtendedPuppiJet:default
+    - trackerJet:default
+    - caloJet:default
+  binning:
+    min: 40
+    max: 420
+    step: 20
+
+JetsByRegion:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - phase1PuppiJet:default:barrel
+    - phase1PuppiJet:default:endcap
+    - seededConePuppiJet:default:barrel
+    - seededConePuppiJet:default:endcap
+  binning:
+    min: 40
+    max: 420
+    step: 20
+
diff --git a/configs/V31/rate_plots/met.yaml b/configs/V31/rate_plots/met.yaml
@@ -0,0 +1,10 @@
+METRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - puppiMET:default
+    - trackerMET:default
+  binning:
+    min: 50
+    max: 500
+    step: 25
diff --git a/configs/V31/rate_plots/muons.yaml b/configs/V31/rate_plots/muons.yaml
@@ -0,0 +1,22 @@
+gmtMuonByRegion:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - gmtMuon:default:barrel
+    - gmtMuon:default:overlap
+    - gmtMuon:default:endcap
+  binning:
+    min: 0
+    max: 75
+    step: 3
+
+MuonRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - gmtMuon:default
+    - gmtTkMuon:default
+  binning:
+    min: 0
+    max: 75
+    step: 3
diff --git a/configs/V31/rate_plots/taus.yaml b/configs/V31/rate_plots/taus.yaml
@@ -0,0 +1,23 @@
+TauRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - nnTau:default
+    - caloTau:default
+  binning:
+    min: 10
+    max: 155
+    step: 5
+
+TauRatesByRegion:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - caloTau:default:barrel
+    - caloTau:default:endcap
+    - nnTau:default:barrel
+    - nnTau:default:endcap
+  binning:
+    min: 10
+    max: 155
+    step: 5
diff --git a/configs/V32nano/objects/jets.yaml b/configs/V32nano/objects/jets.yaml
@@ -68,17 +68,4 @@ L1puppiJetSC8:
     default:
       cuts:
         inclusive:
-          - "abs({eta}) < 7"
-
-# trackerJet:
-#   match_dR: 0.4
-#   label: "Tracker Jet"
-#   eta_ranges:
-#     inclusive: [0, 7]
-#     barrel: [0, 1.5]
-#     endcap: [1.5, 2.4]
-#   ids:
-#     default:
-#       cuts:
-#         inclusive:
-#           - "abs({eta}) < 7"
+          - "abs({eta}) < 7"