Skip to content

Commit

Permalink
Move 'clustersToSkip' from TrajectoryBuilder to CkfTrackCandidateMake…
Browse files Browse the repository at this point in the history 
…r in Phase1 tracking configuration

Following what was done in cms-sw#1063.
  • Loading branch information
@makortel @ianna
makortel authored and ianna committed Feb 23, 2015
1 parent 6d99e8a commit 9d1664e
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 14 deletions.
1 change: 0 additions & 1 deletion RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py
View file
Expand Up @@ -40,7 +40,6 @@
convCkfTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryFilter')),
minNrOfHitsForRebuild = 3,
clustersToSkip = cms.InputTag('convClusters'),
maxCand = 2
)

Expand Down
1 change: 0 additions & 1 deletion RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py
View file
Expand Up @@ -39,7 +39,6 @@
convCkfTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryFilter')),
minNrOfHitsForRebuild = 3,
clustersToSkip = cms.InputTag('convClusters'),
maxCand = 2
)

Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py
View file
Expand Up @@ -96,7 +96,6 @@
detachedQuadStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('detachedQuadStepClusters'),
maxCand = 2,
alwaysUseInvalidHits = False,
estimator = cms.string('detachedQuadStepChi2Est'),
Expand All @@ -108,6 +107,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
detachedQuadStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('detachedQuadStepSeeds'),
clustersToSkip = cms.InputTag('detachedQuadStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py
View file
Expand Up @@ -73,7 +73,6 @@
highPtTripletStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('highPtTripletStepClusters'),
maxCand = 4,
estimator = cms.string('highPtTripletStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -86,6 +85,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
highPtTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('highPtTripletStepSeeds'),
clustersToSkip = cms.InputTag('highPtTripletStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py
View file
Expand Up @@ -83,7 +83,6 @@
lowPtQuadStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('lowPtQuadStepClusters'),
maxCand = 4,
estimator = cms.string('lowPtQuadStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -96,6 +95,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
lowPtQuadStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('lowPtQuadStepSeeds'),
clustersToSkip = cms.InputTag('lowPtQuadStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py
View file
Expand Up @@ -73,7 +73,6 @@
lowPtTripletStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('lowPtTripletStepClusters'),
maxCand = 4,
estimator = cms.string('lowPtTripletStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -86,6 +85,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
lowPtTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('lowPtTripletStepSeeds'),
clustersToSkip = cms.InputTag('lowPtTripletStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py
View file
Expand Up @@ -74,7 +74,6 @@
pixelPairStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('pixelPairStepClusters'),
maxCand = 3,
estimator = cms.string('pixelPairStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -85,6 +84,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
pixelPairStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('pixelPairStepSeeds'),
clustersToSkip = cms.InputTag('pixelPairStepClusters'),
TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py
View file
Expand Up @@ -97,7 +97,6 @@
detachedQuadStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('detachedQuadStepClusters'),
maxCand = 2,
alwaysUseInvalidHits = False,
estimator = cms.string('detachedQuadStepChi2Est'),
Expand All @@ -109,6 +108,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
detachedQuadStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('detachedQuadStepSeeds'),
clustersToSkip = cms.InputTag('detachedQuadStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py
View file
Expand Up @@ -73,7 +73,6 @@
highPtTripletStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('highPtTripletStepClusters'),
maxCand = 4,
estimator = cms.string('highPtTripletStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -86,6 +85,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
highPtTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('highPtTripletStepSeeds'),
clustersToSkip = cms.InputTag('highPtTripletStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py
View file
Expand Up @@ -80,7 +80,6 @@
lowPtQuadStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('lowPtQuadStepClusters'),
maxCand = 4,
estimator = cms.string('lowPtQuadStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -93,6 +92,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
lowPtQuadStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('lowPtQuadStepSeeds'),
clustersToSkip = cms.InputTag('lowPtQuadStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py
View file
Expand Up @@ -77,7 +77,6 @@
lowPtTripletStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('lowPtTripletStepClusters'),
maxCand = 4,
estimator = cms.string('lowPtTripletStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -90,6 +89,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
lowPtTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('lowPtTripletStepSeeds'),
clustersToSkip = cms.InputTag('lowPtTripletStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py
View file
Expand Up @@ -142,7 +142,6 @@
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryFilter')),
propagatorAlong = cms.string('mixedTripletStepPropagator'),
propagatorOpposite = cms.string('mixedTripletStepPropagatorOpposite'),
clustersToSkip = cms.InputTag('mixedTripletStepClusters'),
maxCand = 2,
estimator = cms.string('mixedTripletStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -153,6 +152,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
mixedTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('mixedTripletStepSeeds'),
clustersToSkip = cms.InputTag('mixedTripletStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
#onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py
View file
Expand Up @@ -74,7 +74,6 @@
pixelPairStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('pixelPairStepClusters'),
maxCand = 3,
estimator = cms.string('pixelPairStepChi2Est'),
maxDPhiForLooperReconstruction = cms.double(2.0),
Expand All @@ -85,6 +84,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
pixelPairStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('pixelPairStepSeeds'),
clustersToSkip = cms.InputTag('pixelPairStepClusters'),
TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py
View file
Expand Up @@ -102,7 +102,6 @@
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
tobTecStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
clustersToSkip = cms.InputTag('tobTecStepClusters'),
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryFilter')),
inOutTrajectoryFilter = cms.PSet(refToPSet_ = cms.string('tobTecStepInOutTrajectoryFilter')),
useSameTrajFilter = False,
Expand All @@ -119,6 +118,7 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
tobTecStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = cms.InputTag('tobTecStepSeeds'),
clustersToSkip = cms.InputTag('tobTecStepClusters'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
Expand Down

0 comments on commit 9d1664e

Please sign in to comment.