From 676360cae36e10bb1c906c69d859c8b848ad4bb7 Mon Sep 17 00:00:00 2001
From: Heather Russell <heather.russell@cern.ch>
Date: Tue, 16 Feb 2021 15:57:54 +0100
Subject: [PATCH] patch
---
.../python/HLTMenuConfig/Menu/ChainMerging.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
index 1c6416f9c887..c2d4b8a46027 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
@@ -448,7 +448,14 @@ def makeCombinedStep(parallel_steps, stepNumber, chainDefList, allSteps = [], cu
log.debug("[makeCombinedStep] step %s, empty sequence %s", currentStepName, seqName)
#stepNumber is indexed from 1, need the previous step indexed from 0, so do - 2
- prev_step_mult = int(currentChainSteps[stepNumber-2].multiplicity[chain_index])
+ prev_step_mult = -1
+ if stepNumber > 1:
+ prev_step_mult = int(currentChainSteps[stepNumber-2].multiplicity[chain_index])
+ prev_step_mult_alt = int(new_stepDict['chainParts'][0]['multiplicity'])
+ assert prev_step_mult == prev_step_mult_alt, "[makeCombinedStep] The two methods of accessing step multiplicity are not equivalent!"
+ else:
+ #get the step multiplicity from the step dict. This should be
+ prev_step_mult = int(new_stepDict['chainParts'][0]['multiplicity'])
stepMult.append(prev_step_mult)
# we need a chain dict here, use the one corresponding to this leg of the chain
oldLegName = new_stepDict['chainName']
--
GitLab