diff --git a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
index 839a58ba4ab27a92be288c3010c829585ff82984..a66a496281f26f26b3c81367469a0cc7875df75b 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
@@ -24,17 +24,14 @@ def get_idtrig_view_verifier(name):
viewDataVerifier = CfgMgr.AthViews__ViewDataVerifier( name )
viewDataVerifier.DataObjects = [
( 'InDet::SCT_ClusterContainer', TrigSCTKeys.Clusters ),
- ( 'InDet::PixelClusterContainer', TrigPixelKeys.Clusters ),
- ( 'SpacePointContainer', TrigSCTKeys.SpacePoints ),
+ ( 'InDet::PixelClusterContainer', TrigPixelKeys.Clusters ),
+ ( 'SpacePointContainer', TrigSCTKeys.SpacePoints ),
( 'SpacePointContainer', TrigPixelKeys.SpacePoints ),
- # ( 'SpacePointOverlapCollection', 'StoreGateSvc+OverlapSpacePoints' ),
- # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
- # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs' ),
- # ( 'IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs' ),
- # #( 'xAOD::EventInfo', 'StoreGateSvc+EventInfo' )
+ ( 'SpacePointOverlapCollection', 'StoreGateSvc+OverlapSpacePoints' ),
+ ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+TrigPixelClusterAmbiguitiesMap' )
]
- viewDataVerifier.DataObjects = [( 'InDet::PixelClusterContainerCache' , InDetCacheNames.Pixel_ClusterKey ),
+ viewDataVerifier.DataObjects += [( 'InDet::PixelClusterContainerCache' , InDetCacheNames.Pixel_ClusterKey ),
( 'PixelRDO_Cache' , InDetCacheNames.PixRDOCacheKey ),
( 'InDet::SCT_ClusterContainerCache' , InDetCacheNames.SCT_ClusterKey ),
( 'SCT_RDO_Cache' , InDetCacheNames.SCTRDOCacheKey ),
@@ -43,6 +40,10 @@ def get_idtrig_view_verifier(name):
( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.PixBSErrCacheKey ),
( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTBSErrCacheKey ),
( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTFlaggedCondCacheKey ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs' ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs' ),
( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
( 'TagInfo' , 'DetectorStore+ProcessingTags' )]
@@ -56,11 +57,13 @@ def get_idtrig_view_verifier(name):
viewDataVerifier.DataObjects += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
- ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() )]
- topSequence.SGInputLoader.Load += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
- ( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
- ( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
- ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() )]
+ ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() ),
+ ( 'IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData' ),
+ ]
+ # topSequence.SGInputLoader.Load += [( 'PixelRDO_Container' , InDetKeys.PixelRDOs() ),
+ # ( 'SCT_RDO_Container' , InDetKeys.SCT_RDOs() ),
+ # ( 'IDCInDetBSErrContainer' , InDetKeys.PixelByteStreamErrs() ),
+ # ( 'IDCInDetBSErrContainer' , InDetKeys.SCT_ByteStreamErrs() )]
return viewDataVerifier
@@ -155,7 +158,7 @@ def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ):
from .InDetTrigCommon import siSPSeededTrackFinder_builder, get_full_name
siSPSeededTrackFinder = siSPSeededTrackFinder_builder( name = get_full_name( 'siSPSeededTrackFinder', config.name ),
- outputTracks = config.EFID.trkTracksEFID(), ##outEFIDTracks,
+ outputTracks = config.PT.trkTracksPT(), # config.EFID.trkTracksEFID(), ##outEFIDTracks,
trackingCuts = trackingCuts,
usePrdAssociationTool = usePrdAssociationTool,
nameSuffix = config.name )
@@ -179,7 +182,7 @@ def makeInDetPatternRecognition( config, verifier = 'IDTrigViewDataVerifier' ):
#Verifier should not be necessary when both patt. rec. and PT runs in the same view -> None
#Also provides particle cnv alg inside
precisionAlgs = makePrecisionInDetPatternRecognition(config = config,
- inputTracks = config.EFID.trkTracksEFID(),
+ inputTracks = config.PT.trkTracksPT(), #config.EFID.trkTracksEFID(),
verifier = None )
@@ -216,8 +219,8 @@ def makePrecisionInDetPatternRecognition( config, inputTracks,verifier = None ):
ambiguitySolverAlg = ambiguitySolverAlg_builder( name = get_full_name( core = 'TrkAmbiguitySolver', suffix = config.name ),
config = config,
inputTrackScoreMap = get_scoremap_name( config.name ), #Map of tracks and their scores,
- outputTrackCollection = config.PT.trkTracksPT() ) #FIXME: for now keep PT but if TRT added this will ahve to become intermediate collection
-
+ outputTrackCollection = config.PT.trkTracksPT()+"_Amb" ) #FIXME: for now keep PT but if TRT added this will ahve to become intermediate collection
+
ptAlgs.append( ambiguitySolverAlg )
#-----------------------------------------------------------------------------
@@ -225,7 +228,7 @@ def makePrecisionInDetPatternRecognition( config, inputTracks,verifier = None ):
from .InDetTrigCommon import trackParticleCnv_builder
trackParticleCnvAlg = trackParticleCnv_builder(name = get_full_name( 'xAODParticleCreatorAlg',config.name + '_IDTrig' ),
config = config,
- inTrackCollectionKey = config.PT.trkTracksPT(),
+ inTrackCollectionKey = config.PT.trkTracksPT()+"_Amb",
outTrackParticlesKey = config.PT.tracksPT( doRecord = config.isRecordable),
)
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index c407db4b658485536a5bdf01b7bb292a8b7ea4ce..c2a0d7f5437dd1ce957cfdd950caa17c1918bb9c 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -510,8 +510,8 @@ TriggerHLTListRun3 = [
# MinBias
- ('xAOD::TrackParticleContainer#HLT_IDTrack_MinBias_FTF', 'BS ESD AODFULL', 'MinBias', 'inViews:TrkView'),
- ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_MinBias_FTFAux.', 'BS ESD AODFULL', 'MinBias'),
+ ('xAOD::TrackParticleContainer#HLT_IDTrack_MinBias_IDTrig', 'BS ESD AODFULL', 'MinBias', 'inViews:TrkView'),
+ ('xAOD::TrackParticleAuxContainer#HLT_IDTrack_MinBias_IDTrigAux.', 'BS ESD AODFULL', 'MinBias'),
# Cosmic
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
index a23cf16951fa24f720879285b293a57f77e80044..de19773da588783308b0c735e9ec0fc6fb8f9a9c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
@@ -5,10 +5,10 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
from AthenaCommon.CFElements import parOR
from AthenaCommon.CFElements import seqAND
from TrigInDetConfig.InDetSetup import makeInDetAlgs
+from TrigInDetConfig.EFIDTracking import makeInDetPatternRecognition
from TrigEDMConfig.TriggerEDMRun3 import recordable
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
-from AthenaCommon.GlobalFlags import globalflags
from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
@@ -55,7 +55,8 @@ def MinBiasSPSequence():
idTrigConfig = getInDetTrigConfig('minBias')
idAlgs, verifier = makeInDetAlgs(config=idTrigConfig,
rois=spInputMakerAlg.InViewRoIs,
- viewVerifier='SPViewDataVerifier')
+ viewVerifier='SPViewDataVerifier',
+ doFTF=False)
verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI'),
('SCT_ID', 'DetectorStore+SCT_ID'),
('PixelID', 'DetectorStore+PixelID'),
@@ -68,7 +69,9 @@ def MinBiasSPSequence():
('PixelID', 'DetectorStore+PixelID'),
('TagInfo', 'DetectorStore+ProcessingTags')]
- spAlgsList = idAlgs[:-2]
+# spAlgsList = idAlgs[:-2]
+ spAlgsList = idAlgs
+
spCount = TrigCountSpacePointsMT()
spCount.SpacePointsKey = recordable("HLT_SpacePointCounts")
@@ -104,28 +107,16 @@ def MinBiasTrkSequence():
# prepare algorithms to run in views, first,
# inform scheduler that input data is available in parent view (has to be done by hand)
idTrigConfig = getInDetTrigConfig('minBias')
- idAlgs, verifier = makeInDetAlgs(config=idTrigConfig, rois=trkInputMakerAlg.InViewRoIs, viewVerifier='TrkrecoSeqDataVerifier')
- verifier.DataObjects += [('TrigRoiDescriptorCollection', 'StoreGateSvc+InputRoI'),
- ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_FlaggedCondData_TRIG'),
- ('InDet::SCT_ClusterContainer', 'StoreGateSvc+SCT_TrigClusters'),
- ('SpacePointContainer', 'StoreGateSvc+SCT_TrigSpacePoints'),
- ('InDet::PixelClusterContainer', 'StoreGateSvc+PixelTrigClusters'),
- ('SpacePointContainer', 'StoreGateSvc+PixelTrigSpacePoints')]
-
- if globalflags.InputFormat.is_bytestream():
- verifier.DataObjects += [('IDCInDetBSErrContainer', 'StoreGateSvc+PixelByteStreamErrs'),
- ('IDCInDetBSErrContainer', 'StoreGateSvc+SCT_ByteStreamErrs')]
-
- trkList = idAlgs[-2:] # FTF and Track to xAOD::TrackParticle conversion alg
+ algs,_ = makeInDetPatternRecognition(idTrigConfig, verifier='VDVMinBiasIDTracking')
trackCountHypo = TrackCountHypoAlgMT()
trackCountHypo.trackCountKey = recordable("HLT_TrackCount")
- trackCountHypo.tracksKey = recordable("HLT_IDTrack_MinBias_FTF")
+ trackCountHypo.tracksKey = recordable("HLT_IDTrack_MinBias_IDTrig")
from TrigMinBias.TrackCountMonitoringMT import TrackCountMonitoring
trackCountHypo.MonTool = TrackCountMonitoring()
- trkRecoSeq = parOR("TrkrecoSeq", [verifier]+trkList)
+ trkRecoSeq = parOR("TrkrecoSeq", algs)
trkSequence = seqAND("TrkSequence", [trkInputMakerAlg, trkRecoSeq])
trkInputMakerAlg.ViewNodeName = trkRecoSeq.name()