From ddfa9722f93cbf5396df6bb0e9aac4910a6a4d87 Mon Sep 17 00:00:00 2001
From: Savanna Marie Shaw <savanna.marie.shaw@cern.ch>
Date: Thu, 27 Aug 2020 12:13:06 +0200
Subject: [PATCH] Use same HypoAlg for ms-only and standard muon triggers
Switching the msonly muon triggers to use exactly the same SA muon trigger sequence as other chains. This is to avoid having two different hypo algs attach the same feature twice in the navigation (which can lead to retrieving the incorrect features from the navigation later on in the monitoring).
---
.../python/HLTMenuConfig/Muon/MuonDef.py | 10 ++--------
.../HLTMenuConfig/Muon/MuonSequenceSetup.py | 17 -----------------
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index 8b80aeabf3a..824a4e6adac 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -11,7 +11,7 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Muon.MuonDef")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
-from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muFastOvlpRmSequence, muCombSequence, muCombOvlpRmSequence, muEFMSSequence, muEFSASequence, muIsoSequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence, muEFIsoSequence, efLateMuRoISequence, efLateMuSequence
+from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muFastOvlpRmSequence, muCombSequence, muCombOvlpRmSequence, muEFSASequence, muIsoSequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence, muEFIsoSequence, efLateMuRoISequence, efLateMuSequence
from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFInvMassHypoToolFromDict
# this must be moved to the HypoTool file:
@@ -38,9 +38,6 @@ def muCombSequenceCfg(flags):
def muCombOvlpRmSequenceCfg(flags):
return muCombOvlpRmSequence()
-def muEFMSSequenceCfg(flags):
- return muEFMSSequence()
-
def muEFSASequenceCfg(flags):
return muEFSASequence()
@@ -113,7 +110,7 @@ class MuonChainConfiguration(ChainConfigurationBase):
"noL2Comb" : [['getmuFast'], ['getmuEFSA', 'getmuEFCB']],
"ivar":[['getmuFast', 'getmuComb', 'getmuIso']],
"noL1":[[],['getFSmuEFSA', 'getFSmuEFCB']],
- "msonly":[['getmuFast', 'getmuMSEmpty'], ['getmuEFMS']],
+ "msonly":[['getmuFast', 'getmuMSEmpty'], ['getmuEFSA']],
"ivarmedium":[['getmuFast', 'getmuComb'], ['getmuEFSA', 'getmuEFCB', 'getmuEFIso']],
"lateMu":[[],['getLateMuRoI','getLateMu']],
"Dr": [['getmuFastDr', 'getmuCombDr']],
@@ -161,9 +158,6 @@ class MuonChainConfiguration(ChainConfigurationBase):
def getmuEFSA(self):
return self.getStep(3,'muEFSA',[ muEFSASequenceCfg])
- # --------------------
- def getmuEFMS(self):
- return self.getStep(3,'muEFMS', [muEFMSSequenceCfg])
# --------------------
def getmuIso(self):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
index 6e74f9bf4a1..48997c2a26c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
@@ -236,23 +236,6 @@ def muEFSASequence():
-def muEFMSSequence():
-
- (muonEFSAonlySequence, efsaViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(muEFSAAlgSequence, ConfigFlags)
-
- # setup EFSA hypo
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFHypoAlg
- trigMuonEFSAHypo = TrigMuonEFHypoAlg( "TrigMuonEFMSonlyHypoAlg" )
- trigMuonEFSAHypo.MuonDecisions = sequenceOut
-
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoToolFromDict
-
- return MenuSequence( Sequence = muonEFSAonlySequence,
- Maker = efsaViewsMaker,
- Hypo = trigMuonEFSAHypo,
- HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict )
-
-
######################
### EFCB seq ###
######################
--
GitLab