diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index e13073ebc5dc3dc488950bea1b3448804d31a057..dc84d9613459efc8c6749fae02fe26865aad5f38 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -105,10 +105,6 @@ def makeInDetPrecisionTracking( whichSignature,
if verifier:
verifier.DataObjects += [( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+' + TrigPixelKeys.PixelClusterAmbiguitiesMap ),
( 'TrackCollection' , 'StoreGateSvc+' + inputFTFtracks )]
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+' + TrigPixelKeys.PixelClusterAmbiguitiesMap )]
-
from AthenaCommon.AppMgr import ToolSvc
#-----------------------------------------------------------------------------
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
index cebe4851f9abf8c1192df602325235eef050983e..294ddd653436181de53b553d95a3cca80e18d3ea 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
@@ -19,6 +19,7 @@ precommand = ''.join([
"doWriteRDOTrigger=True;",
"forceEnableAllChains=True;",
"fpeAuditor=True;",
+ "failIfNoProxy=True;"
])
ex.args = '-c "{:s}"'.format(precommand)
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
index 162f8bb514118dceb06985d31c39a5c61f49784e..92d4f2b0bec1f18b53240c033f24a9066194d249 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_build.py
@@ -13,8 +13,13 @@ ex.type = 'athena'
ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
ex.input = 'ttbar'
ex.threads = 1
-# LS2_v1 soon to be renamed to Dev_pp_run3_v1
-ex.args = '-c "setMenu=\'LS2_v1\';doWriteBS=False;doWriteRDOTrigger=True;"'
+precommand = ''.join([
+ "setMenu='LS2_v1';", # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+ "doWriteBS=False;",
+ "doWriteRDOTrigger=True;",
+ "fpeAuditor=True;"
+])
+ex.args = '-c "{:s}"'.format(precommand)
test = Test.Test()
test.art_type = 'build'
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_deps_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_deps_build.py
similarity index 63%
rename from Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_deps_build.py
rename to Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_deps_build.py
index 14336b4b97fe47847f28fcec75321e1f8f7b78ca..2075544fbae5e465f6dd3560f9b9341d10224916 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_deps_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_deps_build.py
@@ -11,13 +11,12 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
ex = ExecStep.ExecStep()
ex.type = 'athena'
ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
-ex.input = 'data'
+ex.input = 'ttbar'
ex.threads = 1
precommand = ''.join([
"setMenu='LS2_v1';", # LS2_v1 soon to be renamed to Dev_pp_run3_v1
"doWriteBS=False;",
"doWriteRDOTrigger=True;",
- "forceEnableAllChains=True;",
"fpeAuditor=True;",
"failIfNoProxy=True;"
])
@@ -27,13 +26,5 @@ test = Test.Test()
test.art_type = 'build'
test.exec_steps = [ex]
test.check_steps = CheckSteps.default_check_steps(test)
-
-# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
-refcomp = CheckSteps.RegTestStep("CountRefComp")
-refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
-refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
-refcomp.required = True # Final exit code depends on this step
-CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
-
import sys
sys.exit(test.run())
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index bfe5be6de1463acd4edcdea4a337daca3a7b5ecf..f820e1dff6f44872eeb4a70ea55d6006e370cfcd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -36,21 +36,12 @@ def precisionElectronRecoSequence(RoIs):
( 'CaloAffectedRegionInfoVec' , 'ConditionStore+LArAffectedRegionInfo' ),
( 'CaloCellContainer' , 'StoreGateSvc+CaloCells' ),
( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
- ( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
- ( 'SG::AuxElement' , 'StoreGateSvc+EventInfo.AveIntPerXDecor' ),
- ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+PixelClusterAmbiguitiesMap' ), # makeInDetPrecisionTracking should get this, but it doesn't
- ( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ), # Seems to be necessary, despite load below
- ( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' ),
- ( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs_EF' ),
- ( 'InDet::TRT_DriftCircleContainer' , 'StoreGateSvc+TRT_DriftCircles' ),
( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+precisionElectron' )]
# Make sure the required objects are still available at whole-event level
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'CaloAffectedRegionInfoVec' , 'ConditionStore+LArAffectedRegionInfo' ),
- ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+PixelClusterAmbiguitiesMap' ),
- ( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )]
+ topSequence.SGInputLoader.Load += [( 'CaloAffectedRegionInfoVec' , 'ConditionStore+LArAffectedRegionInfo' )]
# This object must be loaded from SG if it's not loaded in conddb (algs request it but ignore)
from IOVDbSvc.CondDB import conddb
@@ -66,6 +57,9 @@ def precisionElectronRecoSequence(RoIs):
if globalflags.InputFormat.is_bytestream():
ViewVerifyTrk.DataObjects += [( 'InDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' ),
( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ) ]
+ else:
+ topSequence.SGInputLoader.Load += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
+ ViewVerifyTrk.DataObjects += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
""" Precision Track Related Setup.... """
PTAlgs = []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
index 2f47f50e54881dcab2bbc4b788500dd04171097e..dc522270a7851c8e5d3cb8c03aa471c56f90a9bf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
@@ -124,11 +124,6 @@ class MinBiasChainConfig(ChainConfigurationBase):
verifier.DataObjects += [( 'InDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' ),
( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )]
- # Make sure required objects are still available at whole-event level
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'InDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' ),
- ( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )]
TrkList = idAlgs[-2:] # FTF and Track to xAOD::TrackParticle conversion alg
TrackCountHypo=TrackCountHypoAlgMT()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index 1a520cc3ad90d39c6e1e529f5b6b3b5c6fafe685..eae1c8c815f687b699b1f3e287eec8a04c11a16c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -665,9 +665,6 @@ def muEFCBRecoSequence( RoIs, name ):
( 'xAOD::IParticleContainer' , 'StoreGateSvc+'+TrackParticlesName ),
( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )] #seems to be necessary, despite the load below
- # Make sure required objects are still available at whole-event level
- topSequence.SGInputLoader.Load += [( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )]
-
# This object must be loaded from SG if it's not loaded in conddb (algs request it but ignore)
from IOVDbSvc.CondDB import conddb
if not conddb.folderRequested( "Cond/StatusHT" ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index 024c2966076aa1ecc2a2a2fae2856d654e7d348d..ce4d9581fb28efe41a79b6206cbd85cefdcdebf4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -3,6 +3,7 @@
#
from AthenaCommon.CFElements import parOR, seqAND
+from AthenaCommon.GlobalFlags import globalflags
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool, ViewCreatorPreviousROITool
from TrigT2CaloCommon.CaloDef import HLTLCTopoRecoSequence
from TrigEDMConfig.TriggerEDMRun3 import recordable
@@ -222,13 +223,12 @@ def tauIdTrackSequence( RoIs , name):
( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+' + RoIs ),
( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+TAUCaloRoIs' ),
- ( 'xAOD::TauJetContainer' , 'StoreGateSvc+HLT_TrigTauRecMerged_CaloOnly' ),
- ( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
+ ( 'xAOD::TauJetContainer' , 'StoreGateSvc+HLT_TrigTauRecMerged_CaloOnly' )]
# Make sure the required objects are still available at whole-event level
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
+
from IOVDbSvc.CondDB import conddb
if not conddb.folderRequested( "PixelClustering/PixelClusNNCalib" ):
topSequence.SGInputLoader.Load += [( 'TTrainedNetworkCollection' , 'ConditionStore+PixelClusterNN' ),
@@ -236,6 +236,13 @@ def tauIdTrackSequence( RoIs , name):
viewVerify.DataObjects += [( 'TTrainedNetworkCollection' , 'ConditionStore+PixelClusterNN' ),
( 'TTrainedNetworkCollection' , 'ConditionStore+PixelClusterNNWithTrack' )]
+ if globalflags.InputFormat.is_bytestream():
+ viewVerify.DataObjects += [( 'InDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' ),
+ ( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ) ]
+ else:
+ topSequence.SGInputLoader.Load += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
+ viewVerify.DataObjects += [( 'TRT_RDO_Container' , 'StoreGateSvc+TRT_RDOs' )]
+
for viewAlg in viewAlgs:
tauIdTrackSequence += viewAlg
if "RoIs" in viewAlg.properties():
@@ -315,12 +322,10 @@ def tauCoreTrackSequence( RoIs, name ):
( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+' + RoIs ),
( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )] #For some reason not picked up properly
- # Make sure the required objects are still available at whole-event level
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'IDCInDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' )]
from IOVDbSvc.CondDB import conddb
if not conddb.folderRequested( "PixelClustering/PixelClusNNCalib" ):
+ from AthenaCommon.AlgSequence import AlgSequence
+ topSequence = AlgSequence()
topSequence.SGInputLoader.Load += [( 'TTrainedNetworkCollection' , 'ConditionStore+PixelClusterNN' ),
( 'TTrainedNetworkCollection' , 'ConditionStore+PixelClusterNNWithTrack' )]
viewVerify.DataObjects += [( 'TTrainedNetworkCollection' , 'ConditionStore+PixelClusterNN' ),