Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add L1Nano compatibility and first configs for 14x release validation #65

Merged
merged 52 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
c0fc08f
Remove all_rate config
artlbv Mar 1, 2024
73fb42e
Add L1nano compatability to caching and utils
artlbv Feb 6, 2024
61b01e6
Add first V32 nano configs for ele and muons
artlbv Feb 6, 2024
51445e8
Add V31 and V32 menu ntuple configs
artlbv Feb 6, 2024
ee29be2
Add local index for sums in nano to separate HT and MHT
artlbv Feb 8, 2024
e24ce36
Add configs for V32 and V32nano
artlbv Feb 8, 2024
6472b16
Update bjet compare plot for v32nano
artlbv Feb 8, 2024
450d429
Ad v32nano jet config
artlbv Feb 8, 2024
6e667c3
Add Taus for V32/nano
artlbv Feb 8, 2024
fb0c4d1
Fix version in 31 tau configs
artlbv Feb 9, 2024
06e9af2
Add v32nano tau object config
artlbv Feb 9, 2024
8dd1ef6
Update object configs for new/updated objects
EmyrClement Feb 23, 2024
a202750
Update caching config
EmyrClement Feb 23, 2024
0c90231
Add SC8 to jet matching and trigger configs.
EmyrClement Feb 23, 2024
b8837e9
Add new tau objects to performance config, update trigger config to n…
EmyrClement Feb 23, 2024
bfa1419
Add comment for optional scalings for SC8
EmyrClement Feb 23, 2024
62d2441
Update rate tools to work with nano
EmyrClement Feb 23, 2024
d6ef8c6
Add rate config
EmyrClement Feb 23, 2024
3431f0f
Adaptations for nano for iso plot
artlbv Feb 22, 2024
14218c0
Add OMTF ID to muons in v29 for checks
artlbv Feb 22, 2024
4c044fc
Update rate config for v29
artlbv Feb 22, 2024
e84b14a
Updates for V32 configs
artlbv Feb 22, 2024
8bd87f9
Script to merge arrays e.g. barrel and endcap EG
artlbv Feb 22, 2024
90b9cd9
Make lower eta range cut inclusive
artlbv Feb 27, 2024
5566bde
Fix all branch loading
artlbv Feb 27, 2024
c0d8e9a
Fixes for reading MET in nano
artlbv Feb 27, 2024
b132859
Add pt cut in EG merge script
artlbv Feb 27, 2024
81a82d0
Update for Jet/Sums in V32
artlbv Feb 27, 2024
2037f50
Updates for V32nano incl sums
artlbv Feb 27, 2024
cdf5f7f
clean print for debug
artlbv Feb 27, 2024
3737c75
Add V33 configs
artlbv Feb 27, 2024
99afacd
More updates for v33 configs
artlbv Feb 27, 2024
4bad179
Add tkJets for v33
artlbv Feb 27, 2024
36140d6
Fix order of cut application : first on test then on ref. Fixes Sums
artlbv Feb 28, 2024
57c2308
Fixes for sums
artlbv Feb 28, 2024
2c7b6de
Fix getting all branches for nano
artlbv Feb 28, 2024
11787e7
Updateing taus from v32 in v33
artlbv Feb 28, 2024
65bebc0
Add HACK for TrackerHT rate plots
artlbv Mar 3, 2024
ad61d67
Update v33 configs with new objects etc
artlbv Mar 3, 2024
a750599
Add fake eta for sums in utils/objects
artlbv Mar 4, 2024
23299d0
update v31 caching
artlbv Mar 4, 2024
b1ee39f
Move process out of file read function
artlbv Mar 4, 2024
4f07f07
Black formatting changes
artlbv Mar 4, 2024
f68f3f3
move compare configs for v31
artlbv Mar 6, 2024
55c618e
Plot L1EG in v33
artlbv Mar 6, 2024
2aaf9a0
Add caloJets to V31 configs
artlbv Mar 6, 2024
7be0baf
Use barrel/endcap/forward regions when deriving scalings for calo jets
EmyrClement Mar 7, 2024
245f87d
Add barrel/endcap/forward regions to calo jet config
EmyrClement Mar 7, 2024
c92303a
Clean up configs
artlbv Mar 12, 2024
aa94d82
Merge pull request #2 from EmyrClement/patch-1
artlbv Mar 12, 2024
f293224
Merge branch 'cms-l1-dpg:dev_nano_14x_rebase_mai' into dev_nano_14x_r…
artlbv Mar 13, 2024
4189d89
Merge pull request #66 from artlbv/dev_nano_14x_rebase_mai
artlbv Mar 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ rates/table/rates_tables/*
outputs
menu_tools.egg-info
dist
ph2-menu-tools
prod_ph2-menu-tools
dev_ph2-menu-tools
1 change: 1 addition & 0 deletions configs/V29/object_performance/muon_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ MuonsMatchingOverlap:
- "abs({eta}) < 1.24"
test_objects:
gmtMuon:default:overlap: "Pt"
gmtMuon:oldRateID:overlap: "Pt"
gmtTkMuon:default:overlap: "Pt"
xlabel: "Gen. $p_T$ (GeV)"
ylabel: "Matching Efficiency (overlap)"
Expand Down
1 change: 1 addition & 0 deletions configs/V29/object_performance/muon_matching_eta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ MuonsMatching_Eta_Pt15toInf:
- "abs({eta}) < 2.4"
test_objects:
gmtMuon:default: "Eta"
gmtMuon:oldRateID: "Eta"
gmtTkMuon:default: "Eta"
xlabel: "Gen. $\\eta$"
ylabel: "Matching Efficiency (>15 GeV)"
Expand Down
10 changes: 10 additions & 0 deletions configs/V29/objects/electrons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ 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
Expand Down
4 changes: 3 additions & 1 deletion configs/V29/objects/muons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ gmtMuon:
overlap: [0.83, 1.24]
endcap: [1.24, 2.4]
ids:
default:
default: {}
oldRateID:
label: "GMT Muon, Qual>=12 in OMTF"
cuts:
overlap:
- "{quality} >= 12"
Expand Down
59 changes: 59 additions & 0 deletions configs/V29/rate_plots/all_rate_plots.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# HTRates:
# sample: MinBias
# version: V29
# test_objects:
# - phase1PuppiHT:default
# - seededConePuppiHT:default
# # - trackerJet:default
# binning:
# min: 40
# max: 420
# step: 20

# JetDefaultRates:
# sample: MinBias
# version: V29
# test_objects:
# - phase1PuppiJet:default
# - seededConePuppiJet:default
# # - trackerJet:default
# binning:
# min: 40
# max: 420
# step: 20

# ElectronDefaultRates:
# sample: MinBias
# version: V29
# test_objects:
# - EG:default
# - tkElectron:NoIso
# - tkElectron:Iso
# - tkPhoton:Iso
# binning:
# min: 10
# max: 97
# step: 3

MuonRates:
sample: MinBias
version: V29
test_objects:
- gmtMuon:default
- gmtMuon:oldRateID
- gmtTkMuon:default
binning:
min: 0
max: 75
step: 3

# TauRates:
# sample: MinBias
# version: V29
# test_objects:
# - nnTau:default
# - caloTau:default
# binning:
# min: 10
# max: 155
# step: 5
90 changes: 90 additions & 0 deletions configs/V31/caching.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
V31:
DYLL_M50:
ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/13X/v29/DYToLL_M-50_TuneCP5_14TeV-pythia8/DY_M50_1252_200PU_v29_13x_fixTkPhi/230822_121429/0000/L*.root
trees_branches:
genTree/L1GenTree:
part_mu: [Id, Stat, Pt, Eta, Phi]
part_e: [Id, Stat, Pt, Eta, Phi]
l1PhaseIITree/L1PhaseIITree:
tkElectron: [Pt, Et, Eta, Phi, Chg, Bx, TrkIso, PfIso, PuppiIso, zVtx, HwQual, EGRefPt, EGRefEta, EGRefPhi, HGC, PassesEleID, PassesPhoID]
EG: [Pt, Et, Eta, Phi, Bx, Iso, HwQual, HGC, PassesEleID, PassesSaID]
gmtMuon: [Pt, Eta, Phi, Z0, D0, IPt, IEta, IPhi, IZ0, ID0, Chg, Iso, Qual, Beta, Bx]
gmtTkMuon: [Pt, Eta, Phi, Z0, D0, IPt, IEta, IPhi, IZ0, ID0, Chg, Iso, Qual, Beta, NStubs, Bx]
z0L1TkPV: "all"
TT:
ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/13X/v29/TT_TuneCP5_14TeV-powheg-pythia8/TT_131_200PU_v29_13x_fixTkPhi/230822_122619/0000/L*.root
trees_branches:
genTree/L1GenTree:
genMetTrue: "all"
jet: "all"
l1PhaseIITree/L1PhaseIITree:
puppiMET: "all"
phase1PuppiJet: "all"
phase1PuppiMHT: "all"
phase1PuppiHT: "all"
seededConePuppiJet: [Pt, Et, Eta, Phi]
seededConeExtendedPuppiJet: [Pt, Et, Eta, Phi, BJetNN]
seededConePuppiHT: "all"
seededConePuppiMHT: "all"
trackerJet: [Pt, Eta, Phi]
trackerMET: "all"
trackerMHT: "all"
trackerHT: "all"
# caloJet: "all"
caloJet: [Et, Pt, Eta, Phi]
## DEBUG
#tkElectron: [Pt, Et, Eta, Phi, Chg, Bx, TrkIso, PfIso, PuppiIso, zVtx, HwQual, EGRefPt, EGRefEta, EGRefPhi, HGC, PassesEleID, PassesPhoID]
#tkPhoton: [Pt, Et, Eta, Phi, Bx, TrkIso, HwQual, HGC, PassesEleID, PassesPhoID]
z0L1TkPV: "all"
VBFHToTauTau:
ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/13X/v29/VBFHToTauTau_M-125_TuneCP5_14TeV-powheg-pythia8/VBFHToTauTau_131_200PU_v29_13x_fixTkPhi/230822_122634/0000/L*.root
trees_branches:
genTree/L1GenTree:
part_tau: [Id, Stat, Pt, Eta, Phi, Parent, E]
l1PhaseIITree/L1PhaseIITree:
nnTau: [Et, Eta, Pt, Phi, FullIso, Z0, PassTightNN, Chg, DXY, PassLooseNN]
caloTau: [Et, Eta, Pt, Phi, Iso, HwQual, Bx]
HHToTauTau:
ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/13X/v29/GluGluToHHTo2B2Tau_node_SM_TuneCP5_14TeV-madgraph-pythia8/HHTo2B2Tau_131_200PU_v29_13x_fixTkPhi/230824_130354/0000/L*.root
trees_branches:
genTree/L1GenTree:
part_tau: [Id, Stat, Pt, Eta, Phi, Parent, E]
l1PhaseIITree/L1PhaseIITree:
nnTau: [Et, Eta, Pt, Phi, FullIso, Z0, PassTightNN, Chg, DXY, PassLooseNN]
caloTau: [Et, Eta, Pt, Phi, Iso, HwQual]
Hgg:
ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/13X/v29/GluGluHToGG_M-125_TuneCP5_14TeV-powheg-pythia8/GluGluHToGG_131_200PU_v29_13x_fixTkPhi/230822_122650/0000/L*.root
trees_branches:
genTree/L1GenTree:
part_gamma: [Id, Stat, Pt, Eta, Phi]
l1PhaseIITree/L1PhaseIITree:
tkPhoton: [Pt, Et, Eta, Phi, Bx, TrkIso, HwQual, HGC, PassesEleID, PassesPhoID, TrkIsoPV]
EG: [Pt, Et, Eta, Phi, Bx, Iso, HwQual, HGC, PassesEleID, PassesSaID]
MinBias:
ntuple_path: /eos/cms/store/group/dpg_trigger/comm_trigger/L1Trigger/alobanov/phase2/menu/ntuples/13X/v29/MinBias_TuneCP5_14TeV-pythia8/MinBias_131_v29_13x_fixTkPhi/230825_103803/M*.root
trees_branches:
l1PhaseIITree/L1PhaseIITree:
puppiMET: "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"


30 changes: 30 additions & 0 deletions configs/V31/object_performance/comparisons/bJetEff.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
BJetEff_Pt:
files:
JetMatching_Pt_Pt30ToInf_genBJets_-999_V31:
object: seededConeExtendedPuppiJet
dir: outputs/V31/turnons/
label: "Signal: Matched b-jets"
JetMatching_Pt_Pt30ToInf_genNotBJets_-999_V31:
object: seededConeExtendedPuppiJet
dir: outputs/V31/turnons/
label: "Background: Unmatched b-jets"
xlabel: "Gen. $p_T$ (GeV)"
ylabel: "Matching Efficiency"
watermark: "BJet_Pt"
save_dir: "outputs/V31/BJet/turnons"


BJetEff_Eta:
files:
JetMatching_Eta_Pt30ToInf_genBJets_-999_V31:
object: seededConeExtendedPuppiJet
dir: outputs/V31/turnons/
label: "Signal: Matched b-jets"
JetMatching_Eta_Pt30ToInf_genNotBJets_-999_V31:
object: seededConeExtendedPuppiJet
dir: outputs/V31/turnons/
label: "Background: Unmatched b-jets"
xlabel: "Gen. $\\eta$"
ylabel: "Matching Efficiency"
watermark: "BJet_Eta"
save_dir: "outputs/V31/BJet/turnons"
44 changes: 44 additions & 0 deletions configs/V31/object_performance/comparisons/version_comparison.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
V22_V31_GMTMuonsBarrel_Comparison:
files:
MuonsTrigger_20_V22:
object: gmtMuon
dir: outputs/V22/turnons/
label: "GMT Muon (V22)"
MuonsTrigger_20_V31:
object: gmtMuon
dir: outputs/V31/turnons/
label: "GMT Muon (V31)"
xlabel: "Gen. $p_T$ (GeV)"
ylabel: "Matching Efficiency (Barrel)"
watermark: "V22_V31_gmtMuonBarrel_Comp"
save_dir: "outputs/V22vs27/turnons"

V22_V31_ElectronsBarrel_Comparison:
files:
ElectronsTriggerBarrel_30_V22:
object: tkElectron
dir: outputs/V22/turnons/
label: "tkElectron (V22)"
ElectronsTriggerBarrel_30_V31:
object: tkElectron
dir: outputs/V31/turnons/
label: "tkElectron (V31)"
xlabel: "Gen. $p_T$ (GeV)"
ylabel: "Matching Efficiency (Barrel)"
watermark: "V22_V31_EGBarrel_Comp"
save_dir: "outputs/V22vs27/turnons"

V22_V31_GMTtkMuonsBarrel_Comparison:
files:
MuonsTrigger_20_V22:
object: gmtMuon
dir: outputs/V22/turnons/
label: "GMT tkMuon (V22)"
MuonsTrigger_20_V31:
object: gmtMuon
dir: outputs/V31/turnons/
label: "GMT tkMuon (V31)"
xlabel: "Gen. $p_T$ (GeV)"
ylabel: "Matching Efficiency (Barrel)"
watermark: "V22_V31_gmtTkMuonBarrel_Comp"
save_dir: "outputs/V22vs27/turnons"
48 changes: 48 additions & 0 deletions configs/V31/object_performance/electron_iso.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
ElectronsIsolation_Barrel:
sample: DYLL_M50
version: V31
match_test_to_ref: True
iso_vs_efficiency: True
reference_object:
object: "part_e"
x_arg: "Pt"
label: "Gen Electrons"
cuts:
event:
- "{dr_0.3} < 0.15"
- "abs({eta}) < 1.479"
object:
- "abs({eta}) < 1.479"
test_objects:
tkElectron:NoIso: "trkiso"
xlabel: "Isolation"
ylabel: "Efficiency (Barrel)"
binning:
min: 0
max: 0.5
step: 0.005

ElectronsIsolation_Endcap:
sample: DYLL_M50
version: V31
match_test_to_ref: True
iso_vs_efficiency: True
reference_object:
object: "part_e"
x_arg: "Pt"
label: "Gen Electrons"
cuts:
event:
- "{dr_0.3} < 0.15"
- "abs({eta}) > 1.479"
object:
- "abs({eta}) < 2.4"
test_objects:
tkElectron:NoIsoForIso: "trkiso"
xlabel: "Isolation"
ylabel: "Efficiency (Endcap)"
binning:
min: 0
max: 0.5
step: 0.005

49 changes: 49 additions & 0 deletions configs/V31/object_performance/electron_matching.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
ElectronsMatchingBarrel:
sample: DYLL_M50
version: V31
match_test_to_ref: True
reference_object:
object: "part_e"
x_arg: "Pt"
label: "Gen Electrons"
cuts:
event:
- "{dr_0.3} < 0.15"
- "abs({eta}) < 1.5"
object:
- "abs({eta}) < 2.4"
test_objects:
EG:default: "Pt"
tkElectron:NoIso: "Pt"
tkElectron:Iso: "Pt"
xlabel: "Gen. $p_T$ (GeV)"
ylabel: "Matching Efficiency (Barrel)"
binning:
min: 0
max: 100
step: 3

ElectronsMatchingEndcap:
sample: DYLL_M50
version: V31
match_test_to_ref: True
reference_object:
object: "part_e"
x_arg: "Pt"
label: "Gen Electrons"
cuts:
event:
- "{dr_0.3} < 0.15"
- "abs({eta}) > 1.5"
object:
- "abs({eta}) < 2.4"
test_objects:
EG:default: "Pt"
tkElectron:NoIso: "Pt"
tkElectron:Iso: "Pt"
xlabel: "Gen. $p_T$ (GeV)"
ylabel: "Matching Efficiency (Endcap)"
binning:
min: 0
max: 100
step: 3
Loading
Loading