diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
index dd85c68d12ef423e413121ea2943319dda59ad13..ecb480b7b64622c0fb440903f56bdb78a3b1cb0e 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
@@ -257,6 +257,12 @@ HLTConfigSvc::initialize() {
dummyChains["HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100"] = "L1_TAU100";
dummyChains["HLT_2mu10_bJpsimumu_L12MU10"] = "L1_2MU10";
dummyChains["HLT_2mu10_bUpsimumu_L12MU10"] = "L1_2MU10";
+ // ATR-19985
+ dummyChains["HLT_mu6_idperf_L1MU6"] = "L1_MU6";
+ dummyChains["HLT_mu24_idperf_L1MU20"] = "L1_MU20";
+ dummyChains["HLT_tau25_idperf_tracktwo_L1TAU12IM"] = "L1_TAU12IM";
+ dummyChains["HLT_tau25_idperf_tracktwoEF_L1TAU12IM"] = "L1_TAU12IM";
+ dummyChains["HLT_tau25_idperf_tracktwoMVA_L1TAU12IM"] = "L1_TAU12IM";
m_HLTFrame.setMergedHLT( m_setMergedHLT );
for (const auto& mapPair : dummyChains) {
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
index e43a48dea47759cf4926d1ba86725db7d5019a79..64cfffe19acb74e075e3d015d873a5e69c5f0b8f 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
@@ -62,7 +62,7 @@ def _IncTool(name, threshold, sel):
tool.CARCOREthr = same( -9999. )
tool.CAERATIOthr = same( -9999. )
- if sel == 'nocut':
+ if sel == 'nocut' or 'idperf' in name:
tool.AcceptAll = True
tool.ETthr = same( float( threshold )*GeV )
tool.dETACLUSTERthr = 9999.
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
index 3c31f0baf9dce68103e5ca654b799218af0fe0d9..0d2c52f239fd72a3cb85d7d8d20df555ceda5894 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
@@ -376,7 +376,10 @@ class TrigL2MuonOverlapRemoverMucombConfig(object):
def TrigmuCombHypoToolFromDict( chainDict ):
- thresholds = getThresholdsFromDict( chainDict )
+ if 'idperf' in chainDict['chainParts'][0]['chainPartName']:
+ thresholds = ['passthrough']
+ else:
+ thresholds = getThresholdsFromDict( chainDict )
config = TrigmuCombHypoConfig()
tight = False # can be probably decoded from some of the proprties of the chain, expert work
@@ -515,7 +518,10 @@ class TrigMuonEFMSonlyHypoConfig(object):
def TrigMuonEFCombinerHypoToolFromDict( chainDict ) :
- thresholds = getThresholdsFromDict( chainDict )
+ if 'idperf' in chainDict['chainParts'][0]['chainPartName']:
+ thresholds = ['passthrough']
+ else:
+ thresholds = getThresholdsFromDict( chainDict )
config = TrigMuonEFCombinerHypoConfig()
tool = config.ConfigurationHypoTool( chainDict['chainName'], thresholds )
addMonitoring( tool, TrigMuonEFCombinerHypoMonitoring, "TrigMuonEFCombinerHypoTool", chainDict['chainName'] )
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/python/TrigL2TauHypoTool.py b/Trigger/TrigHypothesis/TrigTauHypo/python/TrigL2TauHypoTool.py
index 2c11b4da8fc43874eebc6f49542182b7ba08bc1b..c8d7971843cba8cc49378c5d9156c76f0f5d2225 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/python/TrigL2TauHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigTauHypo/python/TrigL2TauHypoTool.py
@@ -1,4 +1,6 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+from AthenaCommon.Logging import logging
+log = logging.getLogger('TrigL2TauHypoTool')
def TrigL2TauHypoToolFromDict( chainDict ):
@@ -17,6 +19,9 @@ def TrigL2TauHypoToolFromDict( chainDict ):
from TrigTauHypo.TrigTauHypoConf import TrigTauGenericHypoMT
currentHypo = TrigTauGenericHypoMT(name)
currentHypo.MonTool = ""
+ currentHypo.AcceptAll = False
+ if 'idperf' in name:
+ currentHypo.AcceptAll = True
# pT cut always defined: ugly string-to-int-to-string conversion, sorry :)
myThreshold = str(int(threshold)*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 f17686ccddea18bdbba6aeabd61313ebe5a2f418..ec3f76633372f171dcef87e2b008f196f6c7b76c 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -88,6 +88,8 @@ TrigSignatureMoniMT INFO HLT_j85_L1J20
TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 13 0 0 0 0
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 5 5 5 0 5
+TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 7 6 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_mu50_L1MU20 8 8 8 5 1 1 0 1
@@ -100,6 +102,8 @@ TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 14 6 0 0 0
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 10 10 10 5 5 5 0 5
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 14 6 6 6 0
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 10 10 10 5 5 5 0 5
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 14 6 6 6 0
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 10 10 10 5 5 5 3 3
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 14 6 6 6 3
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 10 10 10 0 10 0 0 10
@@ -116,6 +120,10 @@ TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1T
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_idperf_tracktwoMVA_L1TAU12IM18 18 18 14 0 0 0 14
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM decisions 42 17 0 0 0
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM18 18 18 18 0 0 0 18
+TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM decisions 42 32 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 2ba85b15a35d504e91a5608d324b4028f2cca59a..8f3a4f6a45ecaf60321d469faa3f28e955cd68cb 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -151,6 +151,7 @@ TriggerSummaryStep1 5 0 DEBUG +++ HLT_e5_etcut_L1EM3
TriggerSummaryStep1 5 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep1 5 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep1 5 0 DEBUG +++ HLT_xe30_cell_L1XE10 ID#1649696554
@@ -181,10 +182,12 @@ TriggerSummaryStep4 5 0 DEBUG +++ HLT_g5_etcut_LArPEB
TriggerSummaryStep1 6 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep1 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu80_msonly_3layersEC_L1MU20 ID#761101109
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu50_RPCPEBSecondaryReadout_L1MU20 ID#827327262
TriggerSummaryStep1 6 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6noL1_L1MU6 ID#1631468602
@@ -202,9 +205,11 @@ TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6_msonly_L1MU
TriggerSummaryStep1 6 0 DEBUG +++ HLT_noalg_L1EM3 ID#4169267792
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep2 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu80_msonly_3layersEC_L1MU20 ID#761101109
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu50_RPCPEBSecondaryReadout_L1MU20 ID#827327262
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532
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
@@ -219,11 +224,13 @@ TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6_msonly_L1MU
TriggerSummaryStep3 6 0 DEBUG +++ HLT_e5_etcut_L1EM3 ID#324908483
TriggerSummaryStep3 6 0 DEBUG +++ HLT_g5_etcut_L1EM3 ID#471243435
TriggerSummaryStep3 6 0 DEBUG +++ HLT_e3_etcut_L1EM3 ID#683953566
+TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu20_ivar_L1MU6 ID#2083734526
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep3 6 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep3 6 0 DEBUG +++ HLT_mu6_msonly_L1MU6 ID#3895421032
+TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532
TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep4 6 0 DEBUG +++ HLT_mu6_L1MU6 ID#2560542253
TriggerSummaryStep4 6 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
@@ -407,9 +414,11 @@ TriggerSummaryStep3 14 0 DEBUG +++ HLT_e3_etcut_L1EM3
TriggerSummaryStep3 14 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep4 14 0 DEBUG +++ HLT_g5_etcut_LArPEB_L1EM3 ID#3486231698
TriggerSummaryStep1 15 0 DEBUG +++ HLT_noalg_L1RD0_FILLED ID#211699639
+TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu24_idperf_L1MU20 ID#677658909
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu80_msonly_3layersEC_L1MU20 ID#761101109
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu50_RPCPEBSecondaryReadout_L1MU20 ID#827327262
TriggerSummaryStep1 15 0 DEBUG +++ HLT_noalg_L1RD0_EMPTY ID#914660695
+TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_idperf_L1MU6 ID#934918532
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6Comb_L1MU6 ID#996392590
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6_ivarmedium_L1MU6 ID#1012713062
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6noL1_L1MU6 ID#1631468602
@@ -596,6 +605,8 @@ TrigSignatureMoniMT INFO HLT_j85_L1J20
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_mu24_idperf_L1MU20 20 20 2 1 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 decisions 2 1 0 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 2 1 0 0 0 0
@@ -608,6 +619,8 @@ TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 1 0 0 0
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 1 1 1 0 1
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 1 1 1 0
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 20 20 3 1 1 1 0 1
+TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 3 1 1 1 0
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 20 20 3 1 1 1 0 0
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 3 1 1 1 0
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 20 20 3 0 2 0 0 2
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 13c29980721a1c0c3605e7b52305b67652254e73..e4fed23c59088340388e19482c48a5d1f0e5c43c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -39,6 +39,10 @@ def setupMenu():
TriggerFlags.TestSlice.signatures = []
TriggerFlags.MuonSlice.signatures = [
+ #ART-19985
+ ChainProp(name='HLT_mu6_idperf_L1MU6', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu24_idperf_L1MU20', groups=SingleMuonGroup),
+
#ATR-20049
ChainProp(name='HLT_mu60_0eta105_msonly_L1MU20', groups=SingleMuonGroup),
ChainProp(name='HLT_mu80_msonly_3layersEC_L1MU20', groups=SingleMuonGroup),
@@ -150,6 +154,9 @@ def setupMenu():
]
TriggerFlags.TauSlice.signatures = [
+ # ATR-19985
+ ChainProp(name="HLT_tau25_idperf_tracktwo_L1TAU12IM", groups=SingleTauGroup),
+ ChainProp(name="HLT_tau25_idperf_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup),
#ATR-20049
ChainProp(name="HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100", groups=SingleTauGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 94e66d9e32ab70bbf953ea8b23c98269f33d1b0e..5925425a35700abc201ed9261af84f28784c73c5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -183,7 +183,7 @@ MuonChainParts = {
'IDinfo' : [],
'isoInfo' : ['ivar','ivarmedium'],
'invMassInfo' : ['10invm70'],
- 'addInfo' : ['1step','3layersEC'],
+ 'addInfo' : ['1step','idperf','3layersEC'],
'topo' : AllowedTopos_mu,
'flavour' : [],
}
@@ -234,7 +234,7 @@ TauChainParts = {
'selection' : ['medium1', 'mediumRNN', 'perf', ],
'multiplicity' : '',
'trigType' : ['tau'],
- 'trkInfo' : [],
+ 'trkInfo' : ['idperf'],
'extra' : '',
'recoAlg' : '',
'calib' : '',
@@ -334,9 +334,9 @@ ElectronChainParts = {
'trigType' : ['e'],
'threshold' : '',
'etaRange' : [],
- 'IDinfo' : [],
+ 'IDinfo' : ['lhtight'],
'isoInfo' : [],
- 'trkInfo' : [],
+ 'trkInfo' : ['idperf'],
'caloInfo' : [],
'lhInfo' : [],
'L2IDAlg' : [],