Replace TrajectoryBuilder parameter with TrajectoryBuilderPSet

And leave the original TrajectoryBuilder (cms.string) parameter to the
EDProducer cfi files.

Requested by @Martin-Grunewald for migrating the configuration changes
to ConfDB.

RecoEgamma/EgammaElectronProducers/python/gsfElectronCkfTrackCandidateMaker_cff.py

@@ -22,7 +22,7 @@
 from RecoEgamma.EgammaElectronProducers.fwdGsfElectronPropagator_cff import *
 
 egammaCkfTrackCandidates.src = cms.InputTag('ecalDrivenElectronSeeds')
-egammaCkfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'TrajectoryBuilderForPixelMatchGsfElectrons'
+egammaCkfTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'TrajectoryBuilderForPixelMatchGsfElectrons'
 egammaCkfTrackCandidates.SeedLabel = cms.InputTag('')
 egammaCkfTrackCandidates.TrajectoryCleaner = 'TrajectoryCleanerBySharedHits'
 egammaCkfTrackCandidates.NavigationSchool = 'SimpleNavigationSchool'

RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py

@@ -70,7 +70,8 @@
     RecHitSeverityToBeExcludedEE = cleanedHybridSuperClusters.RecHitSeverityToBeExcluded,
 
     fractionShared = cms.double(0.5),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('TrajectoryBuilderForConversions')),
+    TrajectoryBuilder = cms.string('TrajectoryBuilderForConversions'),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('TrajectoryBuilderForConversions')),
     TransientInitialStateEstimatorParameters = cms.PSet(
         propagatorAlongTISE = cms.string('alongMomElePropagator'),
         propagatorOppositeTISE = cms.string('oppositeToMomElePropagator'),

RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc

@@ -53,7 +53,7 @@ namespace {
 }
 
 ConversionTrackCandidateProducer::ConversionTrackCandidateProducer(const edm::ParameterSet& config) : 
-  theTrajectoryBuilder_(createBaseCkfTrajectoryBuilder(config.getParameter<edm::ParameterSet>("TrajectoryBuilder"), consumesCollector())),
+  theTrajectoryBuilder_(createBaseCkfTrajectoryBuilder(config.getParameter<edm::ParameterSet>("TrajectoryBuilderPSet"), consumesCollector())),
   theNavigationSchool_(0), 
   theOutInSeedFinder_(new OutInConversionSeedFinder(config)),
   theOutInTrackFinder_(new OutInConversionTrackFinder(config, theTrajectoryBuilder_.get())),

RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py

@@ -54,7 +54,7 @@
 
 hiRegitMuDetachedTripletStepTrackCandidates        =  RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuDetachedTripletStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMuDetachedTripletStepTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuDetachedTripletStepTrajectoryBuilder'))
     )
 
 # fitting: feed new-names

RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py

@@ -63,7 +63,7 @@
 # track candidates
 hiRegitMuInitialStepTrackCandidates        =   RecoHI.HiTracking.hiRegitInitialStep_cff.hiRegitInitialStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuInitialStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryBuilder')),
     maxNSeeds         = cms.uint32(1000000)
     )
 

RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py

@@ -54,7 +54,7 @@
 # track candidates
 hiRegitMuLowPtTripletStepTrackCandidates        =  RecoHI.HiTracking.hiRegitLowPtTripletStep_cff.hiRegitLowPtTripletStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuLowPtTripletStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMuLowPtTripletStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuLowPtTripletStepTrajectoryBuilder')),
     maxNSeeds         = cms.uint32(1000000)
     )
 

RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py

@@ -81,7 +81,7 @@
 
 hiRegitMuMixedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuMixedTripletStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMuMixedTripletStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuMixedTripletStepTrajectoryBuilder')),
     maxNSeeds         = cms.uint32(1000000)
     )
 

RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py

@@ -55,7 +55,7 @@
 
 hiRegitMuPixelLessStepTrackCandidates        =  RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuPixelLessStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMuPixelLessStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuPixelLessStepTrajectoryBuilder')),
     maxNSeeds         = cms.uint32(1000000)
     )
 

RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py

@@ -61,7 +61,7 @@
 # trackign candidate
 hiRegitMuPixelPairStepTrackCandidates        = RecoHI.HiTracking.hiRegitPixelPairStep_cff.hiRegitPixelPairStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuPixelPairStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMuPixelPairStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuPixelPairStepTrajectoryBuilder')),
     maxNSeeds         = cms.uint32(1000000)
     )
 

RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py

@@ -61,7 +61,7 @@
 
 hiRegitMuTobTecStepTrackCandidates        =  RecoTracker.IterativeTracking.TobTecStep_cff.tobTecStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMuTobTecStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMuTobTecStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMuTobTecStepTrajectoryBuilder')),
     maxNSeeds         = cms.uint32(1000000)
     )
 

RecoHI/HiTracking/python/HICkfTrackCandidates_cff.py

@@ -19,7 +19,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 hiPrimTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
 	TrajectoryCleaner = 'TrajectoryCleanerBySharedSeeds',
-	TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('CkfTrajectoryBuilder')), #instead of GroupedCkfTrajectoryBuilder
+	TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('CkfTrajectoryBuilder')), #instead of GroupedCkfTrajectoryBuilder
 	src = 'hiPixelTrackSeeds', 
 	RedundantSeedCleaner = 'none',
 	doSeedingRegionRebuilding = False 

RecoHI/HiTracking/python/hiMixedTripletStep_cff.py

@@ -155,7 +155,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 hiMixedTripletTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('hiMixedTripletSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiMixedTripletTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiMixedTripletTrajectoryBuilder')),
     doSeedingRegionRebuilding = True,
     useHitsSplitting = True
     )

RecoHI/HiTracking/python/hiPixelPairStep_cff.py

@@ -84,7 +84,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 hiPixelPairTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('hiPixelPairSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiPixelPairTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiPixelPairTrajectoryBuilder'))
     )
 
 

RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py

@@ -55,7 +55,7 @@
 
 hiRegitDetachedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitDetachedTripletStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitDetachedTripletStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitDetachedTripletStepTrajectoryBuilder')),
     maxNSeeds=100000
     )
 

RecoHI/HiTracking/python/hiRegitInitialStep_cff.py

@@ -51,7 +51,7 @@
 # track candidates
 hiRegitInitialStepTrackCandidates        =  RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitInitialStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitInitialStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitInitialStepTrajectoryBuilder')),
     maxNSeeds = 100000
     )
 

RecoHI/HiTracking/python/hiRegitLowPtTripletStep_cff.py

@@ -57,7 +57,7 @@
 # track candidates
 hiRegitLowPtTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.LowPtTripletStep_cff.lowPtTripletStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitLowPtTripletStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitLowPtTripletStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitLowPtTripletStepTrajectoryBuilder')),
     maxNSeeds = 100000
     )
 

RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py

@@ -78,7 +78,7 @@
 
 hiRegitMixedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitMixedTripletStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitMixedTripletStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitMixedTripletStepTrajectoryBuilder')),
     maxNSeeds = 100000
     )
 

RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py

@@ -55,7 +55,7 @@
 # trackign candidate
 hiRegitPixelPairStepTrackCandidates        =  RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrackCandidates.clone(
     src               = cms.InputTag('hiRegitPixelPairStepSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiRegitPixelPairStepTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitPixelPairStepTrajectoryBuilder')),
     maxNSeeds = 100000
     )
 

RecoHI/HiTracking/python/hiSecondPixelTripletStep_cff.py

@@ -85,7 +85,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 hiSecondPixelTripletTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('hiSecondPixelTripletSeeds'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('hiSecondPixelTripletTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiSecondPixelTripletTrajectoryBuilder')),
     doSeedingRegionRebuilding = True,
     useHitsSplitting = True
     )

RecoParticleFlow/PFTracking/python/convBrem_cff.py

@@ -27,7 +27,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 convTkCand = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone()
 convTkCand.src = 'convBremSeeds'
-convTkCand.TrajectoryBuilder.refToPSet_ = 'convTrajectoryBuilder'
+convTkCand.TrajectoryBuilderPSet.refToPSet_ = 'convTrajectoryBuilder'
 
 
 ##TRACKS

RecoParticleFlow/PFTracking/python/nuclear_cff.py

@@ -13,7 +13,7 @@
 nuclear = cms.Sequence(firstnuclearSeed*firstnuclearTrackCandidates*firstnuclearWithMaterialTracks*firstnuclearInteractionMaker)
 firstnuclearSeed.producer = 'generalTracks'
 firstnuclearTrackCandidates.src = 'firstnuclearSeed'
-firstnuclearTrackCandidates.TrajectoryBuilder.refToPSet_ = 'nuclearCkfTrajectoryBuilder'
+firstnuclearTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'nuclearCkfTrajectoryBuilder'
 firstnuclearTrackCandidates.RedundantSeedCleaner = 'none'
 firstnuclearWithMaterialTracks.src = 'firstnuclearTrackCandidates'
 firstnuclearInteractionMaker.primaryProducer = 'generalTracks'

RecoPixelVertexing/PixelLowPtUtilities/python/secondStep_cff.py

@@ -75,7 +75,7 @@
 # Secondary track candidates
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 secoTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone()
-secoTrackCandidates.TrajectoryBuilder.refToPSet_ = 'secondCkfTrajectoryBuilder'
+secoTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'secondCkfTrajectoryBuilder'
 secoTrackCandidates.TrajectoryCleaner    = 'TrajectoryCleanerBySharedSeeds'
 secoTrackCandidates.src                  = 'secoSeeds'
 secoTrackCandidates.RedundantSeedCleaner = 'none'

RecoPixelVertexing/PixelLowPtUtilities/python/thirdStep_cff.py

@@ -90,7 +90,7 @@
 # Tertiary track candidates
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 tertTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone()
-tertTrackCandidates.TrajectoryBuilder.refToPSet_ = 'thirdCkfTrajectoryBuilder'
+tertTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'thirdCkfTrajectoryBuilder'
 tertTrackCandidates.TrajectoryCleaner    = 'TrajectoryCleanerBySharedSeeds'
 tertTrackCandidates.src                  = 'tertSeeds'
 tertTrackCandidates.RedundantSeedCleaner = 'none'

RecoTracker/CkfPattern/python/CkfTrackCandidatesBHM_cff.py

@@ -27,5 +27,5 @@
 beamhaloTrackCandidates.NavigationSchool = 'BeamHaloNavigationSchool'
 beamhaloTrackCandidates.TransientInitialStateEstimatorParameters.propagatorAlongTISE = 'BeamHaloPropagatorAlong'
 beamhaloTrackCandidates.TransientInitialStateEstimatorParameters.propagatorOppositeTISE = 'BeamHaloPropagatorOpposite'
-beamhaloTrackCandidates.TrajectoryBuilder.refToPSet_ = 'CkfTrajectoryBuilderBeamHalo'
+beamhaloTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'CkfTrajectoryBuilderBeamHalo'
 

RecoTracker/CkfPattern/python/CkfTrackCandidatesNoOverlaps_cff.py

@@ -10,5 +10,5 @@
 from RecoTracker.CkfPattern.CkfTrackCandidates_cfi import *
 # generate CTF track candidates ############
 ckfTrackCandidatesNoOverlaps = copy.deepcopy(ckfTrackCandidates)
-ckfTrackCandidatesNoOverlaps.TrajectoryBuilder.refToPSet_ = 'CkfTrajectoryBuilder'
+ckfTrackCandidatesNoOverlaps.TrajectoryBuilderPSet.refToPSet_ = 'CkfTrajectoryBuilder'
 

RecoTracker/CkfPattern/python/CkfTrackCandidatesP5_cff.py

@@ -17,7 +17,7 @@
 # generate CTF track candidates ############
 ckfTrackCandidatesP5 = copy.deepcopy(ckfTrackCandidates)
 ckfTrackCandidatesP5.NavigationSchool = 'CosmicNavigationSchool'
-ckfTrackCandidatesP5.TrajectoryBuilder.refToPSet_ = 'GroupedCkfTrajectoryBuilderP5'
+ckfTrackCandidatesP5.TrajectoryBuilderPSet.refToPSet_ = 'GroupedCkfTrajectoryBuilderP5'
 #replace ckfTrackCandidatesP5.TrajectoryBuilder        = "CkfTrajectoryBuilderP5"
 ckfTrackCandidatesP5.src = cms.InputTag('combinatorialcosmicseedfinderP5')
 

RecoTracker/CkfPattern/python/CkfTrackCandidatesPixelLess_cff.py

@@ -10,7 +10,7 @@
 # generate CTF track candidates ############
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi 
 ckfTrackCandidatesPixelLess = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('GroupedCkfTrajectoryBuilder')),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('GroupedCkfTrajectoryBuilder')),
     src = cms.InputTag('globalPixelLessSeeds')
     )
 

RecoTracker/CkfPattern/python/CkfTrackCandidates_cfi.py

@@ -21,7 +21,8 @@
     SimpleMagneticField = cms.string(''),                                    
 #    SimpleMagneticField = cms.string('ParabolicMf'), # parabolic magnetic field
     NavigationSchool = cms.string('SimpleNavigationSchool'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('GroupedCkfTrajectoryBuilder')),
+    TrajectoryBuilder = cms.string('GroupedCkfTrajectoryBuilder'),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('GroupedCkfTrajectoryBuilder')),
     TransientInitialStateEstimatorParameters = cms.PSet(
         propagatorAlongTISE = cms.string('PropagatorWithMaterial'),
         propagatorOppositeTISE = cms.string('PropagatorWithMaterialOpposite'),

RecoTracker/CkfPattern/python/CkfTrajectories_cfi.py

@@ -19,7 +19,8 @@
     #bool   seedCleaning         = false
     src = cms.InputTag('globalMixedSeeds'),
     NavigationSchool = cms.string('SimpleNavigationSchool'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('GroupedCkfTrajectoryBuilder')),
+    TrajectoryBuilder = cms.string('GroupedCkfTrajectoryBuilder'),
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('GroupedCkfTrajectoryBuilder')),
     # nested parameter set for TransientInitialStateEstimator
     TransientInitialStateEstimatorParameters = cms.PSet(
        propagatorAlongTISE = cms.string('PropagatorWithMaterial'),

RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc

@@ -61,7 +61,7 @@ namespace cms{
     cleanTrajectoryAfterInOut(conf.getParameter<bool>("cleanTrajectoryAfterInOut")),
     reverseTrajectories(conf.existsAs<bool>("reverseTrajectories") && conf.getParameter<bool>("reverseTrajectories")),
     theMaxNSeeds(conf.getParameter<unsigned int>("maxNSeeds")),
-    theTrajectoryBuilder(createBaseCkfTrajectoryBuilder(conf.getParameter<edm::ParameterSet>("TrajectoryBuilder"), iC)),
+    theTrajectoryBuilder(createBaseCkfTrajectoryBuilder(conf.getParameter<edm::ParameterSet>("TrajectoryBuilderPSet"), iC)),
     theTrajectoryCleanerName(conf.getParameter<std::string>("TrajectoryCleaner")), 
     theTrajectoryCleaner(0),
     theInitialState(new TransientInitialStateEstimator(conf.getParameter<ParameterSet>("TransientInitialStateEstimatorParameters"))),

RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py

@@ -104,7 +104,7 @@
 GroupedCkfTrajectoryBuilderP5Top = copy.deepcopy(GroupedCkfTrajectoryBuilderP5)
 GroupedCkfTrajectoryBuilderP5Top.MeasurementTrackerName = cms.string('MeasurementTrackerTop')
 ckfTrackCandidatesP5Top = copy.deepcopy(ckfTrackCandidatesP5)
-ckfTrackCandidatesP5Top.TrajectoryBuilder.refToPSet_ = 'GroupedCkfTrajectoryBuilderP5Top'
+ckfTrackCandidatesP5Top.TrajectoryBuilderPSet.refToPSet_ = 'GroupedCkfTrajectoryBuilderP5Top'
 ckfTrackCandidatesP5Top.NavigationSchool   = 'CosmicNavigationSchool'
 ckfTrackCandidatesP5Top.src       = 'combinedP5SeedsForCTFTop' #ok for 32X
 #ckfTrackCandidatesP5Top.SeedProducer       = 'combinedP5SeedsForCTFTop' #ok for 22X
@@ -197,7 +197,7 @@
 GroupedCkfTrajectoryBuilderP5Bottom = copy.deepcopy(GroupedCkfTrajectoryBuilderP5)
 GroupedCkfTrajectoryBuilderP5Bottom.MeasurementTrackerName = cms.string('MeasurementTrackerBottom')
 ckfTrackCandidatesP5Bottom = copy.deepcopy(ckfTrackCandidatesP5)
-ckfTrackCandidatesP5Bottom.TrajectoryBuilder.refToPSet_ = 'GroupedCkfTrajectoryBuilderP5Bottom'
+ckfTrackCandidatesP5Bottom.TrajectoryBuilderPSet.refToPSet_ = 'GroupedCkfTrajectoryBuilderP5Bottom'
 ckfTrackCandidatesP5Bottom.NavigationSchool   = 'CosmicNavigationSchool'
 ckfTrackCandidatesP5Bottom.src       = 'combinedP5SeedsForCTFBottom' #ok for 32X
 #ckfTrackCandidatesP5Bottom.SeedProducer       = 'combinedP5SeedsForCTFBottom' #ok for 22X

RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py

@@ -215,7 +215,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 conv2TrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('photonConvTrajSeedFromQuadruplets:conv2SeedCandidates'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('conv2CkfTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('conv2CkfTrajectoryBuilder'))
 )
 
 import TrackingTools.TrackFitters.RungeKuttaFitters_cff

RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py

@@ -230,7 +230,7 @@
 convTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('photonConvTrajSeedFromSingleLeg:convSeedCandidates'),
     clustersToSkip = cms.InputTag('convClusters'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
 )
 
 import TrackingTools.TrackFitters.RungeKuttaFitters_cff

RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py

@@ -230,7 +230,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 convTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('photonConvTrajSeedFromSingleLeg:convSeedCandidates'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
 )
 
 import TrackingTools.TrackFitters.RungeKuttaFitters_cff

RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py

@@ -230,7 +230,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 convTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('photonConvTrajSeedFromSingleLeg:convSeedCandidates'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
 )
 
 import TrackingTools.TrackFitters.RungeKuttaFitters_cff

RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cff.py

@@ -229,7 +229,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 convTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('photonConvTrajSeedFromQuadruplets:convSeedCandidates'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
 )
 
 # TRACK FITTING

RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cff.py

@@ -238,7 +238,7 @@
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
 convTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = cms.InputTag('photonConvTrajSeedFromSingleLeg:convSeedCandidates'),
-    TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
+    TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder'))
 )
 
 # TRACK FITTING