diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
index c2408403b39d9734e6d29bc8f8c3334db0c60f66..d3e8914c8ff91bc2a1fa1612165d4c512c26634b 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# import Hypo Algs/Tools
from TrigMuonHypoMT.TrigMuonHypoMTConf import ( # noqa: F401 (algs not used here)
@@ -47,12 +47,16 @@ trigMuonEFSAThresholds = {
'13GeV' : [ [0,1.05,1.5,2.0,9.9], [ 11.4, 12.0, 11.1, 12.0] ],
'14GeV' : [ [0,1.05,1.5,2.0,9.9], [ 12.2, 13.0, 12.1, 13.0] ],
'15GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.0, 14.0, 13.0, 14.0] ],
+ '16GeV' : [ [0,1.05,1.5,2.0,9.9], [ 13.0, 14.0, 13.0, 14.0] ], # not optimized
'18GeV' : [ [0,1.05,1.5,2.0,9.9], [ 15.7, 16.6, 15.4, 16.3] ],
'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
+ '28GeV' : [ [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] ],
+ '35GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.0, 24.5, 23.0, 26.0] ], # not optimized
+ '36GeV' : [ [0,1.05,1.5,2.0,9.9], [ 25.0, 24.5, 23.0, 26.0] ], # not optimized
'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]],
'40GeV_uptoEC2' : [ [0,1.05,1.5,2.0,9.9], [ 31.5, 30.0, 28.5, 1000.0]],
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index d44f196e874e79910a74f9648691f6adb653a89e..e3f942fb9f348d6c9455e7c1d44cd3af92653987 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -18,6 +18,8 @@ TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12M
TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 decisions 12 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 3 3 3 2 2 1 0 1
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 12 8 8 4 0
+TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 3 3 3 2 2 1 0 1
+TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 decisions 12 8 8 4 0
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 4 4 4 2 1 1 1 1
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 16 4 6 4 1
TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 4 4 4 1 0 0 0 0
@@ -36,6 +38,8 @@ TrigSignatureMoniMT INFO HLT_3mu6_L13MU6
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_3mu8_msonly_L13MU6 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu8_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_L14J20 7 7 1 0 0 0 0 1
@@ -142,6 +146,10 @@ TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 7 7 6 6 0
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 8 8 8 5 4 3 2 2
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 10 6 5 4 2
+TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 8 8 8 5 4 3 2 2
+TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 decisions 10 6 5 3 2
+TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 8 8 8 5 4 2 1 1
+TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 decisions 10 6 5 2 1
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 8 8 8 5 1 1 0 1
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 10 6 1 1 0
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU208 8 8 5 1 1 1 1
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index b3b20f1d1476a82ca635bbbabaff15fb845e292f..25be2958fc40008cb5b12147bee4674c3697fa04 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -18,6 +18,8 @@ TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12
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_2mu15_L12MU10 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 20 20 1 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 4 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 20 20 1 0 0 0 0 0
@@ -36,6 +38,8 @@ TrigSignatureMoniMT INFO HLT_3mu6_L13MU6
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_3mu8_msonly_L13MU6 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu8_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_L14J20 20 20 0 0 0 0 0 0
@@ -148,6 +152,10 @@ TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 1 1 0 0 0
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 20 20 1 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 1 1 0 0 0
+TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 20 20 1 1 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 decisions 1 1 0 0 0
+TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 20 20 1 1 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 decisions 1 1 0 0 0
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 20 20 1 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 1 1 0 0 0
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU2020 20 1 1 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref
index 2aec8d68bf8072209aad31d457e73f15cfb18cd1..fdadbbf3f28590f9a80d699aa6995a1f6611f001 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_mu_mc.ref
@@ -1,46 +1,54 @@
-TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 20 20 4 2 2 1 0 1
-TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 16 8 8 4 0
-TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 20 20 4 3 0 0 0 3
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 3 3 3 2 2 1 0 1
+TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 12 8 8 4 0
+TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 3 3 3 2 2 1 0 1
+TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 decisions 12 8 8 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_10invm70_L1MU6 20 20 4 3 3 3 2 0
+TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 10 10 4 3 3 3 2 0
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 decisions 16 12 18 16 2
-TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 20 20 4 3 3 3 0 3
+TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 4 4 4 3 3 3 0 3
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 16 12 18 16 0
-TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 20 20 0 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 20 20 0 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 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3mu8_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_mu10_lateMu_L1MU10 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 10 10 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 decisions 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 13 7 4 0 0 4
-TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 17 8 4 0 0
-TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 20 20 6 6 5 5 0 5
+TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 10 10 10 5 3 0 0 3
+TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 14 6 3 0 0
+TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 8 8 6 6 5 5 0 5
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 7 7 6 6 0
-TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 20 20 8 5 4 3 2 2
+TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 8 8 8 5 4 3 2 2
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 decisions 10 6 5 4 2
-TrigSignatureMoniMT INFO HLT_mu50_L1MU20 20 20 8 5 1 1 0 1
+TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 8 8 8 5 4 3 2 2
+TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 decisions 10 6 5 3 2
+TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 8 8 8 5 4 2 1 1
+TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 decisions 10 6 5 2 1
+TrigSignatureMoniMT INFO HLT_mu50_L1MU20 8 8 8 5 1 1 0 1
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 decisions 10 6 1 1 0
-TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU2020 20 8 5 1 1 1 1
+TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU208 8 8 5 1 1 1 1
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions 10 6 1 1 1
-TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU2020 20 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU208 8 1 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 decisions 2 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 13 13 0 0 0 13
-TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 17 16 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 13 13 11 11 0 11
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 17 16 17 16 0
-TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 20 20 13 13 11 11 0 11
-TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 17 17 18 21 0
-TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 20 20 13 13 11 11 7 7
-TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 17 16 17 16 7
-TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 20 20 13 0 11 0 0 11
-TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 17 0 18 0 0
-TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 20 20 7 7 4 4 0 4
-TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 14 14 12 12 0
-TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 20 20 13 0 0 0 0 13
-TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 17 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 11 11 0 0 0 11
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 18 15 0 0 0
-TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU2020 20 8 0 0 0 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
+TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 14 13 16 15 0
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 10 10 10 10 10 10 0 10
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 14 14 17 20 0
+TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 10 10 10 10 10 10 6 6
+TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 14 13 16 15 6
+TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 10 10 10 0 10 0 0 10
+TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 14 0 17 0 0
+TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 4 4 4 4 4 4 0 4
+TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 8 8 12 12 0
+TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 10 10 10 0 0 0 0 10
+TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 14 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 10 10 10 10 0 0 0 10
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 17 14 0 0 0
+TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU208 8 8 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions 10 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 b1ef561d9ae6da7f262b1d2e6c7a2b0c41fcdbf7..2a7aeccd7d81238f2e966716474e63946422da2e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#------------------------------------------------------------------------#
# LS2_v1.py menu for the long shutdown development
@@ -52,6 +52,12 @@ def setupMenu():
# ATR-20049
ChainProp(name='HLT_mu6_mu4_L12MU4', l1SeedThresholds=['MU4']*2, groups=MultiMuonGroup),
+ # Additional intermediate thresholds for validation comparisons
+ ChainProp(name='HLT_mu28_ivarmedium_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu35_ivarmedium_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_2mu15_L12MU10', groups=SingleMuonGroup),
+ ChainProp(name='HLT_3mu8_msonly_L13MU6', groups=SingleMuonGroup),
+
]
TriggerFlags.EgammaSlice.signatures = TriggerFlags.EgammaSlice.signatures() + [