Merge pull request #11931 from VinInn/TrackFitters76

Tracking Reco: tuning of outlier rejection, duplicate merging, pairSeeding
cms-sw · Oct 19, 2015 · 061e5ce · 061e5ce
2 parents ddc6756 + 13c2f73
commit 061e5ce
Show file tree

Hide file tree

Showing 105 changed files with 1,633 additions and 1,839 deletions.
diff --git a/Alignment/MillePedeAlignmentAlgorithm/python/RefitterAnalytical_cff.py b/Alignment/MillePedeAlignmentAlgorithm/python/RefitterAnalytical_cff.py
@@ -7,9 +7,9 @@
 # All conditions should be included centrally, but you'll need some for the lorentz angle:
 #    include "CalibTracker/Configuration/data/SiStrip_FakeLorentzAngle.cff"
 from TrackingTools.KalmanUpdators.KFUpdatorESProducer_cfi import *
-from TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi import *
-from TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi import *
-from TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import *
+from TrackingTools.TrackFitters.KFTrajectorySmoother_cfi import *
+from TrackingTools.TrackFitters.KFFittingSmoother_cfi import *
 from TrackingTools.GeomPropagators.AnalyticalPropagator_cfi import *
 from TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi import *
 # Not to loose hits/tracks, we might want to open the allowed chi^2 contribution for single hits:

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py
@@ -95,9 +95,9 @@
 # the following for refitting with analytical propagator (maybe for CRUZET?)
 #process.load("TrackingTools.KalmanUpdators.KFUpdatorESProducer_cfi")
 #process.load("TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi")
+#process.load("TrackingTools.TrackFitters.KFTrajectoryFitter_cfi")
+#process.load("TrackingTools.TrackFitters.KFTrajectorySmoother_cfi")
+#process.load("TrackingTools.TrackFitters.KFFittingSmoother_cfi")
 #process.load("TrackingTools.GeomPropagators.AnalyticalPropagator_cfi")
 #process.load("TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi")
 #process.TrackRefitter.Propagator = "AnalyticalPropagator"

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_las_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_las_cfg.py
@@ -113,9 +113,9 @@
 # the following for refitting with analytical propagator (maybe for CRUZET?)
 #process.load("TrackingTools.KalmanUpdators.KFUpdatorESProducer_cfi")
 #process.load("TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi")
+#process.load("TrackingTools.TrackFitters.KFTrajectoryFitter_cfi")
+#process.load("TrackingTools.TrackFitters.KFTrajectorySmoother_cfi")
+#process.load("TrackingTools.TrackFitters.KFFittingSmoother_cfi")
 #process.load("TrackingTools.GeomPropagators.AnalyticalPropagator_cfi")
 #process.load("TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi")
 #process.TrackRefitter.Propagator = "AnalyticalPropagator"

diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py
@@ -96,9 +96,9 @@
 # the following for refitting with analytical propagator (maybe for CRUZET?)
 #process.load("TrackingTools.KalmanUpdators.KFUpdatorESProducer_cfi")
 #process.load("TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi")
-#process.load("TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi")
+#process.load("TrackingTools.TrackFitters.KFTrajectoryFitter_cfi")
+#process.load("TrackingTools.TrackFitters.KFTrajectorySmoother_cfi")
+#process.load("TrackingTools.TrackFitters.KFFittingSmoother_cfi")
 #process.load("TrackingTools.GeomPropagators.AnalyticalPropagator_cfi")
 #process.load("TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi")
 #process.TrackRefitter.Propagator = "AnalyticalPropagator"

diff --git a/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py b/DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py
@@ -158,7 +158,7 @@
   ComponentName = cms.string( "hltESPChi2MeasurementEstimator30" )
 )
 
-from TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi import KFTrajectoryFitter
+from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import KFTrajectoryFitter
 hltESPTrajectoryFitterRK = KFTrajectoryFitter.clone(
   minHits = cms.int32( 3 ),
   ComponentName = cms.string( "hltESPTrajectoryFitterRK" ),

diff --git a/DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py b/DQM/HLTEvF/python/HLTTrackingMonitoring_cff.py
@@ -6,7 +6,7 @@
 iterHLTTracksMonitoringHLT.beamSpot = cms.InputTag("hltOnlineBeamSpot")
 pixelTracksMonitoringHLT.beamSpot = cms.InputTag("hltOnlineBeamSpot")
 
-from TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import *
 from TrackingTools.TransientTrack.TransientTrackBuilder_cfi import *
 
 trackingMonitoringHLTsequence = cms.Sequence(

diff --git a/DataFormats/TrackReco/src/classes_def.xml b/DataFormats/TrackReco/src/classes_def.xml
@@ -1,4 +1,5 @@
 <lcgdict>
+
   <class name="reco::TrackBase::AlgoMask"/>
   <class name="reco::HitPattern" ClassVersion="12">
       <version ClassVersion="12" checksum="3922863495"/>

diff --git a/DataFormats/WrappedStdDictionaries/src/classes.h b/DataFormats/WrappedStdDictionaries/src/classes.h
@@ -31,6 +31,8 @@ namespace DataFormats_WrappedStdDictionaries {
   edm::Wrapper<std::vector<std::pair<std::basic_string<char>,double> > > dummy16;
   edm::Wrapper<std::vector<std::pair<std::basic_string<char>,float> > > dummy16_0;
   edm::Wrapper<std::vector<std::pair<unsigned int,double> > > dummy16_1;
+  edm::Wrapper<std::vector<std::pair<int,int>>> dummy16_2;
+
   edm::Wrapper<std::list<int> > dummy17;
 
   edm::Wrapper<std::deque<int> > dummy18;

diff --git a/DataFormats/WrappedStdDictionaries/src/classes_def.xml b/DataFormats/WrappedStdDictionaries/src/classes_def.xml
@@ -46,6 +46,7 @@
  <class name="edm::Wrapper<std::vector<unsigned long> >"/>
  <class name="edm::Wrapper<std::vector<unsigned long long> >"/>
  <class name="edm::Wrapper<std::vector<unsigned short> >"/>
+ <class name="edm::Wrapper<std::vector<std::pair<int,int>>>"/>
  <class name="edm::Wrapper<unsigned char>"/>
  <class name="edm::Wrapper<unsigned int>"/>
  <class name="edm::Wrapper<unsigned long>"/>

diff --git a/FastSimulation/Tracking/python/GSTrackFinalFitCommon_cff.py b/FastSimulation/Tracking/python/GSTrackFinalFitCommon_cff.py
@@ -5,11 +5,11 @@
 # Chi2MeasurementEstimatorESProducer
 from TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi import *
 # KFTrajectoryFitterESProducer
-from TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import *
 # KFTrajectorySmootherESProducer
-from TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectorySmoother_cfi import *
 # KFFittingSmootherESProducer
-from TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFFittingSmoother_cfi import *
 from FastSimulation.Tracking.KFFittingSmootherWithOutlierRejection_cfi import *
 from FastSimulation.Tracking.KFFittingSmootherFirst_cfi import *
 from FastSimulation.Tracking.KFFittingSmootherSecond_cfi import *

diff --git a/RecoEgamma/EgammaElectronProducers/python/egammaCTFFinalFitWithMaterial_cff.py b/RecoEgamma/EgammaElectronProducers/python/egammaCTFFinalFitWithMaterial_cff.py
@@ -5,11 +5,11 @@
 # Chi2MeasurementEstimatorESProducer
 from TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi import *
 # KFTrajectoryFitterESProducer
-from TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import *
 # KFTrajectorySmootherESProducer
-from TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectorySmoother_cfi import *
 # KFFittingSmootherESProducer
-from TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFFittingSmoother_cfi import *
 # PropagatorWithMaterialESProducer
 from TrackingTools.MaterialEffects.MaterialPropagator_cfi import *
 # PropagatorWithMaterialESProducer

diff --git a/RecoEgamma/EgammaElectronProducers/python/findElectronsInSiStrips_cfi.py b/RecoEgamma/EgammaElectronProducers/python/findElectronsInSiStrips_cfi.py
@@ -5,11 +5,11 @@
 # Chi2MeasurementEstimatorESProducer
 from TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi import *
 # KFTrajectoryFitterESProducer
-from TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import *
 # KFTrajectorySmootherESProducer
-from TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectorySmoother_cfi import *
 # KFFittingSmootherESProducer
-from TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFFittingSmoother_cfi import *
 # PropagatorWithMaterialESProducer
 from TrackingTools.MaterialEffects.MaterialPropagator_cfi import *
 # PropagatorWithMaterialESProducer

diff --git a/RecoEgamma/EgammaElectronProducers/python/pixelMatchElectronLocalTrkSequence_cff.py b/RecoEgamma/EgammaElectronProducers/python/pixelMatchElectronLocalTrkSequence_cff.py
@@ -19,9 +19,9 @@
 # broken down to the different components so to configure the Chi2MeasurementEstimatorESProducer
 #include "RecoTracker/CkfPattern/data/CkfTrackCandidates.cff"
 from TrackingTools.KalmanUpdators.KFUpdatorESProducer_cfi import *
-from TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi import *
-from TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi import *
-from TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi import *
+from TrackingTools.TrackFitters.KFTrajectoryFitter_cfi import *
+from TrackingTools.TrackFitters.KFTrajectorySmoother_cfi import *
+from TrackingTools.TrackFitters.KFFittingSmoother_cfi import *
 from TrackingTools.MaterialEffects.MaterialPropagator_cfi import *
 from TrackingTools.MaterialEffects.OppositeMaterialPropagator_cfi import *
 from RecoTracker.CkfPattern.CkfTrackCandidates_cfi import *

diff --git a/RecoEgamma/EgammaPhotonProducers/python/KFFittingSmootherForInOut_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/KFFittingSmootherForInOut_cfi.py
@@ -2,9 +2,9 @@
 
 from RecoEgamma.EgammaPhotonProducers.KFTrajectoryFitterForInOut_cfi import *
 from RecoEgamma.EgammaPhotonProducers.KFTrajectorySmootherForInOut_cfi import *
-import TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi
+import TrackingTools.TrackFitters.KFFittingSmoother_cfi
 # KFFittingSmootherESProducer
-KFFittingSmootherForInOut = TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi.KFFittingSmoother.clone()
+KFFittingSmootherForInOut = TrackingTools.TrackFitters.KFFittingSmoother_cfi.KFFittingSmoother.clone()
 KFFittingSmootherForInOut.ComponentName = 'KFFittingSmootherForInOut'
 KFFittingSmootherForInOut.Fitter = 'KFFitterForInOut'
 KFFittingSmootherForInOut.Smoother = 'KFSmootherForInOut'

diff --git a/RecoEgamma/EgammaPhotonProducers/python/KFFittingSmootherForOutIn_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/KFFittingSmootherForOutIn_cfi.py
@@ -2,9 +2,9 @@
 
 from RecoEgamma.EgammaPhotonProducers.KFTrajectoryFitterForOutIn_cfi import *
 from RecoEgamma.EgammaPhotonProducers.KFTrajectorySmootherForOutIn_cfi import *
-import TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi
+import TrackingTools.TrackFitters.KFFittingSmoother_cfi
 # KFFittingSmootherESProducer
-KFFittingSmootherForOutIn = TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi.KFFittingSmoother.clone()
+KFFittingSmootherForOutIn = TrackingTools.TrackFitters.KFFittingSmoother_cfi.KFFittingSmoother.clone()
 KFFittingSmootherForOutIn.ComponentName = 'KFFittingSmootherForOutIn'
 KFFittingSmootherForOutIn.Fitter = 'KFFitterForOutIn'
 KFFittingSmootherForOutIn.Smoother = 'KFSmootherForOutIn'

diff --git a/RecoEgamma/EgammaPhotonProducers/python/KFTrajectoryFitterForInOut_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/KFTrajectoryFitterForInOut_cfi.py
@@ -2,9 +2,9 @@
 
 from RecoEgamma.EgammaPhotonProducers.propAlongMomentumWithMaterialForElectrons_cfi import *
 from RecoEgamma.EgammaPhotonProducers.chi2EstimatorForInOutFit_cfi import *
-import TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi
+import TrackingTools.TrackFitters.KFTrajectoryFitter_cfi
 #KFTrajectoryFitterESProducer
-KFTrajectoryFitterForInOut = TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi.KFTrajectoryFitter.clone()
+KFTrajectoryFitterForInOut = TrackingTools.TrackFitters.KFTrajectoryFitter_cfi.KFTrajectoryFitter.clone()
 KFTrajectoryFitterForInOut.ComponentName = 'KFFitterForInOut'
 KFTrajectoryFitterForInOut.Propagator = 'alongMomElePropagator'
 KFTrajectoryFitterForInOut.Estimator = 'Chi2ForInOut'

diff --git a/RecoEgamma/EgammaPhotonProducers/python/KFTrajectoryFitterForOutIn_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/KFTrajectoryFitterForOutIn_cfi.py
@@ -2,9 +2,9 @@
 
 from RecoEgamma.EgammaPhotonProducers.propAlongMomentumWithMaterialForElectrons_cfi import *
 from RecoEgamma.EgammaPhotonProducers.chi2EstimatorForOutInFit_cfi import *
-import TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi
+import TrackingTools.TrackFitters.KFTrajectoryFitter_cfi
 #KFTrajectoryFitterESProducer
-KFTrajectoryFitterForOutIn = TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi.KFTrajectoryFitter.clone()
+KFTrajectoryFitterForOutIn = TrackingTools.TrackFitters.KFTrajectoryFitter_cfi.KFTrajectoryFitter.clone()
 KFTrajectoryFitterForOutIn.ComponentName = 'KFFitterForOutIn'
 KFTrajectoryFitterForOutIn.Propagator = 'alongMomElePropagator'
 KFTrajectoryFitterForOutIn.Estimator = 'Chi2ForOutIn'

diff --git a/RecoEgamma/EgammaPhotonProducers/python/KFTrajectorySmootherForInOut_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/KFTrajectorySmootherForInOut_cfi.py
@@ -2,9 +2,9 @@
 
 from RecoEgamma.EgammaPhotonProducers.propOppoMomentumWithMaterialForElectrons_cfi import *
 from RecoEgamma.EgammaPhotonProducers.chi2EstimatorForInOutFit_cfi import *
-import TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi
+import TrackingTools.TrackFitters.KFTrajectorySmoother_cfi
 # KFTrajectorySmootherESProducer
-KFTrajectorySmootherForInOut = TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi.KFTrajectorySmoother.clone()
+KFTrajectorySmootherForInOut = TrackingTools.TrackFitters.KFTrajectorySmoother_cfi.KFTrajectorySmoother.clone()
 KFTrajectorySmootherForInOut.ComponentName = 'KFSmootherForInOut'
 KFTrajectorySmootherForInOut.Propagator = 'oppositeToMomElePropagator'
 KFTrajectorySmootherForInOut.Estimator = 'Chi2ForInOut'

diff --git a/RecoEgamma/EgammaPhotonProducers/python/KFTrajectorySmootherForOutIn_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/KFTrajectorySmootherForOutIn_cfi.py
@@ -2,9 +2,9 @@
 
 from RecoEgamma.EgammaPhotonProducers.propOppoMomentumWithMaterialForElectrons_cfi import *
 from RecoEgamma.EgammaPhotonProducers.chi2EstimatorForOutInFit_cfi import *
-import TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi
+import TrackingTools.TrackFitters.KFTrajectorySmoother_cfi
 # KFTrajectorySmootherESProducer
-KFTrajectorySmootherForOutIn = TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi.KFTrajectorySmoother.clone()
+KFTrajectorySmootherForOutIn = TrackingTools.TrackFitters.KFTrajectorySmoother_cfi.KFTrajectorySmoother.clone()
 KFTrajectorySmootherForOutIn.ComponentName = 'KFSmootherForOutIn'
 KFTrajectorySmootherForOutIn.Propagator = 'oppositeToMomElePropagator'
 KFTrajectorySmootherForOutIn.Estimator = 'Chi2ForOutIn'

diff --git a/RecoEgamma/EgammaPhotonProducers/src/TrackProducerWithSCAssociation.cc b/RecoEgamma/EgammaPhotonProducers/src/TrackProducerWithSCAssociation.cc
@@ -248,8 +248,8 @@ std::vector<reco::TransientTrack> TrackProducerWithSCAssociation::getTransient(e
   } catch (cms::Exception &e){ edm::LogInfo("TrackProducerWithSCAssociation") << "cms::Exception caught!!!" << "\n" << e << "\n";}
 
 
-  for (AlgoProductCollection::iterator prod=algoResults.begin();prod!=algoResults.end(); prod++){
-    ttks.push_back( reco::TransientTrack(*(((*prod).second).first),thePropagator.product()->magneticField() ));
+  for (auto & prod : algoResults){
+    ttks.emplace_back(*prod.track,thePropagator.product()->magneticField());
   }
 
   //LogDebug("TrackProducerWithSCAssociation") << "TrackProducerWithSCAssociation end" << "\n";
@@ -281,15 +281,15 @@ TrackingRecHitRefProd rHits = evt.getRefBeforePut<TrackingRecHitCollection>();
   edm::Ref< std::vector<Trajectory> >::key_type iTjRef = 0;
   std::map<unsigned int, unsigned int> tjTkMap;
 
-  for(AlgoProductCollection::iterator i=algoResults.begin(); i!=algoResults.end();i++){
-    Trajectory * theTraj = (*i).first;
+  for(auto & i : algoResults){
+    Trajectory * theTraj = i.trajectory;
     if(myTrajectoryInEvent_) {
       selTrajectories->push_back(*theTraj);
       iTjRef++;
     }
 
-    reco::Track * theTrack = (*i).second.first;
-    PropagationDirection seedDir = (*i).second.second;
+    reco::Track * theTrack =  i.track;
+    PropagationDirection seedDir = i.pDir;
 
     //LogDebug("TrackProducer") << "In KfTrackProducerBase::putInEvt - seedDir=" << seedDir;
 

diff --git a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py
@@ -1,9 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 
+#
+#  FIXME most probably this part is not needed for dispaced muons...
+#
+
 from  RecoTracker.FinalTrackSelectors.MergeTrackCollections_cff import *
 
 #for displaced global muons                                      
-duplicateDisplacedTrackCandidates = RecoTracker.FinalTrackSelectors.DuplicateTrackMerger_cfi.duplicateTrackMerger.clone(
+duplicateDisplacedTrackCandidates = DuplicateTrackMerger.clone(
     source=cms.InputTag("preDuplicateMergingDisplacedTracks"),
     useInnermostState  = cms.bool(True),
     ttrhBuilderName    = cms.string("WithAngleAndTemplate")
@@ -27,11 +31,13 @@
 
 
 #for displaced global muons
-displacedTracks = RecoTracker.FinalTrackSelectors.DuplicateTrackMerger_cfi.duplicateListMerger.clone(
+displacedTracks = DuplicateListMerger.clone(
     originalSource = cms.InputTag("preDuplicateMergingDisplacedTracks"),
+    originalMVAVals = cms.InputTag("preDuplicateMergingDisplacedTracks","MVAValues"),
     mergedSource = cms.InputTag("mergedDuplicateDisplacedTracks"),
     mergedMVAVals = cms.InputTag("duplicateDisplacedTrackClassifier","MVAValues"),
-    candidateSource = cms.InputTag("duplicateDisplacedTrackCandidates","candidateMap")
+    candidateSource = cms.InputTag("duplicateDisplacedTrackCandidates","candidates"),
+    candidateComponents = cms.InputTag("duplicateDisplacedTrackCandidates","candidateMap")
     )
 #for displaced global muons
 displacedTracksSequence = cms.Sequence(

diff --git a/RecoMuon/GlobalMuonProducer/python/globalMuons_cff.py b/RecoMuon/GlobalMuonProducer/python/globalMuons_cff.py
@@ -20,7 +20,7 @@
 
 
 from TrackingTools.TrackFitters.TrackFitters_cff import *
-GlbMuKFFitter = TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi.KFTrajectoryFitter.clone(
+GlbMuKFFitter = TrackingTools.TrackFitters.KFTrajectoryFitter_cfi.KFTrajectoryFitter.clone(
     ComponentName = cms.string('GlbMuKFFitter'),
     Estimator = cms.string('Chi2EstimatorForMuRefit'),
     Propagator = cms.string('SmartPropagatorAnyRK'),

diff --git a/RecoMuon/L2MuonProducer/python/L2Muons_cff.py b/RecoMuon/L2MuonProducer/python/L2Muons_cff.py
@@ -6,12 +6,12 @@
 # from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
 import TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi
 EstimatorForSTA = TrackingTools.KalmanUpdators.Chi2MeasurementEstimatorESProducer_cfi.Chi2MeasurementEstimator.clone()
-import TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi
-KFTrajectoryFitterForSTA = TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi.KFTrajectoryFitter.clone()
-import TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi
-KFTrajectorySmootherForSTA = TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi.KFTrajectorySmoother.clone()
-import TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi
-KFFittingSmootheForSTA = TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi.KFFittingSmoother.clone()
+import TrackingTools.TrackFitters.KFTrajectoryFitter_cfi
+KFTrajectoryFitterForSTA = TrackingTools.TrackFitters.KFTrajectoryFitter_cfi.KFTrajectoryFitter.clone()
+import TrackingTools.TrackFitters.KFTrajectorySmoother_cfi
+KFTrajectorySmootherForSTA = TrackingTools.TrackFitters.KFTrajectorySmoother_cfi.KFTrajectorySmoother.clone()
+import TrackingTools.TrackFitters.KFFittingSmoother_cfi
+KFFittingSmootheForSTA = TrackingTools.TrackFitters.KFFittingSmoother_cfi.KFFittingSmoother.clone()
 # Stand Alone Muons Producer
 from RecoMuon.L2MuonProducer.L2Muons_cfi import *
 EstimatorForSTA.ComponentName = 'Chi2STA'

diff --git a/RecoMuon/StandAloneMuonProducer/python/standAloneMuons_cff.py b/RecoMuon/StandAloneMuonProducer/python/standAloneMuons_cff.py
@@ -14,24 +14,24 @@
 EstimatorForSTA.MaxChi2 = 1000.
 #
 #
-import TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi
-KFTrajectoryFitterForSTA = TrackingTools.TrackFitters.KFTrajectoryFitterESProducer_cfi.KFTrajectoryFitter.clone()
+import TrackingTools.TrackFitters.KFTrajectoryFitter_cfi
+KFTrajectoryFitterForSTA = TrackingTools.TrackFitters.KFTrajectoryFitter_cfi.KFTrajectoryFitter.clone()
 
 KFTrajectoryFitterForSTA.ComponentName = 'KFFitterSTA'
 KFTrajectoryFitterForSTA.Propagator = 'SteppingHelixPropagatorAny'
 KFTrajectoryFitterForSTA.Estimator = 'Chi2STA'
 #
 #
-import TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi
-KFTrajectorySmootherForSTA = TrackingTools.TrackFitters.KFTrajectorySmootherESProducer_cfi.KFTrajectorySmoother.clone()
+import TrackingTools.TrackFitters.KFTrajectorySmoother_cfi
+KFTrajectorySmootherForSTA = TrackingTools.TrackFitters.KFTrajectorySmoother_cfi.KFTrajectorySmoother.clone()
 
 KFTrajectorySmootherForSTA.ComponentName = 'KFSmootherSTA'
 KFTrajectorySmootherForSTA.Propagator = 'SteppingHelixPropagatorOpposite'
 KFTrajectorySmootherForSTA.Estimator = 'Chi2STA'
 #
 #
-import TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi
-KFFittingSmootheForSTA = TrackingTools.TrackFitters.KFFittingSmootherESProducer_cfi.KFFittingSmoother.clone()
+import TrackingTools.TrackFitters.KFFittingSmoother_cfi
+KFFittingSmootheForSTA = TrackingTools.TrackFitters.KFFittingSmoother_cfi.KFFittingSmoother.clone()
 
 KFFittingSmootheForSTA.ComponentName = 'KFFitterSmootherSTA'
 KFFittingSmootheForSTA.Fitter = 'KFFitterSTA'