Merge pull request #7485 from lveldere/fastsim-fix-track-algo-flags

FastSim: restore trackalgo flags, broken since #7105
cms-sw · Feb 1, 2015 · fc79883 · fc79883
2 parents 35c75e3 + 2402184
commit fc79883
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/FastSimulation/Tracking/python/IterativeDetachedTripletStep_cff.py b/FastSimulation/Tracking/python/IterativeDetachedTripletStep_cff.py
@@ -41,7 +41,7 @@
 iterativeDetachedTripletTracks.TTRHBuilder = 'WithoutRefit'
 iterativeDetachedTripletTracks.Fitter = 'KFFittingSmootherSecond'
 iterativeDetachedTripletTracks.Propagator = 'PropagatorWithMaterial'
-iterativeDetachedTripletTracks.trackAlgo = cms.untracked.uint32(7) # detachedTripletStep
+iterativeDetachedTripletTracks.AlgorithmName = cms.string('detachedTripletStep')
 
 # simtrack id producer
 detachedTripletStepIds = cms.EDProducer("SimTrackIdProducer",

diff --git a/FastSimulation/Tracking/python/IterativeInitialStep_cff.py b/FastSimulation/Tracking/python/IterativeInitialStep_cff.py
@@ -42,7 +42,7 @@
 iterativeInitialTracks.TTRHBuilder = 'WithoutRefit'
 iterativeInitialTracks.Fitter = 'KFFittingSmootherWithOutlierRejection'
 iterativeInitialTracks.Propagator = 'PropagatorWithMaterial'
-iterativeInitialTracks.trackAlgo = cms.untracked.uint32(4) # initialStep
+iterativeInitialTracks.AlgorithmName = cms.string('initialStep')
 
 #vertices
 import RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi

diff --git a/FastSimulation/Tracking/python/IterativeLowPtTripletStep_cff.py b/FastSimulation/Tracking/python/IterativeLowPtTripletStep_cff.py
@@ -42,7 +42,7 @@
 iterativeLowPtTripletTracksWithTriplets.TTRHBuilder = 'WithoutRefit'
 iterativeLowPtTripletTracksWithTriplets.Fitter = 'KFFittingSmootherSecond'
 iterativeLowPtTripletTracksWithTriplets.Propagator = 'PropagatorWithMaterial'
-iterativeLowPtTripletTracksWithTriplets.trackAlgo = cms.untracked.uint32(5) # lowPtTripletStep
+iterativeLowPtTripletTracksWithTriplets.AlgorithmName = cms.string('lowPtTripletStep')
 
 
 # simtrack id producer

diff --git a/FastSimulation/Tracking/python/IterativeMixedTripletStep_cff.py b/FastSimulation/Tracking/python/IterativeMixedTripletStep_cff.py
@@ -45,7 +45,7 @@
 ##iterativeMixedTripletStepTracks.Fitter = 'KFFittingSmootherWithOutlierRejection'
 iterativeMixedTripletStepTracks.Fitter = 'KFFittingSmootherThird'
 iterativeMixedTripletStepTracks.Propagator = 'PropagatorWithMaterial'
-iterativeMixedTripletStepTracks.trackAlgo = cms.untracked.uint32(8)
+iterativeMixedTripletStepTracks.AlgorithmName = cms.string('mixedTripletStep')
 
 # simtrack id producer
 mixedTripletStepIds = cms.EDProducer("SimTrackIdProducer",

diff --git a/FastSimulation/Tracking/python/IterativePixelLessStep_cff.py b/FastSimulation/Tracking/python/IterativePixelLessStep_cff.py
@@ -48,7 +48,7 @@
 ##iterativePixelLessTracks.Fitter = 'KFFittingSmootherWithOutlierRejection'
 iterativePixelLessTracks.Fitter = 'KFFittingSmootherFourth'
 iterativePixelLessTracks.Propagator = 'PropagatorWithMaterial'
-iterativePixelLessTracks.trackAlgo = cms.untracked.uint32(9)
+iterativePixelLessTracks.AlgorithmName = cms.string('pixelLessStep')
 
 # simtrack id producer
 pixelLessStepIds = cms.EDProducer("SimTrackIdProducer",

diff --git a/FastSimulation/Tracking/python/IterativePixelPairStep_cff.py b/FastSimulation/Tracking/python/IterativePixelPairStep_cff.py
@@ -42,7 +42,7 @@
 iterativePixelPairTracks.TTRHBuilder = 'WithoutRefit'
 iterativePixelPairTracks.Fitter = 'KFFittingSmootherSecond'
 iterativePixelPairTracks.Propagator = 'PropagatorWithMaterial'
-iterativePixelPairTracks.trackAlgo = cms.untracked.uint32(6) # pixelPairStep
+iterativePixelPairTracks.AlgorithmName = cms.string('pixelPairStep')
 
 # simtrack id producer
 pixelPairStepIds = cms.EDProducer("SimTrackIdProducer",

diff --git a/FastSimulation/Tracking/python/IterativeTobTecStep_cff.py b/FastSimulation/Tracking/python/IterativeTobTecStep_cff.py
@@ -49,7 +49,7 @@
 iterativeTobTecTracks.TTRHBuilder = 'WithoutRefit'
 iterativeTobTecTracks.Fitter = 'KFFittingSmootherFifth'
 iterativeTobTecTracks.Propagator = 'PropagatorWithMaterial'
-iterativeTobTecTracks.trackAlgo = cms.untracked.uint32(10) # tobTecStep
+iterativeTobTecTracks.AlgorithmName = cms.string('tobTecStep')
 
 # simtrack id producer
 tobTecStepIds = cms.EDProducer("SimTrackIdProducer",