Skip to content
Snippets Groups Projects
Commit c2190ce6 authored by James Beacham's avatar James Beacham
Browse files

Merge branch 'feature-checkDoTRTInTracklet' into '21.0' 

Fix a potential bug about pixel prd tracklets

See merge request atlas/athena!7452

Former-commit-id: 9adf79eefa6dceb7eb25ea911496275b3b085208
parents 1d51307d 7bf0bd72
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
+ 13
− 9
View file @ c2190ce6
...@@ -692,14 +692,15 @@ else: ...@@ -692,14 +692,15 @@ else:
TrackCollectionKeys, TrackCollectionKeys,
TrackCollectionTruthKeys) TrackCollectionTruthKeys)
include ("InDetRecExample/ConfiguredNewTrackingTRTExtension.py") if InDetFlags.doTRTExtension() :
InDetPixelTrackingTRTExtension = ConfiguredNewTrackingTRTExtension(InDetNewTrackingCutsPixelPrdAssociation, include ("InDetRecExample/ConfiguredNewTrackingTRTExtension.py")
InDetKeys.ResolvedPixelPrdAssociationTracks(), InDetPixelTrackingTRTExtension = ConfiguredNewTrackingTRTExtension(InDetNewTrackingCutsPixelPrdAssociation,
InDetKeys.ExtendedTracksPixelPrdAssociation(), InDetKeys.ResolvedPixelPrdAssociationTracks(),
InDetKeys.ExtendedTracksMapPixelPrdAssociation(), InDetKeys.ExtendedTracksPixelPrdAssociation(),
TrackCollectionKeys, InDetKeys.ExtendedTracksMapPixelPrdAssociation(),
TrackCollectionTruthKeys, TrackCollectionKeys,
False) TrackCollectionTruthKeys,
False)
# ------------------------------------------------------------ # ------------------------------------------------------------
# #
...@@ -1067,7 +1068,10 @@ else: ...@@ -1067,7 +1068,10 @@ else:
# Dummy Merger to fill additional info for PRD-associated pixel tracklets # Dummy Merger to fill additional info for PRD-associated pixel tracklets
if InDetFlags.doTrackSegmentsPixelPrdAssociation(): if InDetFlags.doTrackSegmentsPixelPrdAssociation():
DummyCollection = [] DummyCollection = []
DummyCollection += [ InDetKeys.ExtendedTracksPixelPrdAssociation()] if InDetFlags.doTRTExtension() :
DummyCollection += [ InDetKeys.ExtendedTracksPixelPrdAssociation()]
else :
DummyCollection += [ InDetKeys.ResolvedPixelPrdAssociationTracks()]
TrkTrackCollectionMerger_pix = Trk__TrackCollectionMerger(name = "InDetTrackCollectionMerger_pix", TrkTrackCollectionMerger_pix = Trk__TrackCollectionMerger(name = "InDetTrackCollectionMerger_pix",
TracksLocation = DummyCollection, TracksLocation = DummyCollection,
OutputTracksLocation = InDetKeys.PixelPrdAssociationTracks(), OutputTracksLocation = InDetKeys.PixelPrdAssociationTracks(),
......
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