diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py index 30ca873f0837c4d2f2b63cc3b967335eec2cadd4..8b681d6c45d571c109f321a5389b6a0e8fbd1466 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py @@ -691,14 +691,15 @@ else: TrackCollectionKeys, TrackCollectionTruthKeys) - include ("InDetRecExample/ConfiguredNewTrackingTRTExtension.py") - InDetPixelTrackingTRTExtension = ConfiguredNewTrackingTRTExtension(InDetNewTrackingCutsPixelPrdAssociation, - InDetKeys.ResolvedPixelPrdAssociationTracks(), - InDetKeys.ExtendedTracksPixelPrdAssociation(), - InDetKeys.ExtendedTracksMapPixelPrdAssociation(), - TrackCollectionKeys, - TrackCollectionTruthKeys, - False) + if InDetFlags.doTRTExtension() : + include ("InDetRecExample/ConfiguredNewTrackingTRTExtension.py") + InDetPixelTrackingTRTExtension = ConfiguredNewTrackingTRTExtension(InDetNewTrackingCutsPixelPrdAssociation, + InDetKeys.ResolvedPixelPrdAssociationTracks(), + InDetKeys.ExtendedTracksPixelPrdAssociation(), + InDetKeys.ExtendedTracksMapPixelPrdAssociation(), + TrackCollectionKeys, + TrackCollectionTruthKeys, + False) # ------------------------------------------------------------ # @@ -1063,7 +1064,10 @@ else: # Dummy Merger to fill additional info for PRD-associated pixel tracklets if InDetFlags.doTrackSegmentsPixelPrdAssociation(): DummyCollection = [] - DummyCollection += [ InDetKeys.ExtendedTracksPixelPrdAssociation()] + if InDetFlags.doTRTExtension() : + DummyCollection += [ InDetKeys.ExtendedTracksPixelPrdAssociation()] + else : + DummyCollection += [ InDetKeys.ResolvedPixelPrdAssociationTracks()] TrkTrackCollectionMerger_pix = Trk__TrackCollectionMerger(name = "InDetTrackCollectionMerger_pix", TracksLocation = DummyCollection, OutputTracksLocation = InDetKeys.PixelPrdAssociationTracks(), diff --git a/Trigger/TriggerCommon/TrigMenuRulebook/RatesTools/config/__init__.py b/Trigger/TriggerCommon/TrigMenuRulebook/RatesTools/config/__init__.py old mode 100644 new mode 100755 diff --git a/Trigger/TriggerCommon/TrigMenuRulebook/RatesTools/model/COOL/__init__.py b/Trigger/TriggerCommon/TrigMenuRulebook/RatesTools/model/COOL/__init__.py old mode 100644 new mode 100755