diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 3ab880a897b38177d558b6f71a8777065a569b35..3b8aa1ebb9efe44f299aee68ab27a434d68efb0c 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -975,6 +975,24 @@ HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRtt_L1EM22VHI: 7: 8 8: 8 9: 4 +HLT_e24_lhmedium_mu8noL1_L1EM22VHI: + eventCount: 2 + stepCounts: + 0: 5 + 1: 4 + 2: 4 + 3: 4 + 4: 4 + 5: 2 + 6: 2 + stepFeatures: + 0: 5 + 1: 6 + 2: 4 + 3: 4 + 4: 4 + 5: 2 + 6: 2 HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH: eventCount: 0 stepFeatures: @@ -1271,6 +1289,24 @@ HLT_e28_idperf_L1EM24VHI: 1: 7 2: 14 3: 7 +HLT_e28_lhmedium_mu8noL1_L1EM24VHI: + eventCount: 2 + stepCounts: + 0: 5 + 1: 4 + 2: 4 + 3: 4 + 4: 4 + 5: 2 + 6: 2 + stepFeatures: + 0: 5 + 1: 6 + 2: 4 + 3: 4 + 4: 4 + 5: 2 + 6: 2 HLT_e300_etcut_L1EM22VHI: eventCount: 0 HLT_e3_etcut1step_g5_etcut_L12EM3: @@ -1634,6 +1670,16 @@ HLT_g140_etcut_L1EM24VHI: eventCount: 0 HLT_g140_loose_L1EM22VHI: eventCount: 0 +HLT_g15_loose_2mu10_msonly_L12MU10: + eventCount: 0 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + stepFeatures: + 0: 1 + 1: 1 + 2: 3 HLT_g20_loose_L1EM15VH: eventCount: 6 stepCounts: @@ -1876,6 +1922,46 @@ HLT_g35_loose_mu15_mu2noL1_L1EM22VHI: 5: 2 6: 2 7: 1 +HLT_g35_loose_mu15_mu2noL1_L1EM24VHI: + eventCount: 0 + stepCounts: + 0: 2 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + 5: 2 + 6: 2 + 7: 1 + stepFeatures: + 0: 6 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + 5: 2 + 6: 2 + 7: 1 +HLT_g35_loose_mu18_L1EM22VHI: + eventCount: 1 + stepCounts: + 0: 2 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + 5: 1 + 6: 1 + 7: 1 + stepFeatures: + 0: 6 + 1: 2 + 2: 2 + 3: 2 + 4: 2 + 5: 1 + 6: 1 + 7: 1 HLT_g35_loose_mu18_L1EM24VHI: eventCount: 1 stepCounts: @@ -1910,6 +1996,16 @@ HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI: 0: 5 1: 5 2: 6 +HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI: + eventCount: 0 + stepCounts: + 0: 5 + 1: 5 + 2: 5 + stepFeatures: + 0: 5 + 1: 5 + 2: 6 HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI: eventCount: 0 stepCounts: @@ -1920,6 +2016,16 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI: 0: 5 1: 5 2: 6 +HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI: + eventCount: 0 + stepCounts: + 0: 5 + 1: 5 + 2: 5 + stepFeatures: + 0: 5 + 1: 5 + 2: 6 HLT_g3_loose_LArPEBHLT_L1EM3: eventCount: 0 HLT_g40_loose_LArPEBHLT_L1EM20VHI: diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 7d691a2efd1b8bbeffa54b4900cec31a03268d5a..56c384902214ac08635abf71454d273fd21c6316 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -531,6 +531,8 @@ HLT_e24_lhmedium_g25_medium_L12EM20VH: eventCount: 0 HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRtt_L1EM22VHI: eventCount: 0 +HLT_e24_lhmedium_mu8noL1_L1EM22VHI: + eventCount: 0 HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH: eventCount: 0 stepFeatures: @@ -614,6 +616,8 @@ HLT_e28_idperf_L1EM24VHI: 1: 1 2: 4 3: 1 +HLT_e28_lhmedium_mu8noL1_L1EM24VHI: + eventCount: 0 HLT_e300_etcut_L1EM22VHI: eventCount: 0 HLT_e3_etcut1step_g5_etcut_L12EM3: @@ -882,6 +886,8 @@ HLT_g140_etcut_L1EM24VHI: eventCount: 0 HLT_g140_loose_L1EM22VHI: eventCount: 0 +HLT_g15_loose_2mu10_msonly_L12MU10: + eventCount: 0 HLT_g20_loose_L1EM15VH: eventCount: 0 HLT_g20_loose_L1EM15VHI: @@ -940,14 +946,22 @@ HLT_g300_etcut_L1EM22VHI: eventCount: 0 HLT_g35_loose_mu15_mu2noL1_L1EM22VHI: eventCount: 0 +HLT_g35_loose_mu15_mu2noL1_L1EM24VHI: + eventCount: 0 +HLT_g35_loose_mu18_L1EM22VHI: + eventCount: 0 HLT_g35_loose_mu18_L1EM24VHI: eventCount: 0 HLT_g35_medium_g25_medium_L12EM20VH: eventCount: 0 HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI: eventCount: 0 +HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI: + eventCount: 0 HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI: eventCount: 0 +HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI: + eventCount: 0 HLT_g3_loose_LArPEBHLT_L1EM3: eventCount: 3 stepCounts: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 6b8067d6aaf4d29acd35af5ae2634804d1988eec..c2ecbd1f2ea3038511068e606a20746d423d861e 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -55,9 +55,6 @@ def setupMenu(): # ATR-20049 ChainProp(name='HLT_mu6_mu4_L12MU4', l1SeedThresholds=['MU4']*2, groups=MultiMuonGroup), - # in planned primary as an option - ChainProp(name='HLT_mu24_ivarmedium_L1MU20', groups=SingleMuonGroup, monGroups=['muonMon:shifter','idMon:t0']), - # Additional intermediate thresholds for validation comparisons to match with Physics_pp_v7_primaries menu ChainProp(name='HLT_mu24_mu10noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup), ChainProp(name="HLT_mu10_L1MU10", groups=SingleMuonGroup), @@ -563,33 +560,41 @@ def setupMenu(): TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [ # groups need to be properly assigned here later # Primary e-mu chains - ChainProp(name='HLT_e17_lhloose_mu14_L1EM15VH_MU10', l1SeedThresholds=['EM15VH','MU10'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_e12_lhloose_2mu10_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_2e12_lhloose_mu10_L12EM8VH_MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=EgammaMuonGroup), + ChainProp(name='HLT_e17_lhloose_mu14_L1EM15VH_MU10', l1SeedThresholds=['EM15VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_e12_lhloose_2mu10_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_2e12_lhloose_mu10_L12EM8VH_MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), # Primary g-mu chains - ChainProp(name='HLT_g25_medium_mu24_L1MU20',l1SeedThresholds=['EM15VH','MU20'], stream=[PhysicsStream], groups=EgammaMuonGroup), #ATR-22594 - ChainProp(name='HLT_g35_loose_mu18_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU10'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_2g10_loose_mu20_L1MU20', l1SeedThresholds=['EM7','MU20'], stream=[PhysicsStream], groups=EgammaMuonGroup), # unsure what EM seed should be + ChainProp(name='HLT_g25_medium_mu24_L1MU20',l1SeedThresholds=['EM15VH','MU20'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), #ATR-22594 + ChainProp(name='HLT_g35_loose_mu18_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_g35_loose_mu18_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_2g10_loose_mu20_L1MU20', l1SeedThresholds=['EM7','MU20'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), # unsure what EM seed should be + #LLP + ChainProp(name='HLT_g15_loose_2mu10_msonly_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), # Primary e-g chains: electron + photon stay in the same step - these need to be parallel merged! # test ChainProp(name='HLT_e3_etcut1step_g5_etcut_L12EM3',l1SeedThresholds=['EM3','EM3'], stream=[PhysicsStream], groups=MultiElectronGroup), # primaries - ChainProp(name='HLT_e24_lhmedium_g25_medium_L12EM20VH', l1SeedThresholds=['EM20VH','EM20VH'], stream=[PhysicsStream], groups=MultiElectronGroup), - ChainProp(name='HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH'], stream=[PhysicsStream], groups=MultiElectronGroup), # unsure about l1SeedThresholds + ChainProp(name='HLT_e24_lhmedium_g25_medium_L12EM20VH', l1SeedThresholds=['EM20VH','EM20VH'], stream=[PhysicsStream], groups=['Primary:Legacy']+MultiElectronGroup), + ChainProp(name='HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH'], stream=[PhysicsStream], groups=['Primary:Legacy']+MultiElectronGroup), # unsure about l1SeedThresholds # Test chains for muon + jet/MET merging/aligning ChainProp(name='HLT_mu6_xe30_mht_L1XE10', l1SeedThresholds=['MU6','XE10'], stream=[PhysicsStream], groups=MuonMETGroup), ChainProp(name='HLT_mu6_j45_nojcalib_L1J20', l1SeedThresholds=['MU6','J20'], stream=[PhysicsStream], groups=MuonJetGroup), #ATR-22107 - ChainProp(name='HLT_e26_lhmedium_mu8noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_e9_lhvloose_mu20_mu8noL1_L1MU20', l1SeedThresholds=['EM3','MU20','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup), - ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup), + ChainProp(name='HLT_e24_lhmedium_mu8noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup), + ChainProp(name='HLT_e26_lhmedium_mu8noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_e28_lhmedium_mu8noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_e9_lhvloose_mu20_mu8noL1_L1MU20', l1SeedThresholds=['EM3','MU20','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), + ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), # tau+X chains (ATR-21609) TODO: need T&P-like merging ChainProp(name='HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRtt_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU8'], stream=[PhysicsStream], groups=EgammaTauGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py index 2ee2aed4fa9d4c6e18059a877fa510f3767dd5a0..79caf375a2e4c8584571d2d3b1416105c91e07b7 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py @@ -60,7 +60,8 @@ def setupMenu(): ChainProp(name='HLT_2mu6_L12MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup), #Planned Primaries #-- 1 mu iso - ChainProp(name='HLT_mu26_ivarmedium_L1MU20', groups=['Primary']+SingleMuonGroup), + ChainProp(name='HLT_mu24_ivarmedium_L1MU20', groups=SingleMuonGroup), + ChainProp(name='HLT_mu26_ivarmedium_L1MU20', groups=['Primary']+SingleMuonGroup, monGroups=['muonMon:shifter','idMon:t0']), ChainProp(name='HLT_mu28_ivarmedium_L1MU20', groups=['Primary']+SingleMuonGroup), #-- 1 mu ChainProp(name='HLT_mu6_idperf_L1MU6', groups=SingleMuonGroup),