Merge pull request cms-sw#35457 from trackreco/enableMkFit4Iter_v3

cmsbuild · web-flow · commit 668228d3a520 · 2021-10-05T18:34:59.000+02:00
Enable mkFit in InitialStepPreSplitting,InitialStep,HighPtTripletStep,DetachedQuadStep tracking iterations for phase1 pixel era, except for HI and special 2017 tracking eras
diff --git a/Configuration/Eras/python/Era_Phase2_cff.py b/Configuration/Eras/python/Era_Phase2_cff.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Run3_cff import Run3
+from Configuration.Eras.Era_Run3_noMkFit_cff import Run3_noMkFit
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
@@ -17,4 +17,4 @@
 from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger
 from Configuration.Eras.Modifier_ctpps_2021_cff import ctpps_2021
 
-Phase2 = cms.ModifierChain(Run3.copyAndExclude([phase1Pixel,trackingPhase1,ctpps_2021]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, phase2_GEM, hcalHardcodeConditions, phase2_timing, phase2_timing_layer, phase2_trigger)
+Phase2 = cms.ModifierChain(Run3_noMkFit.copyAndExclude([phase1Pixel,trackingPhase1,ctpps_2021]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, phase2_GEM, hcalHardcodeConditions, phase2_timing, phase2_timing_layer, phase2_trigger)
diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py
@@ -9,6 +9,7 @@
 from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
 from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
 from Configuration.Eras.Modifier_run2_HLTconditions_2017_cff import run2_HLTconditions_2017
@@ -26,5 +27,5 @@
 
 Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016, run2_HLTconditions_2016, run2_ECAL_2016, run2_egamma_2016,pixel_2016,run2_jme_2016, strips_vfp30_2016, ctpps_2016]),
                               phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, 
-                              trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017)
+                              trackingPhase1, trackingMkFitProd, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017,run2_egamma_2017, ctpps_2017, run2_jme_2017)
 
diff --git a/Configuration/Eras/python/Era_Run2_2017_ppRef_cff.py b/Configuration/Eras/python/Era_Run2_2017_ppRef_cff.py
@@ -2,5 +2,6 @@
 
 from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017
+from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd
 
-Run2_2017_ppRef = cms.ModifierChain(Run2_2017, ppRef_2017)
+Run2_2017_ppRef = cms.ModifierChain(Run2_2017.copyAndExclude([trackingMkFitProd]), ppRef_2017)
diff --git a/Configuration/Eras/python/Era_Run2_2017_pp_on_XeXe_cff.py b/Configuration/Eras/python/Era_Run2_2017_pp_on_XeXe_cff.py
@@ -2,5 +2,6 @@
 
 from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
 from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
+from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd
 
-Run2_2017_pp_on_XeXe = cms.ModifierChain(Run2_2017, pp_on_XeXe_2017)
+Run2_2017_pp_on_XeXe = cms.ModifierChain(Run2_2017.copyAndExclude([trackingMkFitProd]), pp_on_XeXe_2017)
diff --git a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py
@@ -3,5 +3,6 @@
 from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd
 
-Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018, pp_on_AA, pp_on_AA_2018)
+Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018.copyAndExclude([trackingMkFitProd]), pp_on_AA, pp_on_AA_2018)
diff --git a/Configuration/Eras/python/Era_Run3_noMkFit_cff.py b/Configuration/Eras/python/Era_Run3_noMkFit_cff.py
@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.Era_Run3_cff import Run3
+from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd
+
+Run3_noMkFit = Run3.copyAndExclude([trackingMkFitProd])
diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Run3_cff import Run3
+from Configuration.Eras.Era_Run3_noMkFit_cff import Run3_noMkFit
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
 from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
 
-Run3_pp_on_PbPb = cms.ModifierChain(Run3, pp_on_AA, pp_on_PbPb_run3)
+Run3_pp_on_PbPb = cms.ModifierChain(Run3_noMkFit, pp_on_AA, pp_on_PbPb_run3)
diff --git a/Configuration/Eras/python/ModifierChain_run2_2017_noTrackingModifier_cff.py b/Configuration/Eras/python/ModifierChain_run2_2017_noTrackingModifier_cff.py
@@ -2,5 +2,6 @@
 
 from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProd
 
-run2_2017_noTrackingModifier = Run2_2017.copyAndExclude([trackingPhase1])
+run2_2017_noTrackingModifier = Run2_2017.copyAndExclude([trackingPhase1,trackingMkFitProd])
diff --git a/Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py b/Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py
@@ -0,0 +1,16 @@
+import FWCore.ParameterSet.Config as cms
+
+# to replace CKF with MkFit in select iterations
+from Configuration.ProcessModifiers.trackingMkFitCommon_cff import *
+from Configuration.ProcessModifiers.trackingMkFitInitialStepPreSplitting_cff import *
+from Configuration.ProcessModifiers.trackingMkFitInitialStep_cff import *
+from Configuration.ProcessModifiers.trackingMkFitHighPtTripletStep_cff import *
+from Configuration.ProcessModifiers.trackingMkFitDetachedQuadStep_cff import *
+
+trackingMkFitProd =  cms.ModifierChain(
+    trackingMkFitCommon,
+    trackingMkFitInitialStepPreSplitting,
+    trackingMkFitInitialStep,
+    trackingMkFitHighPtTripletStep,
+    trackingMkFitDetachedQuadStep,
+)
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -32,6 +32,7 @@ def __init__(self):
                  'Run2_2018_pp_on_AA_noHCALmitigation',
                  'Run2_2018_highBetaStar',
                  'Run3',
+                 'Run3_noMkFit',
                  'Run3_pp_on_PbPb',
                  'Run3_dd4hep',
                  'Phase2',
@@ -77,7 +78,7 @@ def __init__(self):
                            'hcalHardcodeConditions', 'hcalSkipPacker',
                            'run2_HLTconditions_2016','run2_HLTconditions_2017','run2_HLTconditions_2018',
                            'bParking']
-        internalUseModChains = ['run2_2017_noTrackingModifier']
+        internalUseModChains = ['run2_2017_noTrackingModifier', 'trackingMkFitProd']
 
         self.pythonCfgLines = {}
 
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py
@@ -26,7 +26,7 @@
 )
 
 ###################################
-from RecoTracker.IterativeTracking.DetachedTripletStep_cff import *
+import RecoTracker.IterativeTracking.DetachedTripletStep_cff
 
 # NEW CLUSTERS (remove previously used clusters)
 from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import trackClusterRemover as _trackClusterRemover
@@ -80,7 +80,7 @@
     clustersToSkip = cms.InputTag('hiRegitMuDetachedTripletStepClusters')
 )
 
-hiRegitMuDetachedTripletStepTrackCandidates = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrackCandidates.clone(
+hiRegitMuDetachedTripletStepTrackCandidates = RecoTracker.IterativeTracking.DetachedTripletStep_cff._detachedTripletStepTrackCandidatesCkf.clone(
     src               = 'hiRegitMuDetachedTripletStepSeeds',
     TrajectoryBuilder = 'hiRegitMuDetachedTripletStepTrajectoryBuilder',
     clustersToSkip    = cms.InputTag("hiRegitMuDetachedTripletStepClusters")
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py
@@ -24,7 +24,8 @@
 )
 
 ###################################  
-from RecoTracker.IterativeTracking.InitialStep_cff import *
+import RecoTracker.IterativeTracking.InitialStep_cff
+from RecoTracker.IterativeTracking.InitialStep_cff import initialStepTrajectoryFilterShape,initialStepChi2Est
 
 # SEEDING LAYERS
 hiRegitMuInitialStepSeedLayers =  RecoTracker.IterativeTracking.InitialStep_cff.initialStepSeedLayers.clone()
@@ -62,7 +63,7 @@
 )
 
 # track candidates
-hiRegitMuInitialStepTrackCandidates = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrackCandidates.clone(
+hiRegitMuInitialStepTrackCandidates = RecoTracker.IterativeTracking.InitialStep_cff._initialStepTrackCandidatesCkf.clone(
     src               = 'hiRegitMuInitialStepSeeds',
     TrajectoryBuilderPSet = cms.PSet(
        refToPSet_ = cms.string('hiRegitMuInitialStepTrajectoryBuilder')
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py
@@ -29,7 +29,8 @@
 )
 
 ###################################
-from RecoTracker.IterativeTracking.MixedTripletStep_cff import *
+import RecoTracker.IterativeTracking.MixedTripletStep_cff
+from RecoTracker.IterativeTracking.MixedTripletStep_cff import mixedTripletStepTrajectoryBuilder,mixedTripletStepClusterShapeHitFilter,mixedTripletStepTrajectoryCleanerBySharedHits,mixedTripletStepChi2Est
 
 # NEW CLUSTERS (remove previously used clusters)
 hiRegitMuMixedTripletStepClusters = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepClusters.clone(
@@ -102,7 +103,7 @@
     minNrOfHitsForRebuild = 6 #change from default 4
 )
 
-hiRegitMuMixedTripletStepTrackCandidates = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrackCandidates.clone(
+hiRegitMuMixedTripletStepTrackCandidates = RecoTracker.IterativeTracking.MixedTripletStep_cff._mixedTripletStepTrackCandidatesCkf.clone(
     src               = 'hiRegitMuMixedTripletStepSeeds',
     TrajectoryBuilderPSet = cms.PSet(
        refToPSet_ = cms.string('hiRegitMuMixedTripletStepTrajectoryBuilder')
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py
@@ -25,7 +25,8 @@
 )
 
 ###################################
-from RecoTracker.IterativeTracking.PixelLessStep_cff import *
+import RecoTracker.IterativeTracking.PixelLessStep_cff
+from RecoTracker.IterativeTracking.PixelLessStep_cff import pixelLessStepTrajectoryBuilder,pixelLessStepClusterShapeHitFilter,pixelLessStepTrajectoryCleanerBySharedHits,pixelLessStepChi2Est
 
 # remove previously used clusters
 hiRegitMuPixelLessStepClusters = RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepClusters.clone(
@@ -73,7 +74,7 @@
     minNrOfHitsForRebuild = 6 #change from default 4
 )
 
-hiRegitMuPixelLessStepTrackCandidates =  RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepTrackCandidates.clone(
+hiRegitMuPixelLessStepTrackCandidates =  RecoTracker.IterativeTracking.PixelLessStep_cff._pixelLessStepTrackCandidatesCkf.clone(
     src               = 'hiRegitMuPixelLessStepSeeds',
     TrajectoryBuilderPSet = cms.PSet(
        refToPSet_ = cms.string('hiRegitMuPixelLessStepTrajectoryBuilder')
diff --git a/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py b/RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py
@@ -26,7 +26,8 @@
 )
 
 ###################################
-from RecoTracker.IterativeTracking.PixelPairStep_cff import *
+import RecoTracker.IterativeTracking.PixelPairStep_cff
+from RecoTracker.IterativeTracking.PixelPairStep_cff import pixelPairStepTrajectoryBuilder,pixelPairStepTrajectoryFilter,pixelPairStepTrajectoryFilterBase,pixelPairStepTrajectoryFilterInOut,pixelPairStepTrajectoryFilterShape,pixelPairStepChi2Est
 
 # NEW CLUSTERS (remove previously used clusters)
 hiRegitMuPixelPairStepClusters = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepClusters.clone(
@@ -76,7 +77,7 @@
 )
 
 # trackign candidate
-hiRegitMuPixelPairStepTrackCandidates = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrackCandidates.clone(
+hiRegitMuPixelPairStepTrackCandidates = RecoTracker.IterativeTracking.PixelPairStep_cff._pixelPairStepTrackCandidatesCkf.clone(
     src               = 'hiRegitMuPixelPairStepSeeds',
     TrajectoryBuilder = 'hiRegitMuPixelPairStepTrajectoryBuilder',
     clustersToSkip    = "hiRegitMuPixelPairStepClusters",
diff --git a/RecoHI/HiTracking/python/hiMixedTripletStep_cff.py b/RecoHI/HiTracking/python/hiMixedTripletStep_cff.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
-from RecoTracker.IterativeTracking.MixedTripletStep_cff import *
+from RecoTracker.IterativeTracking.MixedTripletStep_cff import mixedTripletStepSeedLayersA,mixedTripletStepSeedLayersB,mixedTripletStepHitDoubletsA,mixedTripletStepHitDoubletsB,mixedTripletStepPropagator,mixedTripletStepPropagatorOpposite,mixedTripletStepTracks,mixedTripletStepHitTripletsA,mixedTripletStepSeedsA,mixedTripletStepHitTripletsB,mixedTripletStepSeedsB,mixedTripletStepSeeds
 from .HIPixelTripletSeeds_cff import *
 from .HIPixel3PrimTracks_cfi import *
 
@@ -73,7 +73,8 @@
 mixedTripletStepPropagatorOpposite.ptMin = 0.4
 
 # MAKING OF TRACK CANDIDATES
-mixedTripletStepTrackCandidates.clustersToSkip = cms.InputTag('hiMixedTripletStepClusters')
+from RecoTracker.IterativeTracking.MixedTripletStep_cff import _mixedTripletStepTrackCandidatesCkf
+mixedTripletStepTrackCandidates = _mixedTripletStepTrackCandidatesCkf.clone(clustersToSkip = 'hiMixedTripletStepClusters')
 
 # TRACK FITTING
 hiMixedTripletStepTracks = mixedTripletStepTracks.clone()
diff --git a/RecoHI/HiTracking/python/hiPixelLessStep_cff.py b/RecoHI/HiTracking/python/hiPixelLessStep_cff.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg
-from RecoTracker.IterativeTracking.PixelLessStep_cff import *
+from RecoTracker.IterativeTracking.PixelLessStep_cff import pixelLessStepSeedLayers,pixelLessStepHitDoublets,pixelLessStepTracks,pixelLessStepHitTriplets,pixelLessStepSeeds
 from .HIPixelTripletSeeds_cff import *
 from .HIPixel3PrimTracks_cfi import *
 
@@ -42,7 +42,8 @@
 pixelLessStepTrajectoryFilter.minPt = 0.7
 
 # MAKING OF TRACK CANDIDATES
-pixelLessStepTrackCandidates.clustersToSkip = 'hiPixelLessStepClusters'
+from RecoTracker.IterativeTracking.PixelLessStep_cff import _pixelLessStepTrackCandidatesCkf
+pixelLessStepTrackCandidates = _pixelLessStepTrackCandidatesCkf.clone(clustersToSkip = 'hiPixelLessStepClusters')
 
 # TRACK FITTING
 hiPixelLessStepTracks = pixelLessStepTracks.clone()
diff --git a/RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py b/RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py
@@ -7,7 +7,7 @@
 from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
 
 ###################################
-from RecoTracker.IterativeTracking.DetachedTripletStep_cff import *
+import RecoTracker.IterativeTracking.DetachedTripletStep_cff
 
 # NEW CLUSTERS (remove previously used clusters)
 hiRegitDetachedTripletStepClusters = cms.EDProducer("HITrackClusterRemover",
@@ -56,7 +56,7 @@
     clustersToSkip       = cms.InputTag('hiRegitDetachedTripletStepClusters')
 )
 
-hiRegitDetachedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrackCandidates.clone(
+hiRegitDetachedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.DetachedTripletStep_cff._detachedTripletStepTrackCandidatesCkf.clone(
     src               = 'hiRegitDetachedTripletStepSeeds',
     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
@@ -5,7 +5,8 @@
 from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
 
 ###################################  
-from RecoTracker.IterativeTracking.InitialStep_cff import *
+import RecoTracker.IterativeTracking.InitialStep_cff
+from RecoTracker.IterativeTracking.InitialStep_cff import initialStepTrajectoryFilterShape
 
 #################################
 # Filter on quality tracks
@@ -50,7 +51,7 @@
 )
 
 # track candidates
-hiRegitInitialStepTrackCandidates        =  RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrackCandidates.clone(
+hiRegitInitialStepTrackCandidates        =  RecoTracker.IterativeTracking.InitialStep_cff._initialStepTrackCandidatesCkf.clone(
     src               = 'hiRegitInitialStepSeeds',
     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
@@ -6,7 +6,7 @@
 from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
 
 ###################################
-from RecoTracker.IterativeTracking.LowPtTripletStep_cff import *
+import RecoTracker.IterativeTracking.LowPtTripletStep_cff
 
 
 # NEW CLUSTERS (remove previously used clusters)
@@ -61,7 +61,7 @@
 )
 
 # track candidates
-hiRegitLowPtTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.LowPtTripletStep_cff.lowPtTripletStepTrackCandidates.clone(
+hiRegitLowPtTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.LowPtTripletStep_cff._lowPtTripletStepTrackCandidatesCkf.clone(
     src               = 'hiRegitLowPtTripletStepSeeds',
     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
@@ -7,7 +7,8 @@
 from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
 
 ###################################
-from RecoTracker.IterativeTracking.MixedTripletStep_cff import *
+import RecoTracker.IterativeTracking.MixedTripletStep_cff
+from RecoTracker.IterativeTracking.MixedTripletStep_cff import mixedTripletStepTrajectoryBuilder
 
 # NEW CLUSTERS (remove previously used clusters)
 hiRegitMixedTripletStepClusters = cms.EDProducer("HITrackClusterRemover",
@@ -77,7 +78,7 @@
     clustersToSkip       = cms.InputTag('hiRegitMixedTripletStepClusters'),
 )
 
-hiRegitMixedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrackCandidates.clone(
+hiRegitMixedTripletStepTrackCandidates        =  RecoTracker.IterativeTracking.MixedTripletStep_cff._mixedTripletStepTrackCandidatesCkf.clone(
     src               = 'hiRegitMixedTripletStepSeeds',
     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
@@ -7,7 +7,8 @@
 from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
 
 ###################################
-from RecoTracker.IterativeTracking.PixelPairStep_cff import *
+import RecoTracker.IterativeTracking.PixelPairStep_cff
+from RecoTracker.IterativeTracking.PixelPairStep_cff import pixelPairStepTrajectoryBuilder,pixelPairStepTrajectoryFilter,pixelPairStepTrajectoryFilterBase,pixelPairStepTrajectoryFilterInOut,pixelPairStepTrajectoryFilterShape
 
 # NEW CLUSTERS (remove previously used clusters)
 hiRegitPixelPairStepClusters = cms.EDProducer("HITrackClusterRemover",
@@ -54,7 +55,7 @@
 )
 
 # trackign candidate
-hiRegitPixelPairStepTrackCandidates        =  RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrackCandidates.clone(
+hiRegitPixelPairStepTrackCandidates        =  RecoTracker.IterativeTracking.PixelPairStep_cff._pixelPairStepTrackCandidatesCkf.clone(
     src               = 'hiRegitPixelPairStepSeeds',
     TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('hiRegitPixelPairStepTrajectoryBuilder')),
     maxNSeeds = 100000
diff --git a/RecoHI/HiTracking/python/hiTobTecStep_cff.py b/RecoHI/HiTracking/python/hiTobTecStep_cff.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import FWCore.ParameterSet.Config as cms
 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg
-from RecoTracker.IterativeTracking.TobTecStep_cff import *
+from RecoTracker.IterativeTracking.TobTecStep_cff import tobTecStepSeedLayersPair,tobTecStepSeedLayersTripl,tobTecStepHitDoubletsPair,tobTecStepHitDoubletsTripl,tobTecStepHitTripletsTripl,tobTecStepTracks,tobTecStepSeedsPair,tobTecStepSeedsTripl,tobTecStepSeeds,tobTecStepTrajectoryBuilder,tobTecStepInOutTrajectoryFilter,tobTecStepClusterShapeHitFilter,tobTecStepTrajectoryCleanerBySharedHits,tobTecStepChi2Est,tobTecFlexibleKFFittingSmoother,tobTecStepFitterSmoother,tobTecStepRKTrajectorySmoother,tobTecStepRKTrajectoryFitter,tobTecStepFitterSmootherForLoopers,tobTecStepRKTrajectorySmootherForLoopers,tobTecStepRKTrajectoryFitterForLoopers
 from .HIPixelTripletSeeds_cff import *
 from .HIPixel3PrimTracks_cfi import *
 
@@ -52,7 +52,8 @@
 tobTecStepTrajectoryFilter.minPt = 0.85
 
 # MAKING OF TRACK CANDIDATES
-tobTecStepTrackCandidates.clustersToSkip = 'hiTobTecStepClusters'
+from RecoTracker.IterativeTracking.TobTecStep_cff import _tobTecStepTrackCandidatesCkf
+tobTecStepTrackCandidates = _tobTecStepTrackCandidatesCkf.clone(clustersToSkip = 'hiTobTecStepClusters')
 
 # TRACK FITTING
 hiTobTecStepTracks = tobTecStepTracks.clone()
diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py
@@ -194,7 +194,8 @@
 
 # MAKING OF TRACK CANDIDATES
 import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
-detachedTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
+# Give handle for CKF for HI
+_detachedTripletStepTrackCandidatesCkf = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
     src = 'detachedTripletStepSeeds',
     clustersToSkip = cms.InputTag('detachedTripletStepClusters'),
     ### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
@@ -204,6 +205,7 @@
     doSeedingRegionRebuilding = True,
     useHitsSplitting = True
     )
+detachedTripletStepTrackCandidates = _detachedTripletStepTrackCandidatesCkf.clone()
 
 from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import trajectoryCleanerBySharedHits
 detachedTripletStepTrajectoryCleanerBySharedHits = trajectoryCleanerBySharedHits.clone(
diff --git a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py
diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py
diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py
diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py
diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py
diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py
diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py
diff --git a/RecoTracker/MkFit/plugins/MkFitProducer.cc b/RecoTracker/MkFit/plugins/MkFitProducer.cc
