diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
index e0a0908c887275856578547bcee291ee5d1756f8..ba028fc21e5ccbc3dc3d34ccbb43d3018b540f78 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
@@ -152,7 +152,7 @@ HLTConfigSvc::initialize() {
dummyChains["HLT_mu50_L1MU20"] = "L1_MU20";
dummyChains["HLT_2mu14_L12MU10"] = "L1_2MU10";
dummyChains["HLT_j420_L1J100"] = "L1_J100";
- dummyChains["HLT_j260_320eta490_L1J75.31ETA49"] = "L1_J75.31ETA49";
+ dummyChains["HLT_j260_320eta490_L1J75_31ETA49"] = "L1_J75.31ETA49";
dummyChains["HLT_j460_a10r_L1J100"] = "L1_J100";
dummyChains["HLT_j460_a10_lcw_subjes_L1J100"] = "L1_J100";
dummyChains["HLT_j460_a10t_lcw_jes_L1J100"] = "L1_J100";
@@ -194,6 +194,18 @@ HLTConfigSvc::initialize() {
dummyChains["HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM"] = "L1_TAU12IM";
dummyChains["HLT_j35_gsc45_boffperf_split_L1J20"] = "L1_J20";
dummyChains["HLT_j35_gsc45_bmv2c1070_split_L1J20"] = "L1_J20";
+ dummyChains["HLT_xe30_cell_xe30_tcpufit_L1XE10"] = "L1_XE10";
+ dummyChains["HLT_mu60_0eta105_msonly_L1MU20"] = "L1_MU20";
+ dummyChains["HLT_3mu6_L13MU6"] = "L1_3MU6";
+ dummyChains["HLT_3mu6_msonly_L13MU6"] = "L1_3MU6";
+ dummyChains["HLT_4mu4_L14MU4"] = "L1_4MU4";
+ dummyChains["HLT_j175_gsc225_bmv2c1040_split_L1J100"] = "L1_J100";
+ dummyChains["HLT_j225_gsc275_bmv2c1060_split_L1J100"] = "L1_J100";
+ dummyChains["HLT_j225_gsc300_bmv2c1070_split_L1J100"] = "L1_J100";
+ dummyChains["HLT_j225_gsc360_bmv2c1077_split_L1J100"] = "L1_J100";
+ dummyChains["HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100"] = "L1_TAU100";
+ dummyChains["HLT_2mu10_bJpsimumu_L12MU10"] = "L1_2MU10";
+ dummyChains["HLT_2mu10_bUpsimumu_L12MU10"] = "L1_2MU10";
m_HLTFrame.setMergedHLT( m_setMergedHLT );
for (const auto& mapPair : dummyChains) {
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
index abde41835cee6f7e6409cfd6abdacf5161e74242..b35020146aaf62aa944a97b9baa17a7c53740082 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
@@ -45,6 +45,7 @@ trigMuonEFSAThresholds = {
'20GeV' : [ [0,1.05,1.5,2.0,9.9], [ 17.5, 18.5, 17.0, 18.0] ],
'22GeV' : [ [0,1.05,1.5,2.0,9.9], [ 19.1, 20.0, 18.4, 19.6] ],
'24GeV' : [ [0,1.05,1.5,2.0,9.9], [ 20.4, 20.8, 19.3, 21.0] ],
+ '26GeV' : [ [0,1.05,1.5,2.0,9.9], [ 21.6, 22.0, 21.2, 23.7] ], # not optimized
'30GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.0, 24.5, 23.0, 26.0] ],
'40GeV' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 32.5] ],
'40GeV_barrelOnly' : [ [0,1.05,1.5,2.0,9.9], [ 31.5,1000.0,1000.0,1000.0]],
@@ -144,6 +145,8 @@ muFastThresholds = {
'6GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 5.17, 3.25, 4.69, 5.14] ],
'8GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 6.63, 5.17, 6.39, 6.81] ],
'10GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 8.28, 6.35, 7.19, 8.58] ],
+ #not optimized: ATR-20049
+ '11GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 8.99, 6.62, 7.40, 9.32] ],
'13GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 10.42, 7.16, 7.81, 10.80] ],
'14GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 11.15, 7.58, 8.43, 11.61] ],
'15GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 11.31, 10.52, 12.00, 13.24] ],
@@ -155,6 +158,7 @@ muFastThresholds = {
'30GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 17.83, 18.32, 20.46, 23.73] ],
'36GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 23.94, 12.25, 19.80, 23.17] ],
'40GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
+ '50GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ], # lixia, not optimized
'60GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
'80GeV_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 29.54] ],
'40GeV_uptoEC2_v15a' : [ [0,1.05,1.5,2.0,9.9], [ 21.13, 21.20, 25.38, 1000.] ],
@@ -172,6 +176,8 @@ muFastThresholdsForECWeakBRegion = {
'6GeV_v15a' : [ 3.91, 2.22],
'8GeV_v15a' : [ 4.65, 3.26],
'10GeV_v15a' : [ 5.96, 4.24],
+ #not optimized: ATR-20049
+ '11GeV_v15a' : [ 6.19, 4.37],
'13GeV_v15a' : [ 6.65, 4.64],
'14GeV_v15a' : [ 6.78, 5.03],
'15GeV_v15a' : [ 7.61, 7.81 ],
@@ -183,6 +189,7 @@ muFastThresholdsForECWeakBRegion = {
'30GeV_v15a' : [ 14.41, 17.43 ],
'36GeV_v15a' : [ 10.78, 10.66],
'40GeV_v15a' : [ 15.07, 18.02 ],
+ '50GeV_v15a' : [ 15.07, 18.02 ], # lixia, not optimized
'60GeV_v15a' : [ 15.07, 18.02 ],
'80GeV_v15a' : [ 15.07, 18.02 ],
'40GeV_uptoEC2_v15a' : [ 15.07, 18.02 ],
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index ce45e482a204e163742c5a7afae1fd218e8a85b2..de8517bda162d2b62dcf2d45bb14eb620f8014a1 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -1,11 +1,21 @@
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_30smcINF_L1J2019 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_30smcINF_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 3 3 3 1 1 1 0 1
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 12 4 4 4 0
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 4 4 4 3 0 0 0 3
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 decisions 16 12 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 4 4 4 3 2 2 0 2
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 16 12 8 8 0
+TrigSignatureMoniMT INFO HLT_3j200_L1J100 4 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3j200_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_3j200_L1J20 19 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_3j200_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 19 19 1 0 0 0 0 1
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 decisions 5 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 20 20 20 0 0 0 0 20
@@ -22,26 +32,50 @@ TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 154 154 223 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2019 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j175_gsc225_bmv2c1040_split_L1J1004 4 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j175_gsc225_bmv2c1040_split_L1J100 decisions 1 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc275_bmv2c1060_split_L1J1004 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc275_bmv2c1060_split_L1J100 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc300_bmv2c1070_split_L1J1004 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc300_bmv2c1070_split_L1J100 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc360_bmv2c1077_split_L1J1004 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc360_bmv2c1077_split_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 19 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA493 3 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split_L1J2019 19 19 18 0 0 0 18
TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split_L1J20 decisions 132 86 0 0 0
TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split_L1J2019 19 19 18 0 0 0 18
TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split_L1J20 decisions 132 86 0 0 0
+TrigSignatureMoniMT INFO HLT_j420_L1J100 4 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j420_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 19 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_a10t_lcw_jes_30smcINF_L1J2019 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_a10t_lcw_jes_30smcINF_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_L1J20 19 19 18 0 0 0 0 18
TrigSignatureMoniMT INFO HLT_j45_L1J20 decisions 18 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J1004 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 19 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 4 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 19 19 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 4 4 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_L1J20 19 19 13 0 0 0 0 13
TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 13 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 10 10 7 5 3 0 0 3
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 8 6 3 0 0
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 8 8 5 4 3 3 1 1
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 6 5 4 4 1
+TrigSignatureMoniMT INFO HLT_mu50_L1MU20 8 8 4 2 1 1 0 1
+TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 5 2 1 1 0
+TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU208 8 4 0 1 0 0 1
+TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 decisions 5 0 1 0 0
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 10 10 10 10 0 0 0 10
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 14 13 0 0 0
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 10 10 10 10 10 10 0 10
@@ -58,6 +92,8 @@ TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6
TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 27 21 0 0 0
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 18 18 18 18 0 0 0 18
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 decisions 39 29 0 0 0
+TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU1002 2 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM18 18 17 16 0 0 0 16
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM decisions 37 27 0 0 0
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM18 18 15 10 0 0 0 10
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index a558943b7d6b61ee2e5430f0322d51c2ad2aca19..66f6075d783ed8cd4b3b4d767af7ee287b86e52d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -119,11 +119,14 @@ TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6Comb_L1MU6 I
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e3_etcut1step_L1EM3 ID#999988353
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6noL1_L1MU6 ID#1631468602
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu60_0eta105_msonly_L1MU20 ID#1642591450
TriggerSummaryStep1 6 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu26_ivarmedium_L1MU20 ID#3411723090
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6fast_L1MU6 ID#3518031697
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu50_L1MU20 ID#3657158931
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep2 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
@@ -131,9 +134,11 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6noL1_L1MU6 ID#1631468602
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu60_0eta105_msonly_L1MU20 ID#1642591450
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu26_ivarmedium_L1MU20 ID#3411723090
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
TriggerSummaryStep3 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep3 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
@@ -247,6 +252,7 @@ TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_ivarmedium_
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6noL1_L1MU6 ID#1631468602
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
+TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu26_ivarmedium_L1MU20 ID#3411723090
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6fast_L1MU6 ID#3518031697
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
TriggerSummaryStep2 15 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
@@ -300,22 +306,26 @@ TriggerSummaryStep3 19 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep3 19 0 DEBUG +++ HLT_e7_etcut_L1EM3 ID#1959043579
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_30smcINF_L1J2020 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_30smcINF_L1J20 decisions 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 decisions 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 decisions 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3j200_L1J100 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3j200_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_3j200_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_3j200_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 20 20 18 0 0 0 0 18
@@ -332,26 +342,50 @@ TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 decisions 50 50 58 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j175_gsc225_bmv2c1040_split_L1J10020 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j175_gsc225_bmv2c1040_split_L1J100 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc275_bmv2c1060_split_L1J10020 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc275_bmv2c1060_split_L1J100 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc300_bmv2c1070_split_L1J10020 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc300_bmv2c1070_split_L1J100 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc360_bmv2c1077_split_L1J10020 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc360_bmv2c1077_split_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA4920 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split_L1J2020 20 6 5 0 0 0 5
TrigSignatureMoniMT INFO HLT_j35_gsc45_bmv2c1070_split_L1J20 decisions 9 5 0 0 0
TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split_L1J2020 20 6 5 0 0 0 5
TrigSignatureMoniMT INFO HLT_j35_gsc45_boffperf_split_L1J20 decisions 9 5 0 0 0
+TrigSignatureMoniMT INFO HLT_j420_L1J100 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j420_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_a10t_lcw_jes_30smcINF_L1J2020 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_a10t_lcw_jes_30smcINF_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_L1J20 20 20 5 0 0 0 0 5
TrigSignatureMoniMT INFO HLT_j45_L1J20 decisions 5 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J10020 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j85_L1J20 20 20 1 0 0 0 0 1
TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 3 1 1 0 0 1
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 1 1 0 0
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 20 20 2 1 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 2 1 0 0 0
+TrigSignatureMoniMT INFO HLT_mu50_L1MU20 20 20 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 1 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU2020 20 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 decisions 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 2 0 0 0 2
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 2 0 0 0
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 2 1 1 0 1
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
index 62b6018a8f261ca18a86c4be7f59cefce1113f43..21d9d7ea3858323fec02399779bea30bda465459 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
@@ -15,7 +15,7 @@ __doc__="Decoding of chain name into a dictionary"
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
logDict = logging.getLogger('TriggerMenu.menu.DictFromChainName')
-
+import re
def getOverallL1item(chainName):
"""
@@ -29,6 +29,14 @@ def getOverallL1item(chainName):
cNameParts = chainName.split("_L1")
return 'L1_' + cNameParts[-1]
+def getL1item(chainName):
+ mainL1 = getOverallL1item(chainName)
+ #replace the '_' left-closest-to ETA by '.' so that L1J75_31ETA49 becomes L1J75.31ETA49
+ if 'ETA' in mainL1:
+ r = re.compile("_(?P<eta>..ETA..)")
+ mainL1 = r.sub(".\\g<eta>", mainL1)
+ return mainL1
+
def getAllThresholdsFromItem(item):
"""
Breaks the item name into parts separated by the _ and from each element extract the threshold name
@@ -97,7 +105,7 @@ class DictFromChainName(object):
else:
logDict.error("Format of chainInfo passed to genChainDict not known")
- L1item = getOverallL1item(chainName)
+ L1item = getL1item(chainName)
logDict.debug("Analysing chain with name: %s", chainName)
chainDict = self.analyseShortName(chainName, L1chainParts, L1item)
@@ -123,6 +131,10 @@ class DictFromChainName(object):
return chainDict
+
+
+
+
def getChainMultFromDict(self, chainDict):
allMultis = []
for cpart in chainDict['chainParts']:
@@ -187,7 +199,7 @@ class DictFromChainName(object):
genchainDict['chainName'] = chainName
# remove the L1 item from the name
- hltChainName = chainName.replace(L1item.replace("L1_", "_L1"),'')
+ hltChainName = chainName[:chainName.index("_L1")]
# ---- specific chain part information ----
allChainProperties=[]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 21b4d43513053b6ed0c8b303f01dd3df9ef69ee3..da24229c618b6e806776fa656c6bc1ea995a724d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -37,6 +37,12 @@ def setupMenu():
TriggerFlags.TestSlice.signatures = []
TriggerFlags.MuonSlice.signatures = [
+ #ATR-20049
+ ChainProp(name='HLT_mu60_0eta105_msonly_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_3mu6_L13MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup),
+ ChainProp(name='HLT_3mu6_msonly_L13MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup),
+ ChainProp(name='HLT_4mu4_L14MU4', l1SeedThresholds=['MU4'], groups=MultiMuonGroup),
+
ChainProp(name='HLT_mu6fast_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6Comb_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_L1MU6', groups=SingleMuonGroup),
@@ -46,6 +52,12 @@ def setupMenu():
ChainProp(name='HLT_mu6noL1_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup),
+ # ATR-20049
+ ChainProp(name='HLT_mu26_ivarmedium_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu50_L1MU20', groups=SingleMuonGroup),
+
+ # ATR-20049
+ ChainProp(name='HLT_2mu14_L12MU10', groups=MultiMuonGroup),
ChainProp(name='HLT_2mu6Comb_L12MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup),
ChainProp(name='HLT_2mu6_L12MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu6_mu4_L12MU4', l1SeedThresholds=['MU4']*2, groups=MultiMuonGroup),
@@ -94,29 +106,58 @@ def setupMenu():
ChainProp(name='HLT_j460_a10r_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j420_a10t_lcw_jes_30smcINF_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_2j330_a10t_lcw_jes_30smcINF_L1J20', groups=SingleJetGroup),
-
+ # ATR-20049
+ ChainProp(name='HLT_j420_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j260_320eta490_L1J75_31ETA49', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10r_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10_lcw_subjes_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10t_lcw_jes_L1J100', groups=SingleJetGroup),
+
ChainProp(name='HLT_3j200_L1J20', groups=MultiJetGroup),
ChainProp(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_5j70_0eta240_L1J20', groups=MultiJetGroup), # this chain is supposed to be seeded off L1_4J15 in principle, needs CF fix
+ # ATR-20049
+ ChainProp(name='HLT_3j200_L1J100', groups=MultiJetGroup),
]
+
TriggerFlags.BjetSlice.signatures = [
+ #ATR-20049
+ ChainProp(name="HLT_j175_gsc225_bmv2c1040_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j225_gsc275_bmv2c1060_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j225_gsc300_bmv2c1070_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j225_gsc360_bmv2c1077_split_L1J100", groups=SingleBjetGroup),
+
ChainProp(name="HLT_j35_gsc45_boffperf_split_L1J20", groups=SingleBjetGroup),
ChainProp(name="HLT_j35_gsc45_bmv2c1070_split_L1J20", groups=SingleBjetGroup),
#ChainProp(name="HLT_j35_gsc45_bmv2c1070_L1J20", groups=SingleBjetGroup),
]
TriggerFlags.TauSlice.signatures = [
+ #ATR-20049
+ ChainProp(name="HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100", groups=SingleTauGroup),
+
ChainProp(name="HLT_tau0_perf_ptonly_L1TAU12", groups=SingleTauGroup),
ChainProp(name="HLT_tau25_medium1_tracktwo_L1TAU12IM", groups=SingleTauGroup),
- ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup)
+ ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup),
]
TriggerFlags.BphysicsSlice.signatures = [
- ChainProp(name='HLT_2mu4_bDimu_L12MU4', groups=BphysicsGroup),
- ChainProp(name='HLT_2mu6_bJpsimumu_L12MU6', groups=BphysicsGroup),
- ChainProp(name='HLT_2mu4_bBmumu_L12MU4', groups=BphysicsGroup),
- ChainProp(name='HLT_2mu4_bUpsimumu_L12MU4', groups=BphysicsGroup),
- ChainProp(name='HLT_2mu4_bJpsimumu_L12MU4', groups=BphysicsGroup)
+ #ATR-20049
+ ChainProp(name='HLT_2mu10_bJpsimumu_L12MU10', groups=BphysicsGroup),
+ ChainProp(name='HLT_2mu10_bUpsimumu_L12MU10', groups=BphysicsGroup),
+ #ChainProp(name='HLT_mu11_mu6_bDimu_L1MU11_2MU6', groups=BphysicsGroup),
+ #ChainProp(name='HLT_mu11_mu6_bBmumu_L1MU11_2MU6', groups=BphysicsGroup),
+ #ChainProp(name='HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6', groups=BphysicsGroup),
+ #ChainProp(name='HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6', groups=BphysicsGroup),
+ #ChainProp(name='HLT_3mu4_bJpsi_L13MU4', groups=BphysicsGroup),
+ #ChainProp(name='HLT_3mu4_bUpsi_L13MU4', groups=BphysicsGroup),
+ #ChainProp(name='HLT_3mu6_bDimu_L13MU6', groups=BphysicsGroup),
+
+ #ChainProp(name='HLT_2mu4_bDimu_L12MU4', groups=BphysicsGroup),
+ #ChainProp(name='HLT_2mu6_bJpsimumu_L12MU6', groups=BphysicsGroup),
+ #ChainProp(name='HLT_2mu4_bBmumu_L12MU4', groups=BphysicsGroup),
+ #ChainProp(name='HLT_2mu4_bUpsimumu_L12MU4', groups=BphysicsGroup),
+ #ChainProp(name='HLT_2mu4_bJpsimumu_L12MU4', groups=BphysicsGroup)
]
TriggerFlags.CombinedSlice.signatures = [
ChainProp(name='HLT_e3_etcut1step_mu6fast_L1EM8I_MU10', l1SeedThresholds=['EM8I', 'MU10'], stream=[PhysicsStream], groups=MultiElectronGroup), #L1 item thresholds in wrong order (EM first, then MU)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index d8a51feff0291d10723ddeade591eeea0e8ca32f..4ca6abde30f918a1abf2d9d93e93b3eec07f352d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -188,7 +188,7 @@ MuonChainParts = {
'chainPartName' : [],
'multiplicity' : '',
'trigType' : ['mu'],
- 'etaRange' : ['0eta2550', ],
+ 'etaRange' : ['0eta2550','0eta105'],
'threshold' : '',
'extra' : ['noL1', 'Comb', 'fast', 'msonly'],
'IDinfo' : [],