From d32f417bfa24ec2efb445d27d4cc03f2478294f7 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 20 Nov 2020 09:55:40 +0100
Subject: [PATCH] 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.
---
.../TrigExPartialEB/python/MTCalibPebConfig.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
index b2ba3f8023f..71f3aa91123 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
@@ -219,8 +219,8 @@ def configure_hlt_result(hypo_algs):
serialiser = TriggerEDMSerialiserToolCfg('Serialiser')
for hypo in hypo_algs:
serialiser.addCollectionListToMainResult([
- 'xAOD::TrigCompositeContainer_v1#'+hypo.HypoOutputDecisions,
- 'xAOD::TrigCompositeAuxContainer_v2#'+hypo.HypoOutputDecisions+'Aux.',
+ 'xAOD::TrigCompositeContainer_v1#%s' % hypo.HypoOutputDecisions,
+ 'xAOD::TrigCompositeAuxContainer_v2#%sAux.' % hypo.HypoOutputDecisions,
])
# Data scouting example
@@ -279,7 +279,7 @@ def configure_hlt_result(hypo_algs):
# Tool adding stream tags to HLT result
stmaker = StreamTagMakerToolCfg()
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
bitsmaker = TriggerBitsMakerToolCfg()
@@ -296,15 +296,15 @@ def make_summary_algs(hypo_algs):
from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
summary = TriggerSummaryAlg('TriggerSummaryAlg')
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
summMaker = DecisionSummaryMakerAlg()
- summMaker.FinalDecisionKeys = [hypo.HypoOutputDecisions for hypo in hypo_algs]
+ summMaker.FinalDecisionKeys = [str(hypo.HypoOutputDecisions) for hypo in hypo_algs]
summMaker.FinalStepDecisions = {}
for hypo in hypo_algs:
for tool in hypo.HypoTools:
- summMaker.FinalStepDecisions[tool.getName()] = hypo.HypoOutputDecisions
+ summMaker.FinalStepDecisions[tool.getName()] = str(hypo.HypoOutputDecisions)
log.info('summMaker = %s', summMaker)
return [summary, summMaker]
--
GitLab