Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,24 @@
oldClusterRemovalInfo = 'detachedQuadStepClusters',
overrideTrkQuals = 'detachedQuadStepSelector:detachedQuadStepTrk'
))
from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(convClusters,
trajectories = "highPtTripletStepTracks",
oldClusterRemovalInfo = "highPtTripletStepClusters",
overrideTrkQuals = "highPtTripletStepSelector:highPtTripletStep"
)
(trackingIters01 & trackingPhase1).toModify(convClusters,
trajectories = 'highPtTripletStepTracks',
oldClusterRemovalInfo = 'highPtTripletStepClusters',
trackClassifier = 'highPtTripletStep:QualityMasks',
)

(trackingIters01 & trackingPhase2PU140).toModify(convClusters,
trajectories = "highPtTripletStepTracks",
oldClusterRemovalInfo = "highPtTripletStepClusters",
overrideTrkQuals = "highPtTripletStepSelector:highPtTripletStep"
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
(trackingIters01 & trackingPhase2PU140 & trackingLST).toModify(convClusters,
overrideTrkQuals = ""
)
overrideTrkQuals = ""
)

_convLayerPairsStripOnlyLayers = ['TIB1+TID1_pos',
'TIB1+TID1_neg',
Expand Down
24 changes: 15 additions & 9 deletions RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,21 @@ def _extend_displacedGeneral(x):
)
)
from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(earlyGeneralTracks,
TrackProducers = ['initialStepTracks', 'highPtTripletStepTracks'],
hasSelector = [1,1],
indivShareFrac = [1,0.16],
selectedTrackQuals = ['initialStepSelector:initialStep',
'highPtTripletStepSelector:highPtTripletStep'
],
setsToMerge = {0: dict(tLists = [0,1])}
)
(trackingPhase2PU140 & trackingIters01).toModify(earlyGeneralTracks,
TrackProducers = ['initialStepTracks', 'highPtTripletStepTracks'],
hasSelector = [1,1],
indivShareFrac = [1,0.16],
selectedTrackQuals = ['initialStepSelector:initialStep',
'highPtTripletStepSelector:highPtTripletStep'
],
setsToMerge = {0: dict(tLists = [0,1])}
)

(~trackingPhase2PU140 & trackingIters01).toModify(earlyGeneralTracks,
trackProducers = ['initialStepTracks', 'highPtTripletStepTracks'],
inputClassifiers = cms.vstring('initialStep','highPtTripletStep')
)

from Configuration.ProcessModifiers.vectorHits_cff import vectorHits
def _extend_pixelLess(x):
x.TrackProducers += ['pixelLessStepTracks']
Expand Down
34 changes: 30 additions & 4 deletions RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters")
)

from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(initialStepSeedClusterMask,
oldClusterRemovalInfo = cms.InputTag('highPtTripletStepClusters')
)

from RecoLocalTracker.SubCollectionProducers.seedClusterRemoverPhase2_cfi import seedClusterRemoverPhase2
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toReplaceWith(initialStepSeedClusterMask, seedClusterRemoverPhase2.clone(
Expand Down Expand Up @@ -83,6 +88,12 @@
'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg'
]
trackingPhase1.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1)

(trackingIters01 & ~trackingPhase2PU140).toModify(tripletElectronSeedLayers,
BPix = dict(skipClusters = cms.InputTag('highPtTripletStepSeedClusterMask')),
FPix = dict(skipClusters = cms.InputTag('highPtTripletStepSeedClusterMask'))
)

trackingPhase2PU140.toModify(tripletElectronSeedLayers,
layerList = _layerListForPhase1,
BPix = dict(skipClusters = 'pixelPairStepSeedClusterMask'),
Expand Down Expand Up @@ -134,6 +145,11 @@
trajectories = 'tripletElectronSeeds',
oldClusterRemovalInfo = cms.InputTag('pixelLessStepSeedClusterMask')
)

(trackingIters01 & ~trackingPhase2PU140).toModify(tripletElectronClusterMask,
oldClusterRemovalInfo = cms.InputTag('highPtTripletStepSeedClusterMask')
)

trackingPhase2PU140.toReplaceWith(tripletElectronClusterMask, seedClusterRemoverPhase2.clone(
trajectories = 'tripletElectronSeeds',
oldClusterRemovalInfo = cms.InputTag('pixelLessStepSeedClusterMask')
Expand Down Expand Up @@ -271,10 +287,10 @@
'pixelPairStepSeeds'
]
trackingPhase1.toModify(newCombinedSeeds, seedCollections = _seedCollections_Phase1)
trackingPhase2PU140.toModify(newCombinedSeeds,
seedCollections = ['initialStepSeeds',
'highPtTripletStepSeeds',
'tripletElectronSeeds'] )
(trackingPhase2PU140 | trackingIters01).toModify(newCombinedSeeds,
seedCollections = ['initialStepSeeds',
'highPtTripletStepSeeds',
'tripletElectronSeeds'] )

from Configuration.Eras.Modifier_fastSim_cff import fastSim
from FastSimulation.Tracking.ElectronSeeds_cff import _newCombinedSeeds
Expand Down Expand Up @@ -303,6 +319,16 @@
_electronSeedsSeqTask_Phase1 = electronSeedsSeqTask.copy()
_electronSeedsSeqTask_Phase1.replace(pixelPairStepSeedClusterMask, detachedTripletStepSeedClusterMask)
trackingPhase1.toReplaceWith(electronSeedsSeqTask, _electronSeedsSeqTask_Phase1 )
trackingIters01.toReplaceWith(electronSeedsSeqTask, cms.Task(
initialStepSeedClusterMask,
highPtTripletStepSeedClusterMask,
tripletElectronSeedLayers,
tripletElectronTrackingRegions,
tripletElectronHitDoublets,
tripletElectronHitTriplets,
tripletElectronSeeds,
newCombinedSeeds
))
trackingPhase2PU140.toReplaceWith(electronSeedsSeqTask, cms.Task(
initialStepSeedClusterMask,
highPtTripletStepSeedClusterMask,
Expand Down
9 changes: 7 additions & 2 deletions RecoTracker/IterativeTracking/python/iterativeTkConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,14 @@

from Configuration.ProcessModifiers.displacedTracking_cff import displacedTracking
displacedTracking.toModify(_iterations_trackingPhase1, func=lambda x: x.append('DisplacedGeneralStep'))

_iterations_trackingPhase1.append('JetCoreRegionalStep')

from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(
_iterations_trackingPhase1,
func=lambda x: x.clear() or x.extend(["InitialStep", "HighPtTripletStep"])
)

_iterations_trackingPhase2PU140_VS = cms.PSet(names = cms.vstring(
"InitialStep",
"HighPtTripletStep",
Expand All @@ -63,8 +68,8 @@
))
from Configuration.ProcessModifiers.vectorHits_cff import vectorHits
vectorHits.toModify(_iterations_trackingPhase2PU140_VS.names, func=lambda x: x.append('PixelLessStep'))
from Configuration.ProcessModifiers.trackingIters01_cff import trackingIters01
trackingIters01.toModify(_iterations_trackingPhase2PU140_VS, names = ["InitialStep", "HighPtTripletStep"])

# apply all procModifiers before this
_iterations_trackingPhase2PU140 = _iterations_trackingPhase2PU140_VS.names.value()

Expand Down