Skip to content
Snippets Groups Projects
Commit 01fad6ae authored by Johannes Elmsheuser's avatar Johannes Elmsheuser
Browse files

Merge branch 'use-precision-tracking-for-min-bias' into 'master' 

Use precision tracking in min-bias slice

See merge request atlas/athena!39422
parents 35251298 9e9bed18
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
+ 21
− 18
View file @ 01fad6ae
......@@ -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),
)
......
Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+ 2
− 2
View file @ 01fad6ae
......@@ -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
......
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasMenuSequences.py
+ 9
− 18
View file @ 01fad6ae
......@@ -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()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment