From 3cc6f9e9731e9c27012c35acb1108e62129b9dbb Mon Sep 17 00:00:00 2001
From: Krzysztof Jamrog <krzysztof.piotr.jamrog@cern.ch>
Date: Mon, 15 Apr 2019 15:37:54 +0200
Subject: [PATCH] Moved createStepView function to MenuComponents module
---
Control/AthenaCommon/python/CFElements.py | 6 ------
.../TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py | 3 +--
.../python/HLTMenuConfig/Electron/generateElectron.py | 3 +--
.../python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py | 4 ++--
.../python/HLTMenuConfig/Menu/MenuComponents.py | 6 ++++++
.../TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py | 3 +--
.../python/HLTMenuConfig/Photon/generatePhoton.py | 3 +--
7 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/Control/AthenaCommon/python/CFElements.py b/Control/AthenaCommon/python/CFElements.py
index 5a325c8dfb5..cb3ee467725 100755
--- a/Control/AthenaCommon/python/CFElements.py
+++ b/Control/AthenaCommon/python/CFElements.py
@@ -1,5 +1,4 @@
from AthenaCommon.AlgSequence import AthSequencer
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
import collections
def parOR(name, subs=[]):
@@ -72,11 +71,6 @@ def stepSeq(name, filterAlg, rest):
stepAnd = seqAND(name, [ filterAlg, stepReco ])
return stepAnd
-def createStepView(stepName):
- stepReco = parOR(CFNaming.stepRecoName(stepName))
- stepView = seqAND(CFNaming.stepViewName(stepName), [stepReco])
- return stepReco, stepView
-
def isSequence( obj ):
return 'AthSequence' in type( obj ).__name__
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py
index 8a5a7571afc..0518bab3320 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py
@@ -14,12 +14,11 @@ from TrigConfigSvc.TrigConfigSvcConfig import TrigConfigSvcCfg
from TriggerJobOpts.TriggerConfig import triggerSummaryCfg, triggerMonitoringCfg, \
setupL1DecoderFromMenu, collectHypos, collectFilters
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig_newJO import generateDecisionTree
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, createStepView
from AthenaCommon.CFElements import seqOR
from RegionSelector.RegSelConfig import regSelCfg
from TrigUpgradeTest.InDetConfig import TrigInDetCondConfig
from TrigUpgradeTest.EmuStepProcessingConfig import generateL1DecoderAndChains
-from AthenaCommon.CFElements import createStepView
log = logging.getLogger('EmuNewJOTest')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
index 676b94563b8..72eba19bee8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py
@@ -2,11 +2,10 @@
from TrigUpgradeTest.ElectronMenuConfig import l2CaloRecoCfg, l2CaloHypoCfg
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, \
- ChainStep, Chain, getChainStepName
+ ChainStep, Chain, getChainStepName, createStepView
from TrigEgammaHypo.TrigL2CaloHypoTool import TrigL2CaloHypoToolFromDict
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaCommon.CFElements import createStepView
# TODO remove once full tracking is in place
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
index f8e657a57c5..cb5872881b8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
@@ -6,8 +6,8 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import buildFilter, makeSummary
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFDot import stepCF_DataFlow_to_dot, \
stepCF_ControlFlow_to_dot, all_DataFlow_to_dot
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import CFSequence
-from AthenaCommon.CFElements import parOR, seqAND, createStepView
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import CFSequence, createStepView
+from AthenaCommon.CFElements import parOR, seqAND
from AthenaCommon.Logging import logging
log = logging.getLogger('HLTCFConfig_newJO')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 5f84881d928..393ba2a1b23 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -6,6 +6,7 @@ log = logging.getLogger('MenuComponents')
from DecisionHandling.DecisionHandlingConf import RoRSeqFilter
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
+from AthenaCommon.CFElements import parOR, seqAND
class Node():
@@ -589,3 +590,8 @@ class RecoFragmentsPool:
def getChainStepName(chainName, stepNumber):
return '{}_step{}'.format(chainName, stepNumber)
+
+def createStepView(stepName):
+ stepReco = parOR(CFNaming.stepRecoName(stepName))
+ stepView = seqAND(CFNaming.stepViewName(stepName), [stepReco])
+ return stepReco, stepView
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index 6f11f083231..04a2a0c0e15 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -1,11 +1,10 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, ChainStep, Chain, getChainStepName
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, ChainStep, Chain, getChainStepName, createStepView
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TriggerMenuMT.HLTMenuConfig.Muon.MuonMenuConfig import l2MuFastRecoCfg, l2MuFastHypoCfg
from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromDict
-from AthenaCommon.CFElements import createStepView
def generateChains( flags, chainDict ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
index 215ea6656a8..e79081d6f8b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
@@ -3,12 +3,11 @@
from TrigUpgradeTest.ElectronMenuConfig import l2CaloRecoCfg, l2CaloHypoCfg
from TrigUpgradeTest.PhotonMenuConfig import l2PhotonRecoCfg, l2PhotonHypoCfg
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, \
- ChainStep, Chain, getChainStepName
+ ChainStep, Chain, getChainStepName, createStepView
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TrigEgammaHypo.TrigL2CaloHypoTool import TrigL2CaloHypoToolFromDict
from TrigEgammaHypo.TrigL2PhotonHypoTool import TrigL2PhotonHypoToolFromDict
-from AthenaCommon.CFElements import createStepView
def generateChains(flags, chainDict):
--
GitLab