diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
index 28a2d7923e65bd45fd4dd36c6a6d8b85764ca4f1..e5a870341f8a5299f43ece301a8a91c71976cb64 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
@@ -82,6 +82,7 @@ def trigJetHypoToolHelperFromDict(chain_dict):
A Helper Tool returned by this function may be the root of a Helper
Tool tree structure."""
+
log.debug('trigJetHypoToolFromDictc chainDict %s', str(chain_dict))
try:
@@ -100,7 +101,7 @@ def trigJetHypoToolHelperFromDict(chain_dict):
chain_name = chain_dict['chainName']
toolSetter = None
- if 'HT' in chain_name:
+ if 'agg' in chain_name:
toolSetter=ConditionsToolSetterHT(chain_name)
else:
toolSetter=ConditionsToolSetterFastReduction(chain_name)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
index 41a1145170119605deec76de2e41ff957fb0ce7e..e6ae7565ccfc026f9ca2b30d487f6cb5d77fa22c 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
@@ -13,7 +13,7 @@ reject_substr = ( # noqa: W605
'0i1',
'1i2',
'dphi',
- 'ht\d',)
+ 'agg\d',)
reject_substr_res = re.compile(r'%s' % '|'.join(reject_substr))
@@ -276,21 +276,22 @@ def _make_dijet_label(chain_parts):
)""" % argvals
-def _make_ht_label(chain_parts):
- """ht label. ht cuts, and cuts on particpating jets
+def _make_agg_label(chain_parts):
+ """agg label. cuts on aggregate quantities, and cuts on particpating jets
+ Only partway migrated from pure ht to more general agg
Currently supported cuts:
- all jets: ht
- all jets: et
- - all jets: eta
+ - all jets: eta
- default values are used for unspecified cuts.
The cut set can be extended according to the pattern
"""
- assert len(chain_parts) == 1, '_make_ht_label, no. of chain parts != 1'
+ assert len(chain_parts) == 1, '_make_agg_label, no. of chain parts != 1'
scenario = chain_parts[0]['hypoScenario']
- assert scenario.startswith('HT'), '_make_ht_label(): scenario does not start with HT'
+ assert scenario.startswith('agg'), '_make_agg_label(): scenario does not start with agg'
arg_res = [
re.compile(r'^(?P<lo>\d*)(?P<key>ht)(?P<hi>\d*)$'),
@@ -337,7 +338,7 @@ def _make_ht_label(chain_parts):
print ('sent 100')
result = """
- ht([(%(htlo).0fht)
+ ht([(%(htlo).0fht)
(%(etlo).0fet)
(%(etalo).0feta%(etahi).0f)
])""" % argvals
@@ -399,7 +400,7 @@ def chainDict2jetLabel(chain_dict):
# suported scenarios
router = {
'simple': _make_simple_label,
- 'HT': _make_ht_label,
+ 'agg': _make_agg_label,
'vbenf': _make_vbenf_label,
'dijet': _make_dijet_label,
'combinationsTest': _make_combinationsTest_label,
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 151df3d6f293883d84f5c900c02f68a2f12e6153..51b2249f068a4736748b1c809d7565b77f21309e 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -361,6 +361,12 @@ TrigSignatureMoniMT INFO -- #385248610 Features
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 16 16 16 9 - - - - - - - - - 9
TrigSignatureMoniMT INFO -- #3280865118 Features 45 45 82 9 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20 #2436664735
+TrigSignatureMoniMT INFO -- #2436664735 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2436664735 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20 #4013575747
+TrigSignatureMoniMT INFO -- #4013575747 Events 19 19 0 0 0 0 0 0 0 0 0 1 - - - 1
+TrigSignatureMoniMT INFO -- #4013575747 Features 0 0 0 0 0 0 0 0 0 28 - - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
TrigSignatureMoniMT INFO -- #1341875780 Events 0 0 0 0 0 0 0 0 0 0 0 0 - - - 0
TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 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 d4e58ce439b2a8c80014a555572ec7b44fdfbbd6..e9068580391476a4bab819016c6a12d0242c9686 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -361,6 +361,12 @@ TrigSignatureMoniMT INFO -- #385248610 Features
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - - - - - - - - - 1
TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 29 1 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20 #2436664735
+TrigSignatureMoniMT INFO -- #2436664735 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2436664735 Features 0 0 0 0 0 0 0 0 0 0 - - -
+TrigSignatureMoniMT INFO HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20 #4013575747
+TrigSignatureMoniMT INFO -- #4013575747 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #4013575747 Features 0 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
TrigSignatureMoniMT INFO -- #1341875780 Events 20 20 0 0 0 0 0 0 0 0 0 8 - - - 8
TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 0 0 0 117 - - -
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 17716122d772b8251dd2d6bfba25a55f99c0b15b..791d355c33640f119baad6ef865baf14371deeff 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -239,6 +239,9 @@ def setupMenu():
ChainProp(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20', groups=SingleJetGroup),
+
# ATR-20624
ChainProp(name='HLT_j0_perf_L1J12_EMPTY', stream=['Main'], groups=SingleJetGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 5e4ddc2d06603eb97cfbe822ff835ee601eeeb07..82d7fc9784474ff9c4835ad716c0a6b8d2a6024b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -13,7 +13,6 @@ SliceIDDict = {
'Electron': 'e',
'Photon' : 'g',
'Jet' : 'j',
- 'HT' : 'ht',
'Muon' : 'mu',
'Tau' : 'tau',
'MET' : 'xe',
@@ -32,8 +31,7 @@ SliceIDDict = {
'Test' : 'TestChain',
}
-AllowedSignatures = ["jet", "bjet", "ht",
- "electron", "photon", "egamma",
+AllowedSignatures = ["jet", "bjet", "electron", "photon", "egamma",
"muon",
"met",
"tau",
@@ -132,8 +130,9 @@ JetChainParts = {
'hypoScenario' : ['simple', 'vbenf',
'vbenfSEP30etSEP34mass35SEP50fbet',
'dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass',
- 'HTSEP1000htSEP100etSEP0eta320',
- 'HTSEP100htSEP10etSEP0eta320',],
+ 'aggSEP1000htSEP30etSEP0eta320',
+ 'aggSEP500htSEP30etSEP0eta320',
+ 'aggSEP100htSEP10etSEP0eta320',],
'smc' : ['30smcINF', '35smcINF', '40smcINF', '50smcINF', '60smcINF', 'nosmc'],
}
@@ -172,21 +171,6 @@ bJetChainParts_Default = {
'etaRange' : '0eta290',
}
-#==========================================================
-# HT chains
-#==========================================================
-# ---- HT Dictionary of all allowed Values ----
-HTChainParts = deepcopy(JetChainParts)
-HTChainParts['signature'] = ['HT']
-HTChainParts['trigType'] = ['ht']
-HTChainParts['extra'] = ['j20', 'j25', 'j30', 'test4']
-
-# ---- HTDictionary of default Values ----
-HTChainParts_Default = deepcopy(JetChainParts_Default)
-HTChainParts_Default['signature'] = ['HT']
-HTChainParts_Default['trigType'] = 'ht'
-HTChainParts_Default['extra'] = ''
-
#==========================================================
# Muon
#==========================================================
@@ -858,8 +842,6 @@ def getSignatureInformation(signature):
return [JetChainParts_Default, JetChainParts]
if signature == "Bjet":
return [bJetChainParts_Default, JetChainParts]
- if signature == "HT":
- return [HTChainParts_Default, HTChainParts]
if signature == "Tau":
return [TauChainParts_Default, TauChainParts]
if (signature == "Muon"):