diff --git a/configs/V31/caching.yaml b/configs/V31/caching.yaml index fdf7dec0..57d6c31a 100644 --- a/configs/V31/caching.yaml +++ b/configs/V31/caching.yaml @@ -73,6 +73,7 @@ V31: 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 ] diff --git a/configs/V31/object_performance/jets_trigger.yaml b/configs/V31/object_performance/jets_trigger.yaml index 64689056..58511967 100644 --- a/configs/V31/object_performance/jets_trigger.yaml +++ b/configs/V31/object_performance/jets_trigger.yaml @@ -14,7 +14,7 @@ JetTurnonBarrel: test_objects: phase1PuppiJet:default:barrel: "Pt" seededConePuppiJet:default:barrel: "Pt" - caloJet:default: "Pt" + caloJet:default:barrel: "Pt" trackerJet:default:barrel: "Pt" thresholds: [50, 100] scalings: @@ -43,7 +43,7 @@ JetTurnonEndcap: test_objects: phase1PuppiJet:default:endcap: "Pt" seededConePuppiJet:default:endcap: "Pt" - caloJet:default: "Pt" + caloJet:default:endcap: "Pt" trackerJet:default:endcap: "Pt" thresholds: [50, 100] scalings: @@ -72,7 +72,7 @@ JetTurnonForward: test_objects: phase1PuppiJet:default:forward: "Pt" seededConePuppiJet:default:forward: "Pt" - caloJet:default: "Pt" + caloJet:default:forward: "Pt" thresholds: [50, 100] scalings: method: "naive" diff --git a/configs/V31/object_performance/jets_trigger_fwd.yaml b/configs/V31/object_performance/jets_trigger_fwd.yaml index 1775d462..ce0a68a3 100644 --- a/configs/V31/object_performance/jets_trigger_fwd.yaml +++ b/configs/V31/object_performance/jets_trigger_fwd.yaml @@ -12,7 +12,7 @@ JetTurnonFwd_3p7to7: object: - "abs({eta}) < 7" test_objects: - phase1PuppiJet:default:forward: "Pt" + #phase1PuppiJet:default:forward: "Pt" seededConePuppiJet:default:forward: "Pt" thresholds: [50,100] scalings: diff --git a/configs/V31/object_performance/mht.yaml b/configs/V31/object_performance/mht.yaml index 4658ff01..c2bdac75 100644 --- a/configs/V31/object_performance/mht.yaml +++ b/configs/V31/object_performance/mht.yaml @@ -1,29 +1,3 @@ -MHT30_90perc: - sample: TT - version: V31 - reference_object: - object: "jet" - x_arg: "Pt" - label: "Gen MHT" - cuts: - object: - - "abs({eta}) < 2.4" - - "{pt} > 30" - trafo: "MHT" - test_objects: - phase1PuppiMHT:default: "et" - seededConePuppiMHT:default: "et" - thresholds: [70, 150] - scalings: - method: "naive" - threshold: 0.90 - xlabel: "Gen. MHT30 (GeV)" - ylabel: "Trigger Efficiency ( GeV)" - binning: - min: 0 - max: 500 - step: 20 - MHT30_50perc: sample: TT version: V31 @@ -40,7 +14,7 @@ MHT30_50perc: phase1PuppiMHT:default: "et" seededConePuppiMHT:default: "et" trackerMHT:default: "" - thresholds: [70, 150] + thresholds: [70] scalings: method: "naive" threshold: 0.50 diff --git a/configs/V31/objects/jets.yaml b/configs/V31/objects/jets.yaml index b2128853..38a787ca 100644 --- a/configs/V31/objects/jets.yaml +++ b/configs/V31/objects/jets.yaml @@ -3,6 +3,9 @@ caloJet: label: "Calo Jet" eta_ranges: inclusive: [0, 7] + barrel: [0, 1.5] + endcap: [1.5, 2.4] + forward: [2.4, 5] cuts: inclusive: - "abs({eta}) < 7" diff --git a/configs/V31/rate_plots/ht.yaml b/configs/V31/rate_plots/ht.yaml index fb652a7f..2a24a1bd 100644 --- a/configs/V31/rate_plots/ht.yaml +++ b/configs/V31/rate_plots/ht.yaml @@ -9,3 +9,15 @@ HTRates: min: 50 max: 975 step: 25 + +MHTRates: + sample: MinBias + version: V31 + test_objects: + - phase1PuppiMHT:default + - seededConePuppiMHT:default + - trackerMHT:default + binning: + min: 50 + max: 975 + step: 25 diff --git a/configs/V31/rate_plots/jets.yaml b/configs/V31/rate_plots/jets.yaml index 0cc482d3..8277fde3 100644 --- a/configs/V31/rate_plots/jets.yaml +++ b/configs/V31/rate_plots/jets.yaml @@ -6,7 +6,7 @@ JetDefaultRates: - seededConePuppiJet:default # - seededConeExtendedPuppiJet:default - trackerJet:default - # - caloJet:default + - caloJet:default binning: min: 40 max: 420