diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/MuonSetup.py b/Trigger/TrigValidation/TrigUpgradeTest/python/MuonSetup.py
index fed58b913d3d1520ae1120316e47780411d02f28..f5fe90f92c31b0ca256d30fb3c2df91eaf126065 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/MuonSetup.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/MuonSetup.py
@@ -363,7 +363,7 @@ def muCombRecoSequence( RoIs, OutputLevel=INFO ):
### Define input data of Inner Detector algorithms ###
### and Define EventViewNodes to run the algorithms ###
- from TrigUpgradeTest.InDetSetup import makeInDetAlgs
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Muon
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
index a7d50ce3b0dbaae144e1ce80a58439bc4c115575..22a8500d8a1cd128df173aea5577b23a6ff1b854 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/bjetMenuDefs.py
@@ -71,7 +71,7 @@ def bJetStep1Sequence():
RoIBuilder.RoIOutputKey = "EMViewRoIs" # Default for Fast Tracking Algs
# Fast Tracking
- from TrigUpgradeTest.InDetSetup import makeInDetAlgs
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Jet
@@ -147,7 +147,7 @@ def bJetStep1SequenceALLTE():
RoIBuilder.RoIOutputKey = "EMViewRoIs" # Default for Fast Tracking Algs
# Fast Tracking
- from TrigUpgradeTest.InDetSetup import makeInDetAlgs
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Jet
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
index ab324f6ae0223c918be8950628644ceb9621f4b9..05d7706a528f5ab2bd52388c445ec29f7179e996 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
@@ -18,7 +18,7 @@ from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
def photonMenuSequence():
""" Creates secpond step photon sequence"""
- from TrigUpgradeTest.CaloMenuDefs import CaloMenuDefs
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import CaloMenuDefs
ViewVerify = CfgMgr.AthViews__ViewDataVerifier("photonViewDataVerifier")
ViewVerify.DataObjects = [('xAOD::TrigEMClusterContainer','StoreGateSvc+'+ CaloMenuDefs.L2CaloClusters)]
ViewVerify.OutputLevel = DEBUG
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup b/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup
index d97e345e0a658d0a2625a2b179a7f3a3bc81c9c7..27710e80e1c7b010a8adf300c47a7f570717bf23 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup
@@ -178,7 +178,8 @@ def tauCaloSequence():
# #
-# from TrigUpgradeTest.InDetSetup import makeInDetAlgs
+# from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
+
# (viewAlgs, eventAlgs) = makeInDetAlgs()
# from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index 096bf0e4ce5e07897aa715516b337c1983f06150..5b5ce2bd2817f62fbbbd89d9ac8af77d61caeea2 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -40,7 +40,7 @@ if TriggerFlags.doID:
# PixelLorentzAngleSvc and SCTLorentzAngleSvc
include("InDetRecExample/InDetRecConditionsAccess.py")
- from TrigUpgradeTest.InDetSetup import makeInDetAlgs
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
index 06ad199e389d1848358a3cae6b11daf0733ba886..b45f4f24686106137da1b9875e346b9bba269769 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py
@@ -30,8 +30,8 @@ AllowedEventBuildingIdentifiers.extend(['dataScoutingElectronTest','pebtestthree
# egamma chains
##################################################################
if (doElectron):
- from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
- from TrigUpgradeTest.electronMenuDefs import electronMenuSequence, inDetSetup
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
+ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence, inDetSetup
inDetSetup()
fastCaloStep= fastCaloMenuSequence("Ele")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 95e00f23213ff4c1f31b3799675c65f5f7bbe2c3..81a094002f8913da03cd5b31d3763922c0f5d08d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -116,11 +116,10 @@ def createFastCaloSequence(rerun=False):
egammaCaloStep = createFastCaloSequence( rerun=False )
-from TrigUpgradeTest.InDetSetup import makeInDetAlgs
-
+from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
-from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
+from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
theFTF = TrigFastTrackFinder_eGamma()
theFTF.isRoI_Seeded = True
viewAlgs.append(theFTF)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
index 313caaa72dd1c531e898b09397b301dfd1646626..65fec8c2107924599da118161b0c74a2b2caea13 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
# import flags
@@ -10,8 +10,8 @@ include("TrigUpgradeTest/testHLT_MT.py")
##########################################
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
-from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
-from TrigUpgradeTest.electronMenuDefs import electronMenuSequence, inDetSetup
+from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
+from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence, inDetSetup
inDetSetup()
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
index 9e36ab4f49b3850ddf28017ac473874dd5cd6b23..bc04c269bbee0c9527a5e58a938845bc33422523 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
@@ -52,8 +52,8 @@ inDetSetup()
# egamma chains
##################################################################
if (doElectron):
- from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
- from TrigUpgradeTest.electronMenuDefs import electronMenuSequence
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
+ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
fastCaloStep=fastCaloMenuSequence("Ele")
electronStep=electronMenuSequence()
@@ -72,7 +72,7 @@ if (doElectron):
# photon chains
##################################################################
if (doPhoton):
- from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TrigUpgradeTest.photonMenuDefs import photonMenuSequence
fastCaloStep = fastCaloMenuSequence("Gamma")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
index 45862afb45c47defcb21e35248d16973d819b481..b89a391dce0df91401dedabe3cd45f9ee1184f3c 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/pebTest.py
@@ -25,8 +25,8 @@ from TrigUpgradeTest.pebMenuDefs import pebInfoWriterSequence
# egamma chains
##################################################################
if (doElectron):
- from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
- from TrigUpgradeTest.electronMenuDefs import electronMenuSequence, inDetSetup
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
+ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence, inDetSetup
inDetSetup()
fastCaloStep= fastCaloMenuSequence("Ele")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py
index bb2c853f159d3c5b3af1473b3d98648e825996ee..d36a2af651fbf30c551e456dc6e6322eef962ee9 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py
@@ -9,7 +9,7 @@ include("TrigUpgradeTest/testHLT_MT.py")
# menu
##########################################
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
-from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
+from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
from TrigUpgradeTest.photonMenuDefs import photonMenuSequence
calostep=fastCaloMenuSequence("Gamma")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
similarity index 93%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
index fc01a394e83bd1637afdd3acd5054dea448c5f28..ba875ac04c4acbf39214a8a9bf8c418d6708e6b5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
@@ -1,4 +1,9 @@
-from AthenaCommon.Constants import ERROR, DEBUG
+#
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+
+from AthenaCommon.Constants import DEBUG
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
from AthenaCommon.CFElements import seqAND
from AthenaConfiguration.AllConfigFlags import ConfigFlags
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py
similarity index 98%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py
index 9da79e352da6d03da3856dd535e5127a8ee27990..b1aa29abf870dd2cf334e0324e8938ddc0ee1210 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
def makeInDetAlgs( whichSignature='' ):
@@ -204,6 +204,8 @@ def makeInDetAlgs( whichSignature='' ):
# ChannelStatus = InDetSCT_ChannelStatusAlg,
DataObjectName = InDetKeys.SCT_RDOs(),
ClustersName = "SCT_TrigClusters",
+ #Adding the suffix to flagged conditions
+ #SCT_FlaggedCondData = "SCT_FlaggedCondData_TRIG",
conditionsTool = InDetSCT_ConditionsSummaryToolWithoutFlagged)
InDetSCT_Clusterization.isRoI_Seeded = True
InDetSCT_Clusterization.RoIs = "EMViewRoIs"
@@ -242,11 +244,9 @@ def makeInDetAlgs( whichSignature='' ):
condSeq = AthSequencer("AthCondSeq")
if not hasattr(condSeq, "InDetSiElementPropertiesTableCondAlg"):
# Setup alignment folders and conditions algorithms
- from InDetCondFolders import InDetAlignFolders
from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiElementPropertiesTableCondAlg
condSeq += InDet__SiElementPropertiesTableCondAlg(name = "InDetSiElementPropertiesTableCondAlg" + signature)
- from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool
from TrigInDetConf.TrigInDetPostTools import InDetTrigParticleCreatorToolFTF
from InDetTrigParticleCreation.InDetTrigParticleCreationConf import InDet__TrigTrackingxAODCnvMT
@@ -258,7 +258,5 @@ def makeInDetAlgs( whichSignature='' ):
theTrackParticleCreatorAlg.roiCollectionName = "EMViewRoIs"
viewAlgs.append(theTrackParticleCreatorAlg)
-
-
return (viewAlgs, eventAlgs)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/__init__.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 199e7bb3163609eaeabae1b70917b9811612634d..8f4803da9332b904c2f720fe61aba0dc0b530432 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -8,8 +8,8 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragmentsPool
-from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
-from TrigUpgradeTest.electronMenuDefs import electronMenuSequence, inDetSetup
+from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
+from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence, inDetSetup
#----------------------------------------------------------------
# fragments generating configuration will be functions in New JO,
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
similarity index 89%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index e4693823ef4e17534013654dfd1daaf552e0e0f0..d2aaeae892a83873c9b7f923f3d10d33161808fa 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -1,16 +1,15 @@
#
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
from AthenaCommon.Include import include
from AthenaCommon.Constants import VERBOSE,DEBUG
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
import AthenaCommon.CfgMgr as CfgMgr
from AthenaConfiguration.AllConfigFlags import ConfigFlags
# menu components
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
-from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq
+from AthenaCommon.CFElements import parOR, seqAND
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
@@ -29,13 +28,12 @@ def inDetSetup():
# PixelLorentzAngleSvc and SCTLorentzAngleSvc
include("InDetRecExample/InDetRecConditionsAccess.py")
- from InDetRecExample.InDetKeys import InDetKeys
def electronSequence(ConfigFlags):
""" second step: tracking....."""
- from TrigUpgradeTest.InDetSetup import makeInDetAlgs
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
(viewAlgs, eventAlgs) = makeInDetAlgs()
from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
@@ -46,7 +44,7 @@ def electronSequence(ConfigFlags):
# A simple algorithm to confirm that data has been inherited from parent view
# Required to satisfy data dependencies
- from TrigUpgradeTest.CaloMenuDefs import CaloMenuDefs
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import CaloMenuDefs
ViewVerify = CfgMgr.AthViews__ViewDataVerifier("electronViewDataVerifier")
ViewVerify.DataObjects = [('xAOD::TrigEMClusterContainer','StoreGateSvc+'+ CaloMenuDefs.L2CaloClusters)]
ViewVerify.OutputLevel = DEBUG
@@ -74,9 +72,9 @@ def electronSequence(ConfigFlags):
for viewAlg in viewAlgs:
- if viewAlg.properties().has_key("RoIs"):
+ if "RoIs" in viewAlg.properties():
viewAlg.RoIs = l2ElectronViewsMaker.InViewRoIs
- if viewAlg.properties().has_key("roiCollectionName"):
+ if "roiCollectionName" in viewAlg.properties():
viewAlg.roiCollectionName = l2ElectronViewsMaker.InViewRoIs
theElectronFex.RoIs = l2ElectronViewsMaker.InViewRoIs
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 9230ddb23139ac3ee311a476a3630dd569d0e544..8f68daca2596d8c69c87ce49a1b6ba70da01802e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -219,9 +219,7 @@ class ComboMaker(AlgNode):
newdict = {chain : allMultis}
for i in range(1, len(allMultis)):
- print "MEOW multiplicity ", allMultis[i]
cval = self.Alg.getProperties()[self.prop] # check necessary to see if chain was added already?
- print "MEOW cval ", cval
if type(cval) is dict:
##cval[chain] = allMultis
if chain in cval.keys():