From bccf8c2ad46625bf27926c79fe60085d184637e4 Mon Sep 17 00:00:00 2001 From: Artur Lobanov Date: Mon, 14 Oct 2024 17:11:05 +0200 Subject: [PATCH] Config updates for 44 and 38 --- configs/V38nano/caching.yaml | 1 + .../object_performance/electron_iso.yaml | 2 +- .../object_performance/electron_matching.yaml | 2 + .../electron_matching_eta.yaml | 2 + .../object_performance/electron_trigger.yaml | 62 +------ .../object_performance/photons_matching.yaml | 164 ++++++++++++------ .../object_performance/photons_trigger.yaml | 4 +- configs/V38nano/objects/photons.yaml | 22 +++ configs/V38nano/rate_plots/eg.yaml | 1 + configs/V38nano_DT12x/rate_plots/eg.yaml | 39 +++++ configs/V38nano_DT12x/rate_plots/jets.yaml | 36 ++-- configs/V44nano/caching.yaml.bak | 98 ----------- .../object_performance/jets_trigger.yaml | 10 +- configs/V44nano/rate_plots/disp_ht_sig.yaml | 13 -- configs/V44nano/rate_plots/eg.yaml | 28 ++- configs/V44nano/rate_plots/jets.yaml | 36 ++-- configs/scaling_thresholds.yaml | 5 +- 17 files changed, 253 insertions(+), 272 deletions(-) delete mode 100644 configs/V44nano/caching.yaml.bak delete mode 100644 configs/V44nano/rate_plots/disp_ht_sig.yaml diff --git a/configs/V38nano/caching.yaml b/configs/V38nano/caching.yaml index 71867337..f8ff90b7 100644 --- 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 index ae00f6aa..32360906 100644 --- 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 index ca1a7155..971fa636 100644 --- 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 index 8d4d5094..563626b6 100644 --- 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 index fa83c998..d4390612 100644 --- 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 > $ 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 > $ 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 index 8814dc00..b8663f64 100644 --- 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 index 7981c9f5..e9eac458 100644 --- 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 index 12d51f0c..2565e821 100644 --- 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 index 44d6cb62..14cdcc9e 100644 --- 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 diff --git a/configs/V38nano_DT12x/rate_plots/eg.yaml b/configs/V38nano_DT12x/rate_plots/eg.yaml index becfac42..63489e05 100644 --- a/configs/V38nano_DT12x/rate_plots/eg.yaml +++ b/configs/V38nano_DT12x/rate_plots/eg.yaml @@ -1,3 +1,16 @@ +# EGRates: +# sample: MinBias +# version: V38nano_DT12x +# test_objects: +# - L1EG:default +# - L1tkElectron:NoIso +# - L1tkElectron:Iso +# - L1tkPhoton:Iso +# binning: +# min: 10 +# max: 97 +# step: 3 + EGRates: sample: MinBias version: V38nano_DT12x @@ -10,3 +23,29 @@ EGRates: min: 10 max: 97 step: 3 + +EG_NoIso_RatesByRegion: + sample: MinBias + version: V38nano_DT12x + test_objects: + - L1EG:default:barrel + - L1EG:default:endcap + - L1tkElectron:NoIso:barrel + - L1tkElectron:NoIso:endcap + binning: + min: 10 + max: 97 + step: 3 + +EG_Iso_RatesByRegion: + sample: MinBias + version: V38nano_DT12x + test_objects: + - L1tkElectron:Iso:barrel + - L1tkElectron:Iso:endcap + - L1tkPhoton:Iso:barrel + - L1tkPhoton:Iso:endcap + binning: + min: 10 + max: 97 + step: 3 \ No newline at end of file diff --git a/configs/V38nano_DT12x/rate_plots/jets.yaml b/configs/V38nano_DT12x/rate_plots/jets.yaml index 5f6a9c1d..b0e0139e 100644 --- a/configs/V38nano_DT12x/rate_plots/jets.yaml +++ b/configs/V38nano_DT12x/rate_plots/jets.yaml @@ -4,29 +4,29 @@ JetDefaultRates: test_objects: # - L1puppiJetHisto:default - L1puppiJetSC4:default - # - L1caloJet:default - # - L1TrackJet:default + - L1caloJet:default + - L1TrackJet:default binning: min: 40 max: 420 step: 20 -# JetsByRegion: -# sample: MinBias -# version: V38nano_DT12x -# test_objects: -# - L1puppiJetSC4:default:barrel -# - L1puppiJetSC4:default:endcap -# - L1puppiJetSC4:default:forward -# - L1caloJet:default:barrel -# - L1caloJet:default:endcap -# - L1caloJet:default:forward -# # - L1TrackJet:default:barrel -# # - L1TrackJet:default:endcap -# binning: -# min: 40 -# max: 420 -# step: 20 +JetsByRegion: + sample: MinBias + version: V38nano_DT12x + test_objects: + - L1puppiJetSC4:default:barrel + - L1puppiJetSC4:default:endcap + - L1puppiJetSC4:default:forward + - L1caloJet:default:barrel + - L1caloJet:default:endcap + - L1caloJet:default:forward + # - L1TrackJet:default:barrel + # - L1TrackJet:default:endcap + binning: + min: 40 + max: 420 + step: 20 JetExtendedRates: sample: MinBias diff --git a/configs/V44nano/caching.yaml.bak b/configs/V44nano/caching.yaml.bak deleted file mode 100644 index aa525035..00000000 --- a/configs/V44nano/caching.yaml.bak +++ /dev/null @@ -1,98 +0,0 @@ -V44nano: - Hgg: - ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/Spring24/141pre7/v43/GluGluHToGG_M-125_TuneCP5_14TeV-powheg-pythia8/Hto2gg_Spring24_200PU_V44_reL1wTT/*/0000/*.root - trees_branches: - Events: - GenPart: [pt, eta, phi, pdgId, statusFlags] - L1tkPhoton: "all" - L1EGbarrel: "all" - L1EGendcap: "all" - DYLL_M50: - ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/roward/phase2/menu/ntuples/Spring24/142pre1/v44DYToLL_M-50_TuneCP5_14TeV-pythia8/DY_M50_Spring24_200PU_V44_reL1wTT/*/0000/*.root - trees_branches: - Events: - GenPart: "all" - ## EG - L1tkElectron: "all" - L1EGbarrel: "all" - L1EGendcap: "all" - ## Muons - L1gmtTkMuon: "all" - L1gmtMuon: "all" - L1gmtDispMuon: "all" - ## TF Muons - L1MuonKMTF: "all" - L1MuonOMTF: "all" - L1MuonEMTF: "all" - L1DispMuonKMTF: "all" - L1DispMuonOMTF: "all" - L1DispMuonEMTF: "all" - TT: - ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/roward/phase2/menu/ntuples/Spring24/142pre1/v44TT_TuneCP5_14TeV-powheg-pythia8/TT_Spring24_200PU_V44_reL1wTT/*/0000/*.root - trees_branches: - Events: - # gen - GenJet: [pt, eta, phi, partonFlavour] - GenJetAK8: [pt, eta, phi] - GenMET: "all" - # # sums - L1puppiMET: [pt, phi] - L1puppiMLMET: [pt] - L1puppiJetSC4sums: [pt, phi] - L1puppiHistoJetSums: [pt, phi] - # # jets - L1puppiJetSC4: [pt, eta, phi] - L1puppiJetSC8: [pt, eta, phi] - L1puppiExtJetSC4: [pt, eta, phi, btagScore] - L1puppiJetHisto: [pt, eta, phi] - L1caloJet: [pt, eta, phi] - L1TrackMET: [pt] - L1TrackHT: [ht, mht] - L1TrackJet: [pt, eta, phi] - VBFHToTauTau: - ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/roward/phase2/menu/ntuples/Spring24/142pre1/v44VBF_HToTauTau_M-125_TuneCP5_14TeV-powheg-pythia8/VBFHtoTaus_Spring24_200PU_V44_reL1wTT/*/0000/*.root - trees_branches: - Events: - GenPart: [pt, eta, phi, pdgId, statusFlags] - GenVisTau: "all" - L1nnPuppiTau: "all" - L1hpsTau: "all" - L1caloTau: "all" - L1nnCaloTau: "all" - # MinBias: - # ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/14X/v38/MinBias_TuneCP5_14TeV-pythia8/MinBias_131_L1Fix_IBv9_wTT/*/0000/*.root - # trees_branches: - # Events: - # # PV - # L1PV: [z0] - # ## EG - # L1tkPhoton: "all" - # L1tkElectron: "all" - # L1EGbarrel: "all" - # L1EGendcap: "all" - # ## MUONS - # L1gmtTkMuon: "all" - # L1gmtMuon: "all" # aka gmtMuon - # L1gmtDispMuon: "all" - # ## TAUS - # L1nnPuppiTau: "all" - # L1hpsTau: "all" - # L1caloTau: "all" - # L1nnCaloTau: "all" - # ## MET/Sums - # L1puppiMET: [pt, phi] - # L1puppiMLMET: [pt] - # L1puppiJetSC4sums: [pt, phi] - # L1puppiHistoJetSums: [pt, phi] - # # # jets - # L1puppiJetSC4: [pt, eta, phi] - # L1puppiJetSC8: [pt, eta, phi] - # L1puppiExtJetSC4: [pt, eta, phi, btagScore] - # L1puppiJetHisto: [pt, eta, phi] - # L1caloJet: [pt, eta, phi] - # ## track-only - # L1TrackMET: [pt] - # L1TrackHT: [ht, mht] - # L1TrackJet: [pt, eta, phi] - # L1TrackTripletWord: [pt] - # L1ExtTrackHT: [ht] diff --git a/configs/V44nano/object_performance/jets_trigger.yaml b/configs/V44nano/object_performance/jets_trigger.yaml index 09083251..81a5a482 100644 --- a/configs/V44nano/object_performance/jets_trigger.yaml +++ b/configs/V44nano/object_performance/jets_trigger.yaml @@ -14,8 +14,8 @@ JetTurnonBarrel: test_objects: # L1puppiJetHisto:default:barrel: "pt" L1puppiJetSC4:default:barrel: "pt" - # L1caloJet:default:barrel: "pt" - # L1TrackJet:default:barrel: "pt" + L1caloJet:default:barrel: "pt" + L1TrackJet:default:barrel: "pt" thresholds: [50, 100] scalings: method: "naive" @@ -43,8 +43,8 @@ JetTurnonEndcap: test_objects: # L1puppiJetHisto:default:endcap: "pt" L1puppiJetSC4:default:endcap: "pt" - # L1caloJet:default:endcap: "pt" - # L1TrackJet:default:endcap: "pt" + L1caloJet:default:endcap: "pt" + L1TrackJet:default:endcap: "pt" thresholds: [50, 100] scalings: method: "naive" @@ -72,7 +72,7 @@ JetTurnonForward: test_objects: # L1puppiJetHisto:default:forward: "pt" L1puppiJetSC4:default:forward: "pt" - # L1caloJet:default:forward: "pt" + L1caloJet:default:forward: "pt" thresholds: [50, 100] scalings: method: "naive" diff --git a/configs/V44nano/rate_plots/disp_ht_sig.yaml b/configs/V44nano/rate_plots/disp_ht_sig.yaml deleted file mode 100644 index 1505d09f..00000000 --- a/configs/V44nano/rate_plots/disp_ht_sig.yaml +++ /dev/null @@ -1,13 +0,0 @@ - -DispHTRates_Signal: - sample: HtoLLPto4B_M125_Phi60_ctau100 - version: V44nano - test_objects: - # - L1puppiHistoJetSums:HT - - L1puppiJetSC4sums:HT - - L1TrackHT:HT - - L1ExtTrackHT:HT - binning: - min: 50 - max: 975 - step: 25 diff --git a/configs/V44nano/rate_plots/eg.yaml b/configs/V44nano/rate_plots/eg.yaml index 9bf44994..03f55f9e 100644 --- a/configs/V44nano/rate_plots/eg.yaml +++ b/configs/V44nano/rate_plots/eg.yaml @@ -1,11 +1,37 @@ EGRates: sample: MinBias - version: V33nano + version: V44nano test_objects: - L1EG:default - L1tkElectron:NoIso - L1tkElectron:Iso - L1tkPhoton:Iso + binning: + min: 10 + max: 97 + step: 3 + +EG_NoIso_RatesByRegion: + sample: MinBias + version: V44nano + test_objects: + - L1EG:default:barrel + - L1EG:default:endcap + - L1tkElectron:NoIso:barrel + - L1tkElectron:NoIso:endcap + binning: + min: 10 + max: 97 + step: 3 + +EG_Iso_RatesByRegion: + sample: MinBias + version: V44nano + test_objects: + - L1tkElectron:Iso:barrel + - L1tkElectron:Iso:endcap + - L1tkPhoton:Iso:barrel + - L1tkPhoton:Iso:endcap binning: min: 10 max: 97 diff --git a/configs/V44nano/rate_plots/jets.yaml b/configs/V44nano/rate_plots/jets.yaml index bad7ae0d..932bb4eb 100644 --- a/configs/V44nano/rate_plots/jets.yaml +++ b/configs/V44nano/rate_plots/jets.yaml @@ -4,29 +4,29 @@ JetDefaultRates: test_objects: # - L1puppiJetHisto:default - L1puppiJetSC4:default - # - L1caloJet:default - # - L1TrackJet:default + - L1caloJet:default + - L1TrackJet:default binning: min: 40 max: 420 step: 20 -# JetsByRegion: -# sample: MinBias -# version: V44nano -# test_objects: -# - L1puppiJetSC4:default:barrel -# - L1puppiJetSC4:default:endcap -# - L1puppiJetSC4:default:forward -# - L1caloJet:default:barrel -# - L1caloJet:default:endcap -# - L1caloJet:default:forward -# # - L1TrackJet:default:barrel -# # - L1TrackJet:default:endcap -# binning: -# min: 40 -# max: 420 -# step: 20 +JetsByRegion: + sample: MinBias + version: V44nano + test_objects: + - L1puppiJetSC4:default:barrel + - L1puppiJetSC4:default:endcap + - L1puppiJetSC4:default:forward + - L1caloJet:default:barrel + - L1caloJet:default:endcap + - L1caloJet:default:forward + # - L1TrackJet:default:barrel + # - L1TrackJet:default:endcap + binning: + min: 40 + max: 420 + step: 20 JetExtendedRates: sample: MinBias diff --git a/configs/scaling_thresholds.yaml b/configs/scaling_thresholds.yaml index 75535cd4..51bb363d 100644 --- a/configs/scaling_thresholds.yaml +++ b/configs/scaling_thresholds.yaml @@ -1,9 +1,10 @@ ### General Values # Jet: [50, 100, 150] -Jet: [25, 30, 35, 40, 45, 50, 55, 60, 70, 75, 80, 85, 90, 100, 120, 125, 130, 140, 150, 175] +# Jet: [25, 30, 35, 40, 45, 50, 55, 60, 70, 75, 80, 85, 90, 100, 120, 125, 130, 140, 150, 175] +Jet: [30, 40, 50, 70, 90, 120, 150, 175] Muon: [7, 9, 10, 12, 14, 15, 17, 20, 26, 25, 27, 30] Tau: [27, 30, 40, 50, 60, 70] -EG: [7, 9, 12, 14, 15, 20, 25, 30, 40, 50] +EG: [7, 9, 12, 15, 20, 25, 30, 40, 50] MET: [30, 40, 50, 60, 70, 80, 90, 100] MHT: [70, 80, 90, 100, 125] HT: [50, 100, 150, 200, 250, 300]