From bf20317b629025d3f67d956f2c6a22a73ff239e0 Mon Sep 17 00:00:00 2001
From: Mark Owen <mark.andrew.owen@cern.ch>
Date: Tue, 31 Mar 2020 13:59:25 +0100
Subject: [PATCH] Minor update in merged step naming. Couple of flake8 fixes
---
.../TrigUpgradeTest/python/EmuStepProcessingConfig.py | 4 +---
.../python/HLTMenuConfig/Menu/ChainMerging.py | 10 ++++------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
index 6a0126eb5ba..eedfbce25f1 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
@@ -4,7 +4,7 @@
from AthenaCommon.AlgScheduler import AlgScheduler
from AthenaCommon.CFElements import parOR
from AthenaCommon.Logging import logging
-from L1Decoder.L1DecoderConf import CTPUnpackingEmulationTool, RoIsUnpackingEmulationTool, L1Decoder, PrescalingEmulationTool
+from L1Decoder.L1DecoderConf import CTPUnpackingEmulationTool, RoIsUnpackingEmulationTool, L1Decoder
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import EmptyMenuSequence
log = logging.getLogger('EmuStepProcessingConfig')
@@ -170,8 +170,6 @@ def generateL1DecoderAndChains():
if doCombo:
emptySeq1 = EmptyMenuSequence("step1EmptySeqence")
emptySeq2 = EmptyMenuSequence("step2EmptySeqence")
- emptySeq3 = EmptyMenuSequence("step3EmptySeqence")
- emptySeq4 = EmptyMenuSequence("step4EmptySeqence")
if not doElectron:
from TrigUpgradeTest.HLTSignatureConfig import elMenuSequence
el11 = elMenuSequence(step="1",reconame="v1", hyponame="v1")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
index a53d8e63ddf..d9b38c02be5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
@@ -103,9 +103,9 @@ def serial_zip(allSteps, chainName):
#stepList[chain_index] = step
newsteps.append(stepList)
- log.info('After serial_zip')
+ log.debug('After serial_zip')
for s in newsteps:
- print s
+ log.debug( s )
return newsteps
def mergeSerial(chainDefList):
@@ -154,7 +154,7 @@ def mergeSerial(chainDefList):
def makeChainSteps(steps, stepNumber):
from copy import deepcopy
from TrigCompositeUtils.TrigCompositeUtils import legName
- stepName = ''
+ stepName = 'merged_Step' + str(stepNumber)
stepSeq = []
stepMult = []
log.verbose(" steps %s ", steps)
@@ -175,11 +175,9 @@ def makeChainSteps(steps, stepNumber):
currentStep = step.name
- stepNameParts = currentStep.split('_')
# the step naming for combined chains needs to be revisted!!
- stepName = "merged_Step" + str(stepNumber) + '_' + currentStep
- #stepName += '_' +step.name
+ stepName += '_' + currentStep
if len(step.sequences):
seq = step.sequences[0]
stepSeq.append(seq)
--
GitLab