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

V36/37/38 development #70

Merged
merged 11 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ rates/table/out/*
rates/table/cache/**/*
rates/table/lib/*
rates/table/rates_tables/*
*.backup*
**/tmp/*
*~
outputs
menu_tools.egg-info
dist
Expand Down
8 changes: 4 additions & 4 deletions configs/V29/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions configs/V29_13X/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions configs/V30/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions configs/V31/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions configs/V31/objects/jets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions configs/V31/rate_plots/bjet.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
BJetRates:
sample: MinBias
version: V31
test_objects:
- seededConeExtendedPuppiJet:default
- seededConeExtendedPuppiJet:bjetnn
binning:
min: 40
max: 420
step: 20
15 changes: 15 additions & 0 deletions configs/V31/rate_plots/jets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -40,3 +51,7 @@ JetExtendedRates:
- seededConeExtendedPuppiJet:default:barrel
- seededConeExtendedPuppiJet:default:endcap
- seededConeExtendedPuppiJet:default:forward
binning:
min: 40
max: 420
step: 20
12 changes: 12 additions & 0 deletions configs/V31/rate_plots/muons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions configs/V32/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions configs/V32nano/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions configs/V33nano/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions configs/V34nano/object_performance/jets_matching.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading
Loading