Merge pull request #69 from artlbv/v36_dev

AR24 preparations
cms-l1-dpg · Apr 4, 2024 · a082b48 · a082b48
2 parents eb64ee2 + 9cc09ab
commit a082b48
Show file tree

Hide file tree

Showing 126 changed files with 8,851 additions and 180 deletions.
diff --git a/configs/V29/object_performance/met_ht_mht.yaml b/configs/V29/object_performance/met_ht_mht.yaml
@@ -25,60 +25,6 @@ HT_90perc:
     max: 750
     step: 20
 
-HT_50perc:
-  sample: TT
-  version: V29
-  reference_object:
-    object: "jet"
-    x_arg: "Pt"
-    label: "Gen HT"
-    trafo: "HT"
-    cuts:
-       object:
-         - "abs({eta}) < 2.4"
-         - "{pt} > 30"
-  test_objects:
-    trackerHT:default: ""
-    phase1PuppiHT:default: ""
-    seededConePuppiHT:default: ""
-  thresholds: [350]
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  xlabel: "Gen. HT (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV)"
-  binning:
-    min: 0
-    max: 750
-    step: 20
-
-MHT_90perc:
-  sample: TT
-  version: V29
-  reference_object:
-    object: "jet"
-    x_arg: "Pt"
-    label: "Gen MHT"
-    cuts:
-      object:
-        - "abs({eta}) < 2.4"
-        - "{pt} > 30"
-    trafo: "MHT"
-  test_objects:
-    trackerMHT:default: ""
-    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
-
 MHT_50perc:
   sample: TT
   version: V29
@@ -126,24 +72,3 @@ MET_90perc:
     min: 0
     max: 500
     step: 20
-
-MET_50perc:
-  sample: TT
-  version: V29
-  reference_object:
-    object: "genMetTrue"
-    x_arg: ""
-    label: "Gen MET"
-  test_objects:
-    trackerMET:default: ""
-    puppiMET:default: "et"
-  thresholds: [150]
-  xlabel: "Gen. MET (GeV)"
-  ylabel: "Trigger Efficiency (<threshold> GeV)"
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  binning:
-    min: 0
-    max: 500
-    step: 20
diff --git a/configs/V29/objects/electrons.yaml b/configs/V29/objects/electrons.yaml
@@ -20,24 +20,22 @@ tkElectron:
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"
-          - "({passeseleid} == 1)"
+          #- "({passeseleid} == 1)"
+          - "({passeseleid} == 1)  | ({pt} < 25)"
     NoIsoForIso:
       # This id is exclusively used for the
       # isoloation wp derivation
-      label: "TkElectron id in barrel"
+      label: "TkElectron, no ID"
       cuts:
         inclusive:
           - "abs({eta}) < 2.7"
-        barrel:
-          - "({passeseleid} == 1)"
     Iso:
       label: "TkIsoElectron"
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"
         barrel:
           - "abs({trkiso}) < 0.13"
-          - "({passeseleid} == 1)"
         endcap:
           - "abs({trkiso}) < 0.28"
     NoIsoLowPt:
@@ -46,16 +44,6 @@ tkElectron:
         inclusive:
           - "abs({eta}) < 2.4"
           - "({passeseleid} == 1)  | ({pt} < 25)"
-    IsoNoIDinEE:
-      label: "TkIsoElectron"
-      cuts:
-        inclusive:
-          - "abs({eta}) < 2.4"
-        barrel:
-          - "abs({trkiso}) < 0.13"
-          - "({passeseleid} == 1) | ({pt} < 25)"
-        endcap:
-          - "abs({trkiso}) < 0.28"
 
 EG:
   match_dR: 0.2

diff --git a/configs/V29/objects/photons.yaml b/configs/V29/objects/photons.yaml
@@ -20,8 +20,8 @@ tkPhoton:
         inclusive:
           - "abs({eta}) < 2.4"
         barrel:
-          - "abs({trkiso}) < 0.2"
+          - "abs({trkiso}) < 0.25"
           - "{passeseleid} == 1"
         endcap:
-          - "abs({trkiso}) < 0.2"
+          - "abs({trkiso}) < 0.205"
           - "{passesphoid} == 1"
diff --git a/configs/V31/objects/electrons.yaml b/configs/V31/objects/electrons.yaml
@@ -20,36 +20,30 @@ tkElectron:
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"
-          - "({passeseleid} == 1) | ({pt} < 25)"
+          #- "({passeseleid} == 1)"
+          - "({passeseleid} == 1)  | ({pt} < 25)"
     NoIsoForIso:
       # This id is exclusively used for the
       # isoloation wp derivation
-      label: "TkElectron id in barrel"
+      label: "TkElectron, no ID"
       cuts:
         inclusive:
           - "abs({eta}) < 2.7"
-        barrel:
-          - "({passeseleid} == 1) | ({pt} < 25)"
     Iso:
       label: "TkIsoElectron"
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"
         barrel:
           - "abs({trkiso}) < 0.13"
-          - "({passeseleid} == 1) | ({pt} < 25)"
         endcap:
           - "abs({trkiso}) < 0.28"
-    IsoNoIDinEE:
-      label: "TkIsoElectron"
+    NoIsoLowPt:
+      label: "TkElectron, no ID for $p_T<25$"
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"
-        barrel:
-          - "abs({trkiso}) < 0.13"
-          - "({passeseleid} == 1) | ({pt} < 25)"
-        endcap:
-          - "abs({trkiso}) < 0.28"
+          - "({passeseleid} == 1)  | ({pt} < 25)"
 
 EG:
   match_dR: 0.2

diff --git a/configs/V31/objects/photons.yaml b/configs/V31/objects/photons.yaml
@@ -20,8 +20,8 @@ tkPhoton:
         inclusive:
           - "abs({eta}) < 2.4"
         barrel:
-          - "abs({trkiso}) < 0.2"
+          - "abs({trkiso}) < 0.25"
           - "{passeseleid} == 1"
         endcap:
-          - "abs({trkiso}) < 0.2"
+          - "abs({trkiso}) < 0.205"
           - "{passesphoid} == 1"
diff --git a/configs/V31/rate_plots/jets.yaml b/configs/V31/rate_plots/jets.yaml
@@ -18,10 +18,25 @@ JetsByRegion:
   test_objects:
     - phase1PuppiJet:default:barrel
     - phase1PuppiJet:default:endcap
+    - phase1PuppiJet:default:forward
     - seededConePuppiJet:default:barrel
     - seededConePuppiJet:default:endcap
+    - seededConePuppiJet:default:forward
+    - caloJet:default:barrel
+    - caloJet:default:endcap
+    - caloJet:default:forward
   binning:
     min: 40
     max: 420
     step: 20
 
+JetExtendedRates:
+  sample: MinBias
+  version: V31
+  test_objects:
+    - seededConePuppiJet:default:barrel
+    - seededConePuppiJet:default:endcap
+    - seededConePuppiJet:default:forward
+    - seededConeExtendedPuppiJet:default:barrel
+    - seededConeExtendedPuppiJet:default:endcap
+    - seededConeExtendedPuppiJet:default:forward
diff --git a/configs/V32/objects/photons.yaml b/configs/V32/objects/photons.yaml
@@ -20,8 +20,8 @@ tkPhoton:
         inclusive:
           - "abs({eta}) < 2.4"
         barrel:
-          - "abs({trkiso}) < 0.2"
+          - "abs({trkiso}) < 0.25"
           - "{passeseleid} == 1"
         endcap:
-          - "abs({trkiso}) < 0.2"
+          - "abs({trkiso}) < 0.205"
           - "{passesphoid} == 1"
diff --git a/configs/V32nano/object_performance/jets_matching_wBTag.yaml b/configs/V32nano/object_performance/jets_matching_wBTag.yaml
@@ -1,10 +1,10 @@
-JetMatching_Eta_pt40To100_ExtendedVsRegular:
+JetMatching_Eta_Pt40To100_ExtendedVsRegular:
   sample: TT
   version: V32nano
   match_test_to_ref: True
   reference_object: 
     object: "GenJet"
-    x_arg: "Eta"
+    x_arg: "eta"
     label: "Gen Jets"
     cuts:
       event:
@@ -13,45 +13,45 @@ JetMatching_Eta_pt40To100_ExtendedVsRegular:
       object:
         - "abs({eta}) < 5"
   test_objects:
-    L1puppiJetSC4:default: "Eta"
-    L1puppiExtJetSC4:default: "Eta"
+    L1puppiJetSC4:default: "eta"
+    L1puppiExtJetSC4:default: "eta"
   xlabel: "Gen. $\\eta$"
   ylabel: "Matching Efficiency (40-100 GeV)"
   binning:
     min: -5
     max: 5
     step: 0.25
 
-JetMatching_Eta_pt100ToInf_ExtendedVsRegular:
+JetMatching_Eta_Pt100ToInf_ExtendedVsRegular:
   sample: TT
   version: V32nano
   match_test_to_ref: True
   reference_object: 
     object: "GenJet"
-    x_arg: "Eta"
+    x_arg: "eta"
     label: "Gen Jets"
     cuts:
       event:
         - "{pt} > 100"
       object:
         - "abs({eta}) < 5"
   test_objects:
-    L1puppiJetSC4:default: "Eta"
-    L1puppiExtJetSC4:default: "Eta"
+    L1puppiJetSC4:default: "eta"
+    L1puppiExtJetSC4:default: "eta"
   xlabel: "Gen. $\\eta$"
   ylabel: "Matching Efficiency (>100 GeV)"
   binning:
     min: -5
     max: 5
     step: 0.25
 
-JetMatching_Eta_pt30ToInf_genBJets:
+JetMatching_Eta_Pt30ToInf_genBJets:
   sample: TT
   version: V32nano
   match_test_to_ref: True
   reference_object: 
     object: "GenJet"
-    x_arg: "Eta"
+    x_arg: "eta"
     label: "Gen Jets"
     cuts:
       event:
@@ -60,21 +60,21 @@ JetMatching_Eta_pt30ToInf_genBJets:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    L1puppiExtJetSC4:bjetnn: "Eta"
+    L1puppiExtJetSC4:bjetnn: "eta"
   xlabel: "Gen. $\\eta$"
   ylabel: "Matching Efficiency (>30 GeV)"
   binning:
     min: -2.4
     max: 2.4
     step: 0.25
 
-JetMatching_Eta_pt30ToInf_genNotBJets:
+JetMatching_Eta_Pt30ToInf_genNotBJets:
   sample: TT
   version: V32nano
   match_test_to_ref: True
   reference_object: 
     object: "GenJet"
-    x_arg: "Eta"
+    x_arg: "eta"
     label: "Gen Jets"
     cuts:
       event:
@@ -83,15 +83,15 @@ JetMatching_Eta_pt30ToInf_genNotBJets:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    L1puppiExtJetSC4:bjetnn: "Eta"
+    L1puppiExtJetSC4:bjetnn: "eta"
   xlabel: "Gen. $\\eta$"
   ylabel: "Matching Efficiency (>30 GeV)"
   binning:
     min: -2.4
     max: 2.4
     step: 0.25
 
-JetMatching_pt_pt30ToInf_genBJets:
+JetMatching_Pt_Pt30ToInf_genBJets:
   sample: TT
   version: V32nano
   match_test_to_ref: True
@@ -113,7 +113,7 @@ JetMatching_pt_pt30ToInf_genBJets:
     max: 200
     step: 10
 
-JetMatching_pt_pt30ToInf_genNotBJets:
+JetMatching_Pt_Pt30ToInf_genNotBJets:
   sample: TT
   version: V32nano
   match_test_to_ref: True