From 93ede52c6013c7909d8affca4a44b7b0782bdbba Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <Frank.Winklmeier@cern.ch>
Date: Wed, 6 Sep 2017 16:44:22 +0200
Subject: [PATCH] Fix RoI output name for muon emulation (ATR-16984)
Apparently "append" and "+=" are not equivalent for ToolHandleArrays.
Former-commit-id: 6023e4cbbcfc7f5ac902562ee7b3ac722ab24419
---
.../TrigUpgradeTest/python/TestUtils.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py b/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
index 2f5ba07e71d..07b8c88a09a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
@@ -53,14 +53,14 @@ class L1DecoderTest(L1Decoder) :
emUnpacker = EMRoIsUnpackingTool(OutputLevel = self.OutputLevel)
emUnpacker.ThresholdToChainMapping = MenuTest.EMThresholdToChainMapping
emUnpacker.MonTool = RoIsUnpackingMonitoring( prefix="EM", maxCount=30 )
- self.roiUnpackers.append(emUnpacker)
+ self.roiUnpackers += [emUnpacker]
# MU unpacker
if TriggerFlags.doMuon():
muUnpacker = MURoIsUnpackingTool(OutputLevel = self.OutputLevel)
muUnpacker.ThresholdToChainMapping = MenuTest.MUThresholdToChainMapping
muUnpacker.MonTool = RoIsUnpackingMonitoring( prefix="MU", maxCount=20 )
- self.roiUnpackers.append(muUnpacker)
+ self.roiUnpackers += [muUnpacker]
self.Chains = "HLTChainsResult"
@@ -97,17 +97,22 @@ class L1EmulationTest(L1Decoder) :
# EM unpacker
if TriggerFlags.doID() or TriggerFlags.doCalo():
emUnpacker = RoIsUnpackingEmulationTool("EMRoIsUnpackingTool",
+ Decisions = "EMRoIDecisions",
+ OutputTrigRoIs = "EMRoIs",
OutputLevel = self.OutputLevel,
ThresholdToChainMapping = MenuTest.EMThresholdToChainMapping)
- self.roiUnpackers.append(emUnpacker)
+ self.roiUnpackers += [emUnpacker]
+ print emUnpacker
# MU unpacker
if TriggerFlags.doMuon():
muUnpacker = RoIsUnpackingEmulationTool("MURoIsUnpackingTool",
+ Decisions = "MURoIDecisions",
+ OutputTrigRoIs = "MURoIs",
OutputLevel=self.OutputLevel,
ThresholdToChainMapping = MenuTest.MUThresholdToChainMapping)
- self.roiUnpackers.append(muUnpacker)
+ self.roiUnpackers += [muUnpacker]
self.Chains="HLTChainsResult"
--
GitLab