From e94e3493447f1e3b4595b86d407c3f0596902ac1 Mon Sep 17 00:00:00 2001 From: Artur Lobanov Date: Tue, 23 Jul 2024 16:17:03 +0200 Subject: [PATCH 1/2] updates for v32 --- configs/V32nano/caching.yaml | 5 +++-- configs/V32nano/object_performance/jets_trigger.yaml | 12 ++++++------ .../object_performance/muon_matching_eta.yaml | 4 ++-- configs/V32nano/object_performance/tau_matching.yaml | 12 ++++++------ 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/configs/V32nano/caching.yaml b/configs/V32nano/caching.yaml index dbfe1d63..c0892fe3 100644 --- a/configs/V32nano/caching.yaml +++ b/configs/V32nano/caching.yaml @@ -40,9 +40,10 @@ V32nano: Events: GenVisTau: "all" L1nnTau: "all" - L1hpsTau: "all" + L1GTnnTau: "all" + # L1hpsTau: "all" L1caloTau: "all" - L1nnCaloTau: "all" + # L1nnCaloTau: "all" MinBias: ntuple_path: trees_branches: diff --git a/configs/V32nano/object_performance/jets_trigger.yaml b/configs/V32nano/object_performance/jets_trigger.yaml index fe56ec22..b097d7ca 100644 --- a/configs/V32nano/object_performance/jets_trigger.yaml +++ b/configs/V32nano/object_performance/jets_trigger.yaml @@ -17,9 +17,9 @@ JetTurnonBarrel: L1caloJet:default: "pt" # trackerJet:default:barrel: "pt" thresholds: [50, 100] - scalings: - method: "naive" - threshold: 0.95 + # scalings: + # method: "naive" + # threshold: 0.95 xlabel: "Gen. $p_T$ (GeV)" ylabel: "Trigger Efficiency ( GeV, barrel)" binning: @@ -46,9 +46,9 @@ JetTurnonEndcap: L1caloJet:default: "pt" # trackerJet:default:endcap: "pt" thresholds: [50, 100] - scalings: - method: "naive" - threshold: 0.95 + # scalings: + # method: "naive" + # threshold: 0.95 xlabel: "Gen. $p_T$ (GeV)" ylabel: "Trigger Efficiency ( GeV, endcap)" binning: diff --git a/configs/V32nano/object_performance/muon_matching_eta.yaml b/configs/V32nano/object_performance/muon_matching_eta.yaml index 0d3d4418..8b155842 100644 --- a/configs/V32nano/object_performance/muon_matching_eta.yaml +++ b/configs/V32nano/object_performance/muon_matching_eta.yaml @@ -1,4 +1,4 @@ -MuonsMatching_Eta_pt2to5: +MuonsMatching_Eta_Pt2to5: sample: DYLL_M50 version: V32nano match_test_to_ref: True @@ -24,7 +24,7 @@ MuonsMatching_Eta_pt2to5: max: 3 step: 0.2 -MuonsMatching_Eta_pt15toInf: +MuonsMatching_Eta_Pt15toInf: sample: DYLL_M50 version: V32nano match_test_to_ref: True diff --git a/configs/V32nano/object_performance/tau_matching.yaml b/configs/V32nano/object_performance/tau_matching.yaml index d4c7700c..d118268e 100644 --- a/configs/V32nano/object_performance/tau_matching.yaml +++ b/configs/V32nano/object_performance/tau_matching.yaml @@ -14,10 +14,10 @@ TausMatchingBarrel: - "abs({eta}) < 2.4" test_objects: L1nnTau:default: "pt" - L1hpsTau:default: "pt" + # L1hpsTau:default: "pt" L1caloTau:default: "pt" - L1nnCaloTau:default: "pt" - L1caloTau:PtGe20: "Pt" + # L1nnCaloTau:default: "pt" + # L1caloTau:PtGe20: "Pt" xlabel: "Gen. $p_T$ (GeV)" ylabel: "Matching Efficiency (Barrel)" binning: @@ -41,10 +41,10 @@ TausMatchingEndcap: - "abs({eta}) < 2.4" test_objects: L1nnTau:default: "pt" - L1hpsTau:default: "pt" + # L1hpsTau:default: "pt" L1caloTau:default: "pt" - L1nnCaloTau:default: "pt" - L1caloTau:PtGe20: "Pt" + # L1nnCaloTau:default: "pt" + # L1caloTau:PtGe20: "Pt" xlabel: "Gen. $p_T$ (GeV)" ylabel: "Matching Efficiency (Endcap)" binning: From 39c43d250a56188f5ae3f2fe5471fbbe301bb5be Mon Sep 17 00:00:00 2001 From: Artur Lobanov Date: Thu, 29 Aug 2024 13:07:03 +0200 Subject: [PATCH 2/2] Fix tkElectron ID for nano configs --- configs/V32/objects/electrons.yaml | 5 +++-- configs/V32nano/objects/electrons.yaml | 5 ++++- configs/V33nano/objects/electrons.yaml | 5 ++++- configs/V34nano/objects/electrons.yaml | 5 ++++- configs/V35nano_ModTT/objects/electrons.yaml | 5 ++++- configs/V36nano_noTT/objects/electrons.yaml | 5 ++++- configs/V37nano/objects/electrons.yaml | 5 ++++- configs/V38nano/objects/electrons.yaml | 5 ++++- configs/V38nano_DT12x/objects/electrons.yaml | 5 ++++- 9 files changed, 35 insertions(+), 10 deletions(-) diff --git a/configs/V32/objects/electrons.yaml b/configs/V32/objects/electrons.yaml index 7580e86e..98709089 100644 --- a/configs/V32/objects/electrons.yaml +++ b/configs/V32/objects/electrons.yaml @@ -28,8 +28,10 @@ tkElectron: cuts: inclusive: - "abs({eta}) < 2.7" - barrel: + endcap: - "({passeseleid} == 1) | ({pt} < 25)" + barrel: + - "{passeseleid} == 1" Iso: label: "TkIsoElectron" cuts: @@ -37,7 +39,6 @@ tkElectron: - "abs({eta}) < 2.4" barrel: - "abs({trkiso}) < 0.13" - - "({passeseleid} == 1) | ({pt} < 25)" endcap: - "abs({trkiso}) < 0.28" IsoNoIDinEE: diff --git a/configs/V32nano/objects/electrons.yaml b/configs/V32nano/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V32nano/objects/electrons.yaml +++ b/configs/V32nano/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: diff --git a/configs/V33nano/objects/electrons.yaml b/configs/V33nano/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V33nano/objects/electrons.yaml +++ b/configs/V33nano/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: diff --git a/configs/V34nano/objects/electrons.yaml b/configs/V34nano/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V34nano/objects/electrons.yaml +++ b/configs/V34nano/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: diff --git a/configs/V35nano_ModTT/objects/electrons.yaml b/configs/V35nano_ModTT/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V35nano_ModTT/objects/electrons.yaml +++ b/configs/V35nano_ModTT/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: diff --git a/configs/V36nano_noTT/objects/electrons.yaml b/configs/V36nano_noTT/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V36nano_noTT/objects/electrons.yaml +++ b/configs/V36nano_noTT/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: diff --git a/configs/V37nano/objects/electrons.yaml b/configs/V37nano/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V37nano/objects/electrons.yaml +++ b/configs/V37nano/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: diff --git a/configs/V38nano/objects/electrons.yaml b/configs/V38nano/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V38nano/objects/electrons.yaml +++ b/configs/V38nano/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: diff --git a/configs/V38nano_DT12x/objects/electrons.yaml b/configs/V38nano_DT12x/objects/electrons.yaml index d96a7f7d..cfacf196 100644 --- a/configs/V38nano_DT12x/objects/electrons.yaml +++ b/configs/V38nano_DT12x/objects/electrons.yaml @@ -10,14 +10,17 @@ L1tkElectron: cuts: inclusive: - "abs({eta}) < 2.4" + endcap: - "({eleId} == 1) | ({pt} < 25)" + barrel: + - "{eleId} == 1" NoIsoForIso: # This id is exclusively used for the # isoloation wp derivation label: "TkElectron, no ID" cuts: inclusive: - - "abs({eta}) < 2.7" + - "abs({eta}) < 2.4" Iso: label: "TkIsoElectron" cuts: