Merge pull request #70 from artlbv/v36_dev

V36/37 development
cms-l1-dpg · Apr 15, 2024 · e00925b · e00925b
2 parents d6b6001 + d037b3b
commit e00925b
Show file tree

Hide file tree

Showing 103 changed files with 5,488 additions and 166 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,9 @@ rates/table/out/*
 rates/table/cache/**/*
 rates/table/lib/*
 rates/table/rates_tables/*
+*.backup*
 **/tmp/*
+*~
 outputs
 menu_tools.egg-info
 dist

diff --git a/configs/V29/object_performance/jets_matching.yaml b/configs/V29/object_performance/jets_matching.yaml
@@ -14,7 +14,7 @@ JetMatchingForward_3p7to7:
   test_objects:
     caloJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 300
@@ -38,7 +38,7 @@ JetMatchingBarrel:
     seededConePuppiJet:default: "Pt"
     trackerJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -62,7 +62,7 @@ JetMatchingEndcap:
     seededConePuppiJet:default: "Pt"
     trackerJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -85,7 +85,7 @@ JetMatchingForward:
     phase1PuppiJet:default: "Pt"
     seededConePuppiJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500

diff --git a/configs/V29_13X/object_performance/jets_matching.yaml b/configs/V29_13X/object_performance/jets_matching.yaml
@@ -30,7 +30,7 @@ JetMatchingForward_3p7to7:
       cuts:
         - "abs({eta}) < 7"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 300
@@ -74,7 +74,7 @@ JetMatchingBarrel:
       cuts:
         - "abs({eta}) < 2.4"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -118,7 +118,7 @@ JetMatchingEndcap:
       cuts:
         - "abs({eta}) < 2.4"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -156,7 +156,7 @@ JetMatchingForward:
       cuts:
         - "abs({eta}) < 5"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500

diff --git a/configs/V30/object_performance/jets_matching.yaml b/configs/V30/object_performance/jets_matching.yaml
@@ -30,7 +30,7 @@ JetMatchingForward_3p7to7:
       cuts:
         - "abs({eta}) < 7"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 300
@@ -74,7 +74,7 @@ JetMatchingBarrel:
       cuts:
         - "abs({eta}) < 2.4"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -118,7 +118,7 @@ JetMatchingEndcap:
       cuts:
         - "abs({eta}) < 2.4"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -156,7 +156,7 @@ JetMatchingForward:
       cuts:
         - "abs({eta}) < 5"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500

diff --git a/configs/V31/object_performance/jets_matching.yaml b/configs/V31/object_performance/jets_matching.yaml
@@ -14,7 +14,7 @@ JetMatchingForward_3p7to7:
   test_objects:
     caloJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 300
@@ -39,7 +39,7 @@ JetMatchingBarrel:
     caloJet:default: "Pt"
     trackerJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -64,7 +64,7 @@ JetMatchingEndcap:
     caloJet:default: "Pt"
     trackerJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -88,7 +88,7 @@ JetMatchingForward:
     seededConePuppiJet:default: "Pt"
     caloJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500

diff --git a/configs/V31/objects/jets.yaml b/configs/V31/objects/jets.yaml
@@ -20,12 +20,16 @@ seededConeExtendedPuppiJet:
   label: "Seeded Cone Extended PuppiJet"
   eta_ranges:
     inclusive: [0, 7]
+    barrel: [0, 1.5]
+    endcap: [1.5, 2.4]
+    forward: [2.4, 5]
   ids:
     default:
       cuts:
         inclusive:
           - "abs({eta}) < 5"
     bjetnn:
+      label: "SC Extended PuppiJet, BtagScore > 0.71"
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"

diff --git a/configs/V31/rate_plots/bjet.yaml b/configs/V31/rate_plots/bjet.yaml
@@ -0,0 +1,10 @@
+BJetRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - seededConeExtendedPuppiJet:default
+    - seededConeExtendedPuppiJet:bjetnn
+  binning:
+    min: 40
+    max: 420
+    step: 20
diff --git a/configs/V31/rate_plots/jets.yaml b/configs/V31/rate_plots/jets.yaml
@@ -31,6 +31,17 @@ JetsByRegion:
     step: 20
 
 JetExtendedRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - seededConePuppiJet:default:inclusive
+    - seededConeExtendedPuppiJet:default:inclusive
+  binning:
+    min: 40
+    max: 420
+    step: 20
+
+JetExtendedRatesByRegion:
   sample: MinBias
   version: V31
   test_objects:
@@ -40,3 +51,7 @@ JetExtendedRates:
     - seededConeExtendedPuppiJet:default:barrel
     - seededConeExtendedPuppiJet:default:endcap
     - seededConeExtendedPuppiJet:default:forward
+  binning:
+    min: 40
+    max: 420
+    step: 20
diff --git a/configs/V31/rate_plots/muons.yaml b/configs/V31/rate_plots/muons.yaml
@@ -10,6 +10,18 @@ gmtMuonByRegion:
     max: 75
     step: 3
 
+gmtTkMuonByRegion:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - gmtTkMuon:default:barrel
+    - gmtTkMuon:default:overlap
+    - gmtTkMuon:default:endcap
+  binning:
+    min: 0
+    max: 75
+    step: 3
+
 MuonRates:
   sample: MinBias
   version: V31

diff --git a/configs/V32/object_performance/jets_matching.yaml b/configs/V32/object_performance/jets_matching.yaml
@@ -17,7 +17,7 @@ JetMatchingBarrel:
     caloJet:default: "Pt"
     # trackerJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -42,7 +42,7 @@ JetMatchingEndcap:
     caloJet:default: "Pt"
     # trackerJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -66,7 +66,7 @@ JetMatchingForward:
     seededConePuppiJet:default: "Pt"
     caloJet:default: "Pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500

diff --git a/configs/V32nano/object_performance/jets_matching.yaml b/configs/V32nano/object_performance/jets_matching.yaml
@@ -17,7 +17,7 @@ JetMatchingBarrel:
     L1caloJet:default: "pt"
     # trackerJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -42,7 +42,7 @@ JetMatchingEndcap:
     L1caloJet:default: "pt"
     # trackerJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -66,7 +66,7 @@ JetMatchingForward:
     L1puppiJetSC4:default: "pt"
     L1caloJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500
@@ -88,7 +88,7 @@ JetMatchingBarrelSC8:
   test_objects:
     L1puppiJetSC8:default:barrel: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -110,7 +110,7 @@ JetMatchingEndcapSC8:
   test_objects:
     L1puppiJetSC8:default:endcap: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500

diff --git a/configs/V33nano/object_performance/jets_matching.yaml b/configs/V33nano/object_performance/jets_matching.yaml
@@ -17,7 +17,7 @@ JetMatchingBarrel:
     L1caloJet:default: "pt"
     L1TrackJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -42,7 +42,7 @@ JetMatchingEndcap:
     L1caloJet:default: "pt"
     L1TrackJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -66,7 +66,7 @@ JetMatchingForward:
     L1puppiJetSC4:default: "pt"
     L1caloJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500
@@ -89,7 +89,7 @@ JetMatchingBarrelSC8:
   test_objects:
     L1puppiJetSC8:default:barrel: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -111,7 +111,7 @@ JetMatchingEndcapSC8:
   test_objects:
     L1puppiJetSC8:default:endcap: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500

diff --git a/configs/V34nano/object_performance/jets_matching.yaml b/configs/V34nano/object_performance/jets_matching.yaml
@@ -17,7 +17,7 @@ JetMatchingBarrel:
     L1caloJet:default: "pt"
     L1TrackJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -42,7 +42,7 @@ JetMatchingEndcap:
     L1caloJet:default: "pt"
     L1TrackJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500
@@ -66,7 +66,7 @@ JetMatchingForward:
     L1puppiJetSC4:default: "pt"
     L1caloJet:default: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
+  ylabel: "Matching Efficiency (forward)"
   binning:
     min: 0
     max: 500
@@ -89,7 +89,7 @@ JetMatchingBarrelSC8:
   test_objects:
     L1puppiJetSC8:default:barrel: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
+  ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
     max: 500
@@ -111,7 +111,7 @@ JetMatchingEndcapSC8:
   test_objects:
     L1puppiJetSC8:default:endcap: "pt"
   xlabel: "Gen. $p_T$ (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
+  ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
     max: 500