diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py index 1524612fa35b1e55e7bd881f1afcc75f962d4aea..b29070994d628ab88f08a80e0fc61c2d2cbce817 100644 --- a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py +++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py @@ -470,6 +470,12 @@ class ExtendedLargeD0Tracks(JobProperty): allowedTypes = ['str'] StoredValue = 'ExtendedLargeD0Tracks' +class ExtendedLargeD0TracksTruth(JobProperty): + """ Storegate key for new-tracking extended high-d0 tracks""" + statusOn = True + allowedTypes = ['str'] + StoredValue = 'ExtendedLargeD0TracksTruthCollection' + class ProcessedESDTracks(JobProperty): """ Storegate key for already processed tracks from ESD""" statusOn = True @@ -1116,6 +1122,7 @@ jobproperties.InDetContainerKeys.add_JobProperty(ExtendedSLHCTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLowPtTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedBeamGasTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLargeD0Tracks) +jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLargeD0TracksTruth) jobproperties.InDetContainerKeys.add_JobProperty(ProcessedESDTracks) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedDetailedTracksTruth) jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksTruth) diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py index dd419a0d6f4cb66a27b9f928dce4a96ff9d7fe1d..347c23b453c01ffe9209e6ec9c78a3377f556aa9 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py @@ -457,8 +457,10 @@ else: # processing case, those tracks are not part of the re-tracking procedure) if InDetFlags.useExistingTracksAsInput(): _dummy = InputCombinedInDetTracks.pop() + # --- add into list for combination - InputCombinedInDetTracks += [ InDetLargeD0TRTExtension.ForwardTrackCollection()] + # Don't add LRT tracks into combined collection. They will be in a separate collection + # InputCombinedInDetTracks += [ InDetLargeD0TRTExtension.ForwardTrackCollection()] @@ -685,7 +687,9 @@ else: InputPixelInDetTracks = [] InputPixelInDetTracks += InputCombinedInDetTracks if InDetFlags.doForwardTracks(): + # Add tracks that are not saved to the InputCombinedInDetTracks InputPixelInDetTracks +=[ InDetForwardTracksSiPattern.SiTrackCollection()] + InputPixelInDetTracks +=[ InDetLargeD0TRTExtension.ForwardTrackCollection()] # TODO: Should this be .SiTrackCollection()? RN # --- load cuts for pixel segment finding if ('InDetNewTrackingCutsDisappearing' not in dir()): printfunc ("InDetRec_jobOptions: InDetNewTrackingCutsDisappearing not set before - import them now") diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py index 5fab143bd1d372d7436d018d497291a336c57901..0a9b57db85c12eb774207c1d141fd5a170b0af5c 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py @@ -213,11 +213,11 @@ if InDetFlags.doPseudoTracking(): topSequence) -if InDetFlags.doR3LargeD0(): # TODO: Should this include the flag doLargeD0? Will this simple be converted to doLargeD0 once incorporated? +if InDetFlags.doR3LargeD0(): # TODO: Should this include the flag doLargeD0? Will this simple be converted to doLargeD0 once incorporated? -RN if doCreation : - createTrackParticles(InDetKeys.ResolvedLargeD0Tracks(), InDetKeys.ResolvedLargeD0TracksTruth(), InDetKeys.xAODLargeD0TrackParticleContainer(),topSequence) + createTrackParticles(InDetKeys.ExtendedLargeD0Tracks(), InDetKeys.ExtendedLargeD0TracksTruth(), InDetKeys.xAODLargeD0TrackParticleContainer(),topSequence) if doConversion : - convertTrackParticles(getRecTrackParticleNameIfInFile(InDetKeys.ResolvedLargeD0TrackParticles()), # Not sure if this should be ResolvedLargeD0TrackParticles or ResolvedLargeD0Tracks + convertTrackParticles(getRecTrackParticleNameIfInFile(InDetKeys.ResolvedLargeD0TrackParticles()), # TODO: Not sure if this should be ResolvedLargeD0TrackParticles or ResolvedLargeD0Tracks -RN InDetKeys.ResolvedLargeD0TrackParticlesTruth(), InDetKeys.xAODLargeD0TrackParticleContainer(), topSequence)