From 4a76641dba8fe7df3532b3b86e9616d1cfb78400 Mon Sep 17 00:00:00 2001
From: Tomasz Bold <tomasz.bold@gmail.com>
Date: Fri, 2 Oct 2020 13:35:07 +0000
Subject: [PATCH] Refactor tracking flags changeover position
---
.../TrigmuComb/python/TrigmuCombConfig_newJO.py | 4 ++--
.../TrigInDetConfig/python/TrigInDetConfig.py | 10 +++++-----
.../TrigInDetConfig/python/TrigTrackingCutFlags.py | 6 ++++++
.../python/HLTMenuConfig/Muon/generateMuon.py | 4 +---
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py
index d23189846ac..322877c9e03 100644
--- a/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py
+++ b/Trigger/TrigAlgorithms/TrigmuComb/python/TrigmuCombConfig_newJO.py
@@ -35,7 +35,7 @@ def muCombCfg(flags, postFix="", useBackExtrp=True):
idScanEndcap2Res = [0.030, 0.0000002]
idScanEndcap3Res = [0.036, 0.0000004]
idScanEndcap4Res = [0.046, 0.0000002]
-
+ from TrigmuComb.TrigmuCombMonitoring import TrigMuCombMonitoring
muCombMT = CompFactory.muCombMT
muCombAlg = muCombMT(name = "MuComb"+postFix,
MuCombStrategy = 0,
@@ -50,7 +50,7 @@ def muCombCfg(flags, postFix="", useBackExtrp=True):
IDSCANEndcap3Res = idScanEndcap3Res,
IDSCANEndcap4Res = idScanEndcap4Res,
IDalgo = "InDetTrigTrackingxAODCnv_Muon_FTF",
- MonTool = None)
+ MonTool = TrigMuCombMonitoring())
return acc, muCombAlg
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 9099aac72f9..7789e424a80 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -431,7 +431,10 @@ def TrigInDetCondCfg( flags ):
acc.merge( mfsc )
return acc
-def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
+def TrigInDetConfig( inflags, roisKey="EMRoIs", signatureName='' ):
+
+ # redirect InDet.Tracking flags to point to a specific trigger setting
+ flags = inflags.cloneAndReplace("InDet.Tracking", "Trigger.InDetTracking."+signatureName)
#If signature specified add suffix to the name of each algorithms
signature = "_" + signatureName if signatureName else ''
@@ -715,13 +718,10 @@ def TrigInDetConfig( flags, roisKey="EMRoIs", signatureName='' ):
return acc
-def indetInViewRecoCfg( inflags, viewMakerName, signature='' ):
+def indetInViewRecoCfg( flags, viewMakerName, signature='' ):
""" TBD if this function should be defined here or moved to the menu are, for sake of symmetry it is kept here now
There would certainly be additional algorithms
"""
- # redirect InDet.Tracking flags to point to a specific trigger setting
- flags = inflags.cloneAndReplace("InDet.Tracking", "Trigger.InDetTracking."+signature)
-
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco
reco = InViewReco( viewMakerName )
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py
index 6c9e24bbad5..a984bb29856 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingCutFlags.py
@@ -20,9 +20,15 @@ def __electronFlags():
flags.checkRedundantSeeds=True
return flags
+def __muonFlags():
+ flags = __sliceFlags()
+ flags.minPT=Units.GeV * 1.0
+ return flags
+
def createTrigTrackingFlags():
flags = AthConfigFlags()
flags.addFlagsCategory('Trigger.InDetTracking.Electron', __electronFlags, prefix=True)
+ flags.addFlagsCategory('Trigger.InDetTracking.Muon', __muonFlags, prefix=True)
return flags
if __name__ == "__main__":
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index a65743bad2d..1db8754f059 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -235,9 +235,7 @@ def generateChains( flags, chainDict ):
recoL2CB.mergeReco( MuCombViewDataVerifier() )
#ID tracking
- #(Using electron specific flags for now until muon specific flags are available)
- flagsID = flags.cloneAndReplace("InDet.Tracking", "Trigger.InDetTracking.Electron")
- accID = TrigInDetConfig( flagsID, roisKey=recoL2CB.inputMaker().InViewRoIs, signatureName="Muon" )
+ accID = TrigInDetConfig( flags, roisKey=recoL2CB.inputMaker().InViewRoIs, signatureName="Muon" )
recoL2CB.mergeReco(accID)
accL2CB.merge(recoL2CB, sequenceName = stepL2CBReco.getName())
--
GitLab