From ff6db40eef90c2dd9e95bf56266d5155e9884833 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Tue, 8 Apr 2014 19:41:55 +0200 Subject: [PATCH] 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. --- .../python/gsfElectronCkfTrackCandidateMaker_cff.py | 2 +- .../python/conversionTrackCandidates_cfi.py | 3 ++- .../src/ConversionTrackCandidateProducer.cc | 2 +- .../HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py | 2 +- RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py | 2 +- RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py | 2 +- RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py | 2 +- RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py | 2 +- RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py | 2 +- RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py | 2 +- RecoHI/HiTracking/python/HICkfTrackCandidates_cff.py | 2 +- RecoHI/HiTracking/python/hiMixedTripletStep_cff.py | 2 +- RecoHI/HiTracking/python/hiPixelPairStep_cff.py | 2 +- RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py | 2 +- RecoHI/HiTracking/python/hiRegitInitialStep_cff.py | 2 +- RecoHI/HiTracking/python/hiRegitLowPtTripletStep_cff.py | 2 +- RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py | 2 +- RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py | 2 +- RecoHI/HiTracking/python/hiSecondPixelTripletStep_cff.py | 2 +- RecoParticleFlow/PFTracking/python/convBrem_cff.py | 2 +- RecoParticleFlow/PFTracking/python/nuclear_cff.py | 2 +- .../PixelLowPtUtilities/python/secondStep_cff.py | 2 +- .../PixelLowPtUtilities/python/thirdStep_cff.py | 2 +- RecoTracker/CkfPattern/python/CkfTrackCandidatesBHM_cff.py | 2 +- .../CkfPattern/python/CkfTrackCandidatesNoOverlaps_cff.py | 2 +- RecoTracker/CkfPattern/python/CkfTrackCandidatesP5_cff.py | 2 +- .../CkfPattern/python/CkfTrackCandidatesPixelLess_cff.py | 2 +- RecoTracker/CkfPattern/python/CkfTrackCandidates_cfi.py | 3 ++- RecoTracker/CkfPattern/python/CkfTrajectories_cfi.py | 3 ++- RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc | 2 +- RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py | 4 ++-- .../ConversionSeedGenerators/python/ConversionStep2_cff.py | 2 +- .../ConversionSeedGenerators/python/ConversionStep_cff.py | 2 +- .../python/Phase1PU140_ConversionStep_cff.py | 2 +- .../python/Phase1PU70_ConversionStep_cff.py | 2 +- ...otonConversionTrajectorySeedProducerFromQuadruplets_cff.py | 2 +- ...PhotonConversionTrajectorySeedProducerFromSingleLeg_cff.py | 2 +- ...onConversionTrajectorySeedProducerFromSingleLeg_gsf_cff.py | 2 +- .../python/PostLS1_ConversionStep_cff.py | 2 +- .../IterativeTracking/python/DetachedTripletStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/InitialStep_cff.py | 2 +- .../IterativeTracking/python/LargeD0_PixelPairStep_cff.py | 2 +- .../python/LargeD0_PixelTibTidTecStep_cff.py | 2 +- .../IterativeTracking/python/LargeD0_PixelTripletStep_cff.py | 2 +- .../IterativeTracking/python/LargeD0_TibTidTecStep_cff.py | 2 +- .../IterativeTracking/python/LargeD0_TobTecStep_cff.py | 2 +- .../IterativeTracking/python/LowPU_DetachedTripletStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/LowPU_InitialStep_cff.py | 2 +- .../IterativeTracking/python/LowPU_LowPtTripletStep_cff.py | 2 +- .../IterativeTracking/python/LowPU_MixedTripletStep_cff.py | 2 +- .../IterativeTracking/python/LowPU_PixelLessStep_cff.py | 2 +- .../IterativeTracking/python/LowPU_PixelPairStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py | 2 +- .../IterativeTracking/python/LowPtBarrelTripletStep_cff.py | 2 +- .../IterativeTracking/python/LowPtForwardTripletStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py | 4 ++-- .../python/Phase1PU140_DetachedQuadStep_cff.py | 2 +- .../python/Phase1PU140_HighPtTripletStep_cff.py | 2 +- .../IterativeTracking/python/Phase1PU140_InitialStep_cff.py | 2 +- .../IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py | 2 +- .../python/Phase1PU140_LowPtTripletStep_cff.py | 2 +- .../IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py | 2 +- .../python/Phase1PU70_DetachedQuadStep_cff.py | 2 +- .../python/Phase1PU70_HighPtTripletStep_cff.py | 2 +- .../IterativeTracking/python/Phase1PU70_InitialStep_cff.py | 2 +- .../IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py | 2 +- .../python/Phase1PU70_LowPtTripletStep_cff.py | 2 +- .../python/Phase1PU70_MixedTripletStep_cff.py | 2 +- .../IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py | 2 +- .../IterativeTracking/python/Phase1PU70_TobTecStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/PixelLessStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/PixelPairStep_cff.py | 2 +- .../IterativeTracking/python/RunI_DetachedTripletStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/RunI_InitialStep_cff.py | 2 +- .../IterativeTracking/python/RunI_LowPtTripletStep_cff.py | 2 +- .../IterativeTracking/python/RunI_MixedTripletStep_cff.py | 2 +- .../IterativeTracking/python/RunI_PixelLessStep_cff.py | 2 +- .../IterativeTracking/python/RunI_PixelPairStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py | 2 +- RecoTracker/IterativeTracking/python/TobTecStep_cff.py | 2 +- .../python/NuclearInteraction_cff.py | 2 +- SLHCUpgradeSimulations/Geometry/python/oldTracking.py | 4 ++-- .../Geometry/python/oldTracking_wtriplets.py | 2 +- SLHCUpgradeSimulations/Geometry/python/simpleTracking.py | 2 +- .../GsfTracking/python/CkfElectronCandidateMaker_cff.py | 2 +- TrackingTools/GsfTracking/python/CkfElectronCandidates_cfi.py | 2 +- 89 files changed, 95 insertions(+), 92 deletions(-) diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectronCkfTrackCandidateMaker_cff.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectronCkfTrackCandidateMaker_cff.py index c1c59a3dd596f..b866df0200432 100644 --- a/RecoEgamma/EgammaElectronProducers/python/gsfElectronCkfTrackCandidateMaker_cff.py +++ b/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' diff --git a/RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py index 8becb1f3a4b42..fd3df39effe9a 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/conversionTrackCandidates_cfi.py +++ b/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'), diff --git a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc index d3cb9e3cca353..018b9f311f6bd 100644 --- a/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc +++ b/RecoEgamma/EgammaPhotonProducers/src/ConversionTrackCandidateProducer.cc @@ -53,7 +53,7 @@ namespace { } ConversionTrackCandidateProducer::ConversionTrackCandidateProducer(const edm::ParameterSet& config) : - theTrajectoryBuilder_(createBaseCkfTrajectoryBuilder(config.getParameter("TrajectoryBuilder"), consumesCollector())), + theTrajectoryBuilder_(createBaseCkfTrajectoryBuilder(config.getParameter("TrajectoryBuilderPSet"), consumesCollector())), theNavigationSchool_(0), theOutInSeedFinder_(new OutInConversionSeedFinder(config)), theOutInTrackFinder_(new OutInConversionTrackFinder(config, theTrajectoryBuilder_.get())), diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py index 1afce54370e0c..44763a89a19fe 100644 --- a/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py +++ b/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 diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py index 84ac6bef9b355..cff26f6ad0899 100644 --- a/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py +++ b/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) ) diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py index 423b99568917b..dd85efe2c4f58 100644 --- a/RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py +++ b/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) ) diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py index 66485b54a62e8..165f0aa6c54e7 100644 --- a/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py +++ b/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) ) diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py index e5e82544d5c32..d87dc9e6be019 100644 --- a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py +++ b/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) ) diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py index 96ba9bef59bb6..2924ddaf6af16 100644 --- a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py +++ b/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) ) diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py index d0738208882f2..6dbdbab9dadf5 100644 --- a/RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py +++ b/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) ) diff --git a/RecoHI/HiTracking/python/HICkfTrackCandidates_cff.py b/RecoHI/HiTracking/python/HICkfTrackCandidates_cff.py index 49a2b8be745cd..6a5472f0162c9 100644 --- a/RecoHI/HiTracking/python/HICkfTrackCandidates_cff.py +++ b/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 diff --git a/RecoHI/HiTracking/python/hiMixedTripletStep_cff.py b/RecoHI/HiTracking/python/hiMixedTripletStep_cff.py index 873b0712c664c..b7c4434088cfe 100644 --- a/RecoHI/HiTracking/python/hiMixedTripletStep_cff.py +++ b/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 ) diff --git a/RecoHI/HiTracking/python/hiPixelPairStep_cff.py b/RecoHI/HiTracking/python/hiPixelPairStep_cff.py index ebd6f6ae86724..e5451c28d8994 100644 --- a/RecoHI/HiTracking/python/hiPixelPairStep_cff.py +++ b/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')) ) diff --git a/RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py b/RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py index ae98c0896e657..3ebd29200fd92 100644 --- a/RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py +++ b/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 ) diff --git a/RecoHI/HiTracking/python/hiRegitInitialStep_cff.py b/RecoHI/HiTracking/python/hiRegitInitialStep_cff.py index 9da935b90f8f5..4b9f8e28f7a2d 100644 --- a/RecoHI/HiTracking/python/hiRegitInitialStep_cff.py +++ b/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 ) diff --git a/RecoHI/HiTracking/python/hiRegitLowPtTripletStep_cff.py b/RecoHI/HiTracking/python/hiRegitLowPtTripletStep_cff.py index d38d7465e83c8..9fe61ae5603f1 100644 --- a/RecoHI/HiTracking/python/hiRegitLowPtTripletStep_cff.py +++ b/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 ) diff --git a/RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py b/RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py index 96e0671f280e0..78ad96779062a 100644 --- a/RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py +++ b/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 ) diff --git a/RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py b/RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py index 694010b06b5d7..e12baa3d0ece1 100644 --- a/RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py +++ b/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 ) diff --git a/RecoHI/HiTracking/python/hiSecondPixelTripletStep_cff.py b/RecoHI/HiTracking/python/hiSecondPixelTripletStep_cff.py index 1ac1f77f2cb6e..08a31046a82d7 100644 --- a/RecoHI/HiTracking/python/hiSecondPixelTripletStep_cff.py +++ b/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 ) diff --git a/RecoParticleFlow/PFTracking/python/convBrem_cff.py b/RecoParticleFlow/PFTracking/python/convBrem_cff.py index a0743477d877d..8a8dece06082b 100644 --- a/RecoParticleFlow/PFTracking/python/convBrem_cff.py +++ b/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 diff --git a/RecoParticleFlow/PFTracking/python/nuclear_cff.py b/RecoParticleFlow/PFTracking/python/nuclear_cff.py index 00c54f38bbc69..76917e91f88d9 100644 --- a/RecoParticleFlow/PFTracking/python/nuclear_cff.py +++ b/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' diff --git a/RecoPixelVertexing/PixelLowPtUtilities/python/secondStep_cff.py b/RecoPixelVertexing/PixelLowPtUtilities/python/secondStep_cff.py index 4a74ddc4c740e..207c048697f02 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/python/secondStep_cff.py +++ b/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' diff --git a/RecoPixelVertexing/PixelLowPtUtilities/python/thirdStep_cff.py b/RecoPixelVertexing/PixelLowPtUtilities/python/thirdStep_cff.py index b93e39761563a..0874b5088bb71 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/python/thirdStep_cff.py +++ b/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' diff --git a/RecoTracker/CkfPattern/python/CkfTrackCandidatesBHM_cff.py b/RecoTracker/CkfPattern/python/CkfTrackCandidatesBHM_cff.py index e5be9f2334a07..a1d7a1ea42871 100644 --- a/RecoTracker/CkfPattern/python/CkfTrackCandidatesBHM_cff.py +++ b/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' diff --git a/RecoTracker/CkfPattern/python/CkfTrackCandidatesNoOverlaps_cff.py b/RecoTracker/CkfPattern/python/CkfTrackCandidatesNoOverlaps_cff.py index e4ad1c3269453..1abfe935dc3ce 100644 --- a/RecoTracker/CkfPattern/python/CkfTrackCandidatesNoOverlaps_cff.py +++ b/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' diff --git a/RecoTracker/CkfPattern/python/CkfTrackCandidatesP5_cff.py b/RecoTracker/CkfPattern/python/CkfTrackCandidatesP5_cff.py index 0403b05a04248..14a8dbf2b0096 100644 --- a/RecoTracker/CkfPattern/python/CkfTrackCandidatesP5_cff.py +++ b/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') diff --git a/RecoTracker/CkfPattern/python/CkfTrackCandidatesPixelLess_cff.py b/RecoTracker/CkfPattern/python/CkfTrackCandidatesPixelLess_cff.py index acd884d15afe0..00d8a34d17166 100644 --- a/RecoTracker/CkfPattern/python/CkfTrackCandidatesPixelLess_cff.py +++ b/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') ) diff --git a/RecoTracker/CkfPattern/python/CkfTrackCandidates_cfi.py b/RecoTracker/CkfPattern/python/CkfTrackCandidates_cfi.py index cb15b49b37864..599d1aa5ff372 100644 --- a/RecoTracker/CkfPattern/python/CkfTrackCandidates_cfi.py +++ b/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'), diff --git a/RecoTracker/CkfPattern/python/CkfTrajectories_cfi.py b/RecoTracker/CkfPattern/python/CkfTrajectories_cfi.py index c83f56068c5d3..fa29a94073ca9 100644 --- a/RecoTracker/CkfPattern/python/CkfTrajectories_cfi.py +++ b/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'), diff --git a/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc b/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc index daccc0ed94ccc..879aa89bb497a 100644 --- a/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc +++ b/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc @@ -61,7 +61,7 @@ namespace cms{ cleanTrajectoryAfterInOut(conf.getParameter("cleanTrajectoryAfterInOut")), reverseTrajectories(conf.existsAs("reverseTrajectories") && conf.getParameter("reverseTrajectories")), theMaxNSeeds(conf.getParameter("maxNSeeds")), - theTrajectoryBuilder(createBaseCkfTrajectoryBuilder(conf.getParameter("TrajectoryBuilder"), iC)), + theTrajectoryBuilder(createBaseCkfTrajectoryBuilder(conf.getParameter("TrajectoryBuilderPSet"), iC)), theTrajectoryCleanerName(conf.getParameter("TrajectoryCleaner")), theTrajectoryCleaner(0), theInitialState(new TransientInitialStateEstimator(conf.getParameter("TransientInitialStateEstimatorParameters"))), diff --git a/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py b/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py index e77a811d65612..c778885bc9751 100644 --- a/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py +++ b/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 diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py index 2f0e011764bac..e3035cd73d852 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py +++ b/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 diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py index 1a98e59145e60..71b3f8f99b0cd 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py +++ b/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 diff --git a/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py index 40b272d386f9c..9260128b2b836 100644 --- a/RecoTracker/ConversionSeedGenerators/python/Phase1PU140_ConversionStep_cff.py +++ b/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 diff --git a/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py index d20710fd24546..3f13dd37701b9 100644 --- a/RecoTracker/ConversionSeedGenerators/python/Phase1PU70_ConversionStep_cff.py +++ b/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 diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cff.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cff.py index 39ec85ca53592..971ff29844813 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cff.py +++ b/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 diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cff.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cff.py index 1f2972f551c89..ab08ef41db390 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cff.py +++ b/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 diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_gsf_cff.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_gsf_cff.py index d7c8240398bc7..30f26c53f7e12 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_gsf_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_gsf_cff.py @@ -248,7 +248,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 diff --git a/RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py index dffb1f378aa8c..77ad9398b77b7 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PostLS1_ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/PostLS1_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 diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index c8bac8c341036..d01bbadef370f 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -87,7 +87,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('detachedTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('detachedTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index 6500ab8d59cc8..c1376de2db7be 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -67,7 +67,7 @@ highPtTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag('highPtTripletStepSeeds'), clustersToSkip = cms.InputTag('highPtTripletStepClusters'), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index d8a77d9b8e87b..7c54ddbdd54bf 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -74,7 +74,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/LargeD0_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/LargeD0_PixelPairStep_cff.py index 7db55a53c5a7c..40d143e363485 100644 --- a/RecoTracker/IterativeTracking/python/LargeD0_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LargeD0_PixelPairStep_cff.py @@ -119,7 +119,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi largeD0step2TrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = 'largeD0step2Seeds', - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('largeD0step2CkfTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('largeD0step2CkfTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True diff --git a/RecoTracker/IterativeTracking/python/LargeD0_PixelTibTidTecStep_cff.py b/RecoTracker/IterativeTracking/python/LargeD0_PixelTibTidTecStep_cff.py index 28c24524c4e89..1536d7edd408a 100644 --- a/RecoTracker/IterativeTracking/python/LargeD0_PixelTibTidTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LargeD0_PixelTibTidTecStep_cff.py @@ -124,7 +124,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi largeD0step3TrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = 'largeD0step3Seeds', - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('largeD0step3CkfTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('largeD0step3CkfTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True, diff --git a/RecoTracker/IterativeTracking/python/LargeD0_PixelTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LargeD0_PixelTripletStep_cff.py index 2df03e2e84106..23877dc7fcc79 100644 --- a/RecoTracker/IterativeTracking/python/LargeD0_PixelTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LargeD0_PixelTripletStep_cff.py @@ -97,7 +97,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi largeD0step1TrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = 'largeD0step1Seeds', - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('largeD0step1CkfTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('largeD0step1CkfTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True, diff --git a/RecoTracker/IterativeTracking/python/LargeD0_TibTidTecStep_cff.py b/RecoTracker/IterativeTracking/python/LargeD0_TibTidTecStep_cff.py index 1007db44cbca1..9c06354c049a1 100644 --- a/RecoTracker/IterativeTracking/python/LargeD0_TibTidTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LargeD0_TibTidTecStep_cff.py @@ -109,7 +109,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi largeD0step4TrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = 'largeD0step4Seeds', - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('largeD0step4CkfTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('largeD0step4CkfTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True, diff --git a/RecoTracker/IterativeTracking/python/LargeD0_TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/LargeD0_TobTecStep_cff.py index cf1e1600026d0..255125e506a84 100644 --- a/RecoTracker/IterativeTracking/python/LargeD0_TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LargeD0_TobTecStep_cff.py @@ -108,7 +108,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi largeD0step5TrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = 'largeD0step5Seeds', - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('largeD0step5CkfTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('largeD0step5CkfTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = False, diff --git a/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py index 94f855348c261..6663710963ce3 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_DetachedTripletStep_cff.py @@ -84,7 +84,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('detachedTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('detachedTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/LowPU_InitialStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_InitialStep_cff.py index 5d065247ae064..f70b21076d69e 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_InitialStep_cff.py @@ -53,7 +53,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py index 470df5ce07c00..3a741a9315767 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_LowPtTripletStep_cff.py @@ -83,7 +83,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py index ea11de098a615..a62ec87ea9a9d 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_MixedTripletStep_cff.py @@ -152,7 +152,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), #onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py index c87b2f0d56944..5d33c8721b76d 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_PixelLessStep_cff.py @@ -164,7 +164,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), #onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelLessStepTrajectoryBuilder')) + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelLessStepTrajectoryBuilder')) ) from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import trajectoryCleanerBySharedHits diff --git a/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py index 8235d4cefd319..def70bbef96a8 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_PixelPairStep_cff.py @@ -73,7 +73,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi pixelPairStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag('pixelPairStepSeeds'), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), diff --git a/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py index a1d5b6c51a75d..37f1b75eb319f 100644 --- a/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPU_TobTecStep_cff.py @@ -181,7 +181,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True diff --git a/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py index 1afde9605709a..abc757622c6a5 100644 --- a/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py @@ -84,7 +84,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtBarrelTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtBarrelTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, TransientInitialStateEstimatorParameters = cms.PSet( diff --git a/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py index de125fe444002..0cb7d9d525445 100644 --- a/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py @@ -74,7 +74,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi lowPtForwardTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag('lowPtForwardTripletStepSeeds'), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtForwardTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtForwardTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index 02be05d2eb612..4345b34c84e26 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -83,7 +83,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), clustersToSkip = cms.InputTag('lowPtTripletStepClusters'), doSeedingRegionRebuilding = True, useHitsSplitting = True diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index c023db03fcf6d..68e70323bc05a 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -163,7 +163,7 @@ numHitsForSeedCleaner = cms.int32(50), #onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py b/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py index bef721d398bc3..00bde76d9d5ec 100644 --- a/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py @@ -88,13 +88,13 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi muonSeededTrackCandidatesInOut = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag("muonSeededSeedsInOut"), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string("muonSeededTrajectoryBuilderForInOut")), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string("muonSeededTrajectoryBuilderForInOut")), TrajectoryCleaner = cms.string('muonSeededTrajectoryCleanerBySharedHits'), RedundantSeedCleaner = cms.string("none"), ) muonSeededTrackCandidatesOutIn = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag("muonSeededSeedsOutIn"), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string("muonSeededTrajectoryBuilderForOutIn")), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string("muonSeededTrajectoryBuilderForOutIn")), TrajectoryCleaner = cms.string('muonSeededTrajectoryCleanerBySharedHits'), numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(False), diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py index 9539a87312b7f..b027656f9ba33 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_DetachedQuadStep_cff.py @@ -114,7 +114,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py index a3fbd56aa7524..0d01fa2593069 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_HighPtTripletStep_cff.py @@ -91,7 +91,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_InitialStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_InitialStep_cff.py index ebc4650a59818..2266bda5b8c2f 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_InitialStep_cff.py @@ -63,7 +63,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py index 393854b861eec..8ff56164c46ca 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtQuadStep_cff.py @@ -101,7 +101,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py index 354fb58859db5..bac7ca4f66b96 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_LowPtTripletStep_cff.py @@ -91,7 +91,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py index 76f8fda70a1ef..e3c15ef740552 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU140_PixelPairStep_cff.py @@ -87,7 +87,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi pixelPairStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag('pixelPairStepSeeds'), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py index 13b5c8e3f803d..e1f59e9877d62 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_DetachedQuadStep_cff.py @@ -114,7 +114,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py index 8e6005bd34aac..2cc502bdbe5ec 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_HighPtTripletStep_cff.py @@ -91,7 +91,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_InitialStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_InitialStep_cff.py index b7714d65d58ad..f2043b6da0388 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_InitialStep_cff.py @@ -63,7 +63,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py index 9f2ed676f7b4e..7756dcfb9fcd6 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtQuadStep_cff.py @@ -101,7 +101,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py index 407e77a9e7f16..734db3cde44a3 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_LowPtTripletStep_cff.py @@ -95,7 +95,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py index 0a42bf88b7cf3..9188d1ef5e40c 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_MixedTripletStep_cff.py @@ -159,7 +159,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), #onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py index 55d557343c75f..dd5e29f6999ff 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_PixelPairStep_cff.py @@ -87,7 +87,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi pixelPairStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag('pixelPairStepSeeds'), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True) diff --git a/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py index ab8a4b480f0f5..aed5a167134ce 100644 --- a/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/Phase1PU70_TobTecStep_cff.py @@ -128,7 +128,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index 34b34a157ac8c..cbb119fad3530 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -159,7 +159,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), #onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelLessStepTrajectoryBuilder')) + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelLessStepTrajectoryBuilder')) ) from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import trajectoryCleanerBySharedHits diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index 415724b2ee2c3..6d4def5782bdb 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -81,7 +81,7 @@ pixelPairStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag('pixelPairStepSeeds'), clustersToSkip = cms.InputTag('pixelPairStepClusters'), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), diff --git a/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py index 32ab9add1c530..35512f7aa22a7 100644 --- a/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_DetachedTripletStep_cff.py @@ -84,7 +84,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('detachedTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('detachedTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/RunI_InitialStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_InitialStep_cff.py index 19a801ee6847e..5bbf0d96e0749 100644 --- a/RecoTracker/IterativeTracking/python/RunI_InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_InitialStep_cff.py @@ -54,7 +54,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('initialStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py index e3bb523a66ac9..d1f7883f2cdc3 100644 --- a/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_LowPtTripletStep_cff.py @@ -82,7 +82,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('lowPtTripletStepTrajectoryBuilder')), clustersToSkip = cms.InputTag('lowPtTripletStepClusters'), doSeedingRegionRebuilding = True, useHitsSplitting = True diff --git a/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py index fa9a91979fec4..9b9fbd8b5b77d 100644 --- a/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_MixedTripletStep_cff.py @@ -160,7 +160,7 @@ numHitsForSeedCleaner = cms.int32(50), #onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('mixedTripletStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True ) diff --git a/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py index 50fdcfc24cfef..30ebe147455e9 100644 --- a/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_PixelLessStep_cff.py @@ -103,7 +103,7 @@ ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), #onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelLessStepTrajectoryBuilder')) + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelLessStepTrajectoryBuilder')) ) from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import trajectoryCleanerBySharedHits diff --git a/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py index 2a7e3944fa679..f7001c1428677 100644 --- a/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_PixelPairStep_cff.py @@ -81,7 +81,7 @@ pixelPairStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( src = cms.InputTag('pixelPairStepSeeds'), clustersToSkip = cms.InputTag('pixelPairStepClusters'), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('pixelPairStepTrajectoryBuilder')), ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), diff --git a/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py index 5ab896e848791..c62992bc5a78d 100644 --- a/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/RunI_TobTecStep_cff.py @@ -104,7 +104,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index 27e257c1070ac..a93d6049d9685 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -178,7 +178,7 @@ numHitsForSeedCleaner = cms.int32(50), onlyPixelHitsForSeedCleaner = cms.bool(True), - TrajectoryBuilder = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), + TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('tobTecStepTrajectoryBuilder')), doSeedingRegionRebuilding = True, useHitsSplitting = True, cleanTrajectoryAfterInOut = True diff --git a/RecoVertex/NuclearInteractionProducer/python/NuclearInteraction_cff.py b/RecoVertex/NuclearInteractionProducer/python/NuclearInteraction_cff.py index d032eca46757a..17e0ac7de69ef 100644 --- a/RecoVertex/NuclearInteractionProducer/python/NuclearInteraction_cff.py +++ b/RecoVertex/NuclearInteractionProducer/python/NuclearInteraction_cff.py @@ -30,7 +30,7 @@ nuclearCkfTrajectoryBuilder.trajectoryFilter.refToPSet_ = 'nuclearCkfTrajectoryFilter' nuclearCkfTrajectoryBuilder.alwaysUseInvalidHits = False nuclearTrackCandidates.src = 'nuclearSeed' -nuclearTrackCandidates.TrajectoryBuilder.refToPSet_ = 'nuclearCkfTrajectoryBuilder' +nuclearTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'nuclearCkfTrajectoryBuilder' nuclearTrackCandidates.RedundantSeedCleaner = 'none' nuclearWithMaterialTracks.src = 'nuclearTrackCandidates' #FittingSmootherRK.MinNumberOfHits = 3 diff --git a/SLHCUpgradeSimulations/Geometry/python/oldTracking.py b/SLHCUpgradeSimulations/Geometry/python/oldTracking.py index 3fdb325e9d5f0..fdb1762a0ca58 100644 --- a/SLHCUpgradeSimulations/Geometry/python/oldTracking.py +++ b/SLHCUpgradeSimulations/Geometry/python/oldTracking.py @@ -5,8 +5,8 @@ from RecoTracker.CkfPattern.CkfTrackCandidates_cff import * ckfTrackCandidates.doSeedingRegionRebuilding = False -#ckfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'CkfTrajectoryBuilder' -ckfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'GroupedCkfTrajectoryBuilder' +#ckfTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'CkfTrajectoryBuilder' +ckfTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'GroupedCkfTrajectoryBuilder' #ckfTrackCandidates.SeedProducer = 'newCombinedSeeds' ckfTrackCandidates.useHitsSplitting = False #GroupedCkfTrajectoryBuilder.bestHitOnly = False diff --git a/SLHCUpgradeSimulations/Geometry/python/oldTracking_wtriplets.py b/SLHCUpgradeSimulations/Geometry/python/oldTracking_wtriplets.py index cf0f7f4e402a0..7ff620d130fb9 100644 --- a/SLHCUpgradeSimulations/Geometry/python/oldTracking_wtriplets.py +++ b/SLHCUpgradeSimulations/Geometry/python/oldTracking_wtriplets.py @@ -6,7 +6,7 @@ ckfTrackCandidates.doSeedingRegionRebuilding = False #ckfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'CkfTrajectoryBuilder' -ckfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'GroupedCkfTrajectoryBuilder' +ckfTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'GroupedCkfTrajectoryBuilder' #ckfTrackCandidates.SeedProducer = 'newCombinedSeeds' ckfTrackCandidates.useHitsSplitting = False #GroupedCkfTrajectoryBuilder.bestHitOnly = False diff --git a/SLHCUpgradeSimulations/Geometry/python/simpleTracking.py b/SLHCUpgradeSimulations/Geometry/python/simpleTracking.py index 837850d3acc2d..fbcc45758bbf7 100644 --- a/SLHCUpgradeSimulations/Geometry/python/simpleTracking.py +++ b/SLHCUpgradeSimulations/Geometry/python/simpleTracking.py @@ -6,7 +6,7 @@ ckfTrackCandidates.doSeedingRegionRebuilding = False #ckfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'CkfTrajectoryBuilder' -ckfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'GroupedCkfTrajectoryBuilder' +ckfTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'GroupedCkfTrajectoryBuilder' ckfTrackCandidates.SeedProducer = 'newCombinedSeeds' ckfTrackCandidates.useHitsSplitting = False #GroupedCkfTrajectoryBuilder.bestHitOnly = False diff --git a/TrackingTools/GsfTracking/python/CkfElectronCandidateMaker_cff.py b/TrackingTools/GsfTracking/python/CkfElectronCandidateMaker_cff.py index 07db635188e8f..d9a137644ea1e 100644 --- a/TrackingTools/GsfTracking/python/CkfElectronCandidateMaker_cff.py +++ b/TrackingTools/GsfTracking/python/CkfElectronCandidateMaker_cff.py @@ -43,7 +43,7 @@ import RecoTracker.CkfPattern.CkfTrackCandidates_cfi electronCkfTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone() electronCkfTrackCandidates.src = cms.InputTag('electronMergedSeeds') -electronCkfTrackCandidates.TrajectoryBuilder.refToPSet_ = 'TrajectoryBuilderForElectrons' +electronCkfTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'TrajectoryBuilderForElectrons' #electronCkfTrackCandidates.TrajectoryCleaner = 'TrajectoryCleanerBySharedHits' electronCkfTrackCandidates.NavigationSchool = 'SimpleNavigationSchool' electronCkfTrackCandidates.RedundantSeedCleaner = 'CachingSeedCleanerBySharedInput' diff --git a/TrackingTools/GsfTracking/python/CkfElectronCandidates_cfi.py b/TrackingTools/GsfTracking/python/CkfElectronCandidates_cfi.py index b1e8c129027b6..476e9a1c71d56 100644 --- a/TrackingTools/GsfTracking/python/CkfElectronCandidates_cfi.py +++ b/TrackingTools/GsfTracking/python/CkfElectronCandidates_cfi.py @@ -3,5 +3,5 @@ import copy from RecoTracker.CkfPattern.CkfTrackCandidates_cfi import * CkfElectronCandidates = copy.deepcopy(ckfTrackCandidates) -CkfElectronCandidates.TrajectoryBuilder.refToPSet_ = 'CkfElectronTrajectoryBuilder' +CkfElectronCandidates.TrajectoryBuilderPSet.refToPSet_ = 'CkfElectronTrajectoryBuilder'