diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref index a281e726a8549dfcf31d762357b131568985881d..0b48bdbe5d1fe49172eb91fdf33646be96455d0f 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref @@ -1,3 +1,6 @@ +TrigSignatureMoniMT INFO HLT_2e12_lhloose_mu10_L12EM8VH_MU10 #2518246928 +TrigSignatureMoniMT INFO -- #2518246928 Events 1 1 0 0 0 0 0 0 0 0 - - - - 0 +TrigSignatureMoniMT INFO -- #2518246928 Features 0 0 0 0 0 0 0 0 - - - - TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292 TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - - - - - - - - 2 TrigSignatureMoniMT INFO -- #3136730292 Features 12 296 14 - - - - - - - - - @@ -13,6 +16,9 @@ TrigSignatureMoniMT INFO -- #1796849979 Features TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113 TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 20 20 20 - - - - - - - - - 20 TrigSignatureMoniMT INFO -- #2613484113 Features 342 3678 780 - - - - - - - - - +TrigSignatureMoniMT INFO HLT_2g10_loose_mu20_L1MU20 #3765708828 +TrigSignatureMoniMT INFO -- #3765708828 Events 8 8 1 1 1 0 0 0 0 0 - - - - 0 +TrigSignatureMoniMT INFO -- #3765708828 Features 2 2 6 0 0 0 0 0 - - - - TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM15VH #3837353071 TrigSignatureMoniMT INFO -- #3837353071 Events 2 2 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - - - - - - - - @@ -112,6 +118,9 @@ TrigSignatureMoniMT INFO -- #843341480 Features TrigSignatureMoniMT INFO HLT_cscmon_L1All #1000936179 TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - 20 TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - - +TrigSignatureMoniMT INFO HLT_e12_lhloose_2mu10_L12MU10 #4167710884 +TrigSignatureMoniMT INFO -- #4167710884 Events 3 3 0 0 0 0 0 0 0 0 - - - - 0 +TrigSignatureMoniMT INFO -- #4167710884 Features 0 0 0 0 0 0 0 0 - - - - TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710 TrigSignatureMoniMT INFO -- #3471067710 Events 6 6 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - - @@ -127,6 +136,12 @@ TrigSignatureMoniMT INFO -- #140779220 Features TrigSignatureMoniMT INFO HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3 #1784800924 TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - - +TrigSignatureMoniMT INFO HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH #2668628593 +TrigSignatureMoniMT INFO -- #2668628593 Events 2 2 0 0 0 0 - - - - - - - - 0 +TrigSignatureMoniMT INFO -- #2668628593 Features 0 0 0 0 - - - - - - - - +TrigSignatureMoniMT INFO HLT_e24_lhmedium_g25_medium_L12EM20VH #2785977835 +TrigSignatureMoniMT INFO -- #2785977835 Events 2 2 0 0 0 0 - - - - - - - - 0 +TrigSignatureMoniMT INFO -- #2785977835 Features 0 0 0 0 - - - - - - - - TrigSignatureMoniMT INFO HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH #9348946 TrigSignatureMoniMT INFO -- #9348946 Events 2 2 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - - @@ -220,6 +235,9 @@ TrigSignatureMoniMT INFO -- #3370790749 Features TrigSignatureMoniMT INFO HLT_g300_etcut_L1EM22VHI #310189774 TrigSignatureMoniMT INFO -- #310189774 Events 6 6 0 0 0 - - - - - - - - - 0 TrigSignatureMoniMT INFO -- #310189774 Features 0 0 0 - - - - - - - - - +TrigSignatureMoniMT INFO HLT_g35_loose_mu18_L1EM24VHI #3939387897 +TrigSignatureMoniMT INFO -- #3939387897 Events 6 6 2 2 2 2 2 1 1 1 - - - - 1 +TrigSignatureMoniMT INFO -- #3939387897 Features 2 2 4 2 2 1 1 1 - - - - TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722 TrigSignatureMoniMT INFO -- #1158879722 Events 2 2 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - - diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 0b92e9e37a2251423ca76fd46df831e5eaa5e6cb..12078902069a5a417a050565ace0bf884fd80c99 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -1,3 +1,6 @@ +TrigSignatureMoniMT INFO HLT_2e12_lhloose_mu10_L12EM8VH_MU10 #2518246928 +TrigSignatureMoniMT INFO -- #2518246928 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0 +TrigSignatureMoniMT INFO -- #2518246928 Features 0 0 0 0 0 0 0 0 - - - - TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292 TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - - - - - - - - - @@ -13,6 +16,9 @@ TrigSignatureMoniMT INFO -- #1796849979 Features TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113 TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 13 13 13 - - - - - - - - - 13 TrigSignatureMoniMT INFO -- #2613484113 Features 92 324 178 - - - - - - - - - +TrigSignatureMoniMT INFO HLT_2g10_loose_mu20_L1MU20 #3765708828 +TrigSignatureMoniMT INFO -- #3765708828 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0 +TrigSignatureMoniMT INFO -- #3765708828 Features 0 0 0 0 0 0 0 0 - - - - TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM15VH #3837353071 TrigSignatureMoniMT INFO -- #3837353071 Events 20 20 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - - - - - - - - @@ -112,6 +118,9 @@ TrigSignatureMoniMT INFO -- #843341480 Features TrigSignatureMoniMT INFO HLT_cscmon_L1All #1000936179 TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - 20 TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - - +TrigSignatureMoniMT INFO HLT_e12_lhloose_2mu10_L12MU10 #4167710884 +TrigSignatureMoniMT INFO -- #4167710884 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0 +TrigSignatureMoniMT INFO -- #4167710884 Features 0 0 0 0 0 0 0 0 - - - - TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710 TrigSignatureMoniMT INFO -- #3471067710 Events 20 20 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - - @@ -127,6 +136,12 @@ TrigSignatureMoniMT INFO -- #140779220 Features TrigSignatureMoniMT INFO HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3 #1784800924 TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - - +TrigSignatureMoniMT INFO HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH #2668628593 +TrigSignatureMoniMT INFO -- #2668628593 Events 20 20 0 0 0 0 - - - - - - - - 0 +TrigSignatureMoniMT INFO -- #2668628593 Features 0 0 0 0 - - - - - - - - +TrigSignatureMoniMT INFO HLT_e24_lhmedium_g25_medium_L12EM20VH #2785977835 +TrigSignatureMoniMT INFO -- #2785977835 Events 20 20 0 0 0 0 - - - - - - - - 0 +TrigSignatureMoniMT INFO -- #2785977835 Features 0 0 0 0 - - - - - - - - TrigSignatureMoniMT INFO HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH #9348946 TrigSignatureMoniMT INFO -- #9348946 Events 20 20 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - - @@ -220,6 +235,9 @@ TrigSignatureMoniMT INFO -- #3370790749 Features TrigSignatureMoniMT INFO HLT_g300_etcut_L1EM22VHI #310189774 TrigSignatureMoniMT INFO -- #310189774 Events 20 20 0 0 0 - - - - - - - - - 0 TrigSignatureMoniMT INFO -- #310189774 Features 0 0 0 - - - - - - - - - +TrigSignatureMoniMT INFO HLT_g35_loose_mu18_L1EM24VHI #3939387897 +TrigSignatureMoniMT INFO -- #3939387897 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0 +TrigSignatureMoniMT INFO -- #3939387897 Features 0 0 0 0 0 0 0 0 - - - - TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722 TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - - diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 78c615c0530f6e009ee429dc8fff65d9eb726be1..e63968bbf523d567fd43d33affedcef7e4974181 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -283,16 +283,24 @@ def setupMenu(): # Primary e-mu chains ChainProp(name='HLT_e17_lhloose_mu14_L1EM15VH_MU10', l1SeedThresholds=['EM15VH','MU10'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup), ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup), - # Test photon-muon chain (isolation is there to have different number of steps) + ChainProp(name='HLT_e12_lhloose_2mu10_L12MU10', l1SeedThresholds=['EM8VH','MU10'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup), + ChainProp(name='HLT_2e12_lhloose_mu10_L12EM8VH_MU10', l1SeedThresholds=['EM8VH','MU10'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup), + + # Primary g-mu chains ChainProp(name='HLT_g25_medium_mu24_ivarmedium_L1MU20',l1SeedThresholds=['EM15VH','MU20'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup), - - # electron + photon stay in the same step - these need to be parallel merged! + ChainProp(name='HLT_g35_loose_mu18_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU10'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup), + ChainProp(name='HLT_2g10_loose_mu20_L1MU20', l1SeedThresholds=['EM7','MU20'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup), # unsure what EM seed should be + + # 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'], mergingStrategy='parallel', stream=[PhysicsStream], groups=MultiElectronGroup), - + # primaries + ChainProp(name='HLT_e24_lhmedium_g25_medium_L12EM20VH', l1SeedThresholds=['EM20VH','EM20VH'], mergingStrategy='parallel', stream=[PhysicsStream], groups=MultiElectronGroup), + ChainProp(name='HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH'], mergingStrategy='parallel', stream=[PhysicsStream], groups=MultiElectronGroup), # unsure about l1SeedThresholds + # Test chains for muon + jet/MET merging/aligning ChainProp(name='HLT_mu6fast_xe30_mht_L1XE10', l1SeedThresholds=['MU6','XE10'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup), - ChainProp(name='HLT_mu6fast_j45_nojcalib_L1J20', l1SeedThresholds=['MU6','J20'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup), - + ChainProp(name='HLT_mu6fast_j45_nojcalib_L1J20', l1SeedThresholds=['MU6','J20'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup), ] TriggerFlags.HeavyIonSlice.signatures = TriggerFlags.HeavyIonSlice.signatures() + []