Skip to content
Snippets Groups Projects
Commit d32f417b authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

TrigExPartialEB: Fix for DataHandle type change

With Gaudi v34r1 (!37533), handle properties changed from type `str` to
`DataHandle`. Explicit `str` conversion is required for extracting the
key name.

Closes ATR-22396.
parent c2ca84a5
No related branches found
No related tags found
No related merge requests found
...@@ -219,8 +219,8 @@ def configure_hlt_result(hypo_algs): ...@@ -219,8 +219,8 @@ def configure_hlt_result(hypo_algs):
serialiser = TriggerEDMSerialiserToolCfg('Serialiser') serialiser = TriggerEDMSerialiserToolCfg('Serialiser')
for hypo in hypo_algs: for hypo in hypo_algs:
serialiser.addCollectionListToMainResult([ serialiser.addCollectionListToMainResult([
'xAOD::TrigCompositeContainer_v1#'+hypo.HypoOutputDecisions, 'xAOD::TrigCompositeContainer_v1#%s' % hypo.HypoOutputDecisions,
'xAOD::TrigCompositeAuxContainer_v2#'+hypo.HypoOutputDecisions+'Aux.', 'xAOD::TrigCompositeAuxContainer_v2#%sAux.' % hypo.HypoOutputDecisions,
]) ])
# Data scouting example # Data scouting example
...@@ -279,7 +279,7 @@ def configure_hlt_result(hypo_algs): ...@@ -279,7 +279,7 @@ def configure_hlt_result(hypo_algs):
# Tool adding stream tags to HLT result # Tool adding stream tags to HLT result
stmaker = StreamTagMakerToolCfg() stmaker = StreamTagMakerToolCfg()
stmaker.ChainDecisions = 'HLTNav_Summary' stmaker.ChainDecisions = 'HLTNav_Summary'
stmaker.PEBDecisionKeys = [hypo.HypoOutputDecisions for hypo in hypo_algs] stmaker.PEBDecisionKeys = [str(hypo.HypoOutputDecisions) for hypo in hypo_algs]
# Tool adding HLT bits to HLT result # Tool adding HLT bits to HLT result
bitsmaker = TriggerBitsMakerToolCfg() bitsmaker = TriggerBitsMakerToolCfg()
...@@ -296,15 +296,15 @@ def make_summary_algs(hypo_algs): ...@@ -296,15 +296,15 @@ def make_summary_algs(hypo_algs):
from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
summary = TriggerSummaryAlg('TriggerSummaryAlg') summary = TriggerSummaryAlg('TriggerSummaryAlg')
summary.InputDecision = 'L1DecoderSummary' summary.InputDecision = 'L1DecoderSummary'
summary.FinalDecisions = [hypo.HypoOutputDecisions for hypo in hypo_algs] summary.FinalDecisions = [str(hypo.HypoOutputDecisions) for hypo in hypo_algs]
from TrigOutputHandling.TrigOutputHandlingConf import DecisionSummaryMakerAlg from TrigOutputHandling.TrigOutputHandlingConf import DecisionSummaryMakerAlg
summMaker = DecisionSummaryMakerAlg() summMaker = DecisionSummaryMakerAlg()
summMaker.FinalDecisionKeys = [hypo.HypoOutputDecisions for hypo in hypo_algs] summMaker.FinalDecisionKeys = [str(hypo.HypoOutputDecisions) for hypo in hypo_algs]
summMaker.FinalStepDecisions = {} summMaker.FinalStepDecisions = {}
for hypo in hypo_algs: for hypo in hypo_algs:
for tool in hypo.HypoTools: for tool in hypo.HypoTools:
summMaker.FinalStepDecisions[tool.getName()] = hypo.HypoOutputDecisions summMaker.FinalStepDecisions[tool.getName()] = str(hypo.HypoOutputDecisions)
log.info('summMaker = %s', summMaker) log.info('summMaker = %s', summMaker)
return [summary, summMaker] return [summary, summMaker]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment