From cef2917ca1c7d40265eef372a660ba68a8177255 Mon Sep 17 00:00:00 2001
From: Francesca Pastore <francesca.pastore@cern.ch>
Date: Wed, 18 Mar 2020 18:53:28 +0100
Subject: [PATCH] fix bug for combohypotools in asym legs, ATR-21092
---
.../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py | 1 +
.../python/HLTMenuConfig/Menu/MenuComponents.py | 4 +---
.../TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 577b0256e59..c5a51c3a798 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -52,6 +52,7 @@ def setupMenu():
# this is for test only
ChainProp(name='HLT_2mu6_Dr_L12MU4', groups=MultiMuonGroup),
+ ChainProp(name='HLT_mu6_Dr_mu4_Dr_L12MU4', l1SeedThresholds=['MU4']*2, groups=MultiMuonGroup),
# ATR-20049
ChainProp(name='HLT_mu6_mu4_L12MU4', l1SeedThresholds=['MU4']*2, groups=MultiMuonGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index e68b209822c..875de0a2e4c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -792,10 +792,8 @@ class ChainStep(object):
if self.isCombo:
self.makeCombo()
-
- def addCombHypoTools(self, tools):
+ def addComboHypoTools(self, tools):
self.comboToolConfs=tools
- self.combo.addComboHypoToolConfs(self.comboToolConfs)
def makeCombo(self):
if len(self.sequences)==0:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index 078d2f797c6..6785d8cd1ee 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -127,7 +127,7 @@ class MuonChainConfiguration(ChainConfigurationBase):
"ivarmedium":[['getmuFast', 'getmuComb'], ['getmuEFSA', 'getmuEFCB', 'getmuEFIso']],
"invM":[[],['getmuInvM']],
"lateMu":[[],['getLateMuRoI','getLateMu']],
- "Dr": [['getmuFastDr', 'getmuCombDr']]
+ "Dr": [['getmuFastDr', 'getmuCombDr'],[]]
}
return stepDictionary
@@ -238,10 +238,10 @@ class MuonChainConfiguration(ChainConfigurationBase):
def getmuCombDr(self):
step=self.getStep(2, 'muComb', sequenceCfgArray=[muCombSequenceCfg])
- step.addCombHypoTools([dimuDrComboHypoToolFromDict] )
+ step.addComboHypoTools([dimuDrComboHypoToolFromDict] )
return step
def getmuFastDr(self):
step=self.getStep(1,"mufast", [muFastSequenceCfg] )
- step.addCombHypoTools([dimuDrComboHypoToolFromDict] )
+ step.addComboHypoTools([dimuDrComboHypoToolFromDict] )
return step
--
GitLab