Merge pull request #13437 from lveldere/fastsim-trackrefactor-feb23

Fastsim trackrefactor
cms-sw · Feb 24, 2016 · 1d39440 · 1d39440
2 parents d7e1889 + d78fd49
commit 1d39440
Show file tree

Hide file tree

Showing 31 changed files with 726 additions and 1,249 deletions.
diff --git a/FastSimulation/Configuration/python/Reconstruction_AftMix_cff.py b/FastSimulation/Configuration/python/Reconstruction_AftMix_cff.py
@@ -98,10 +98,10 @@
 _reco.trackerDrivenElectronSeeds.idCollection.setModuleLabel("trackerDrivenElectronSeedsTmp")
 
 # replace the ECAL driven electron track candidates with the FastSim emulated ones
-import FastSimulation.EgammaElectronAlgos.electronGSGsfTrackCandidates_cff
-_reco.electronGSGsfTrackCandidates = FastSimulation.EgammaElectronAlgos.electronGSGsfTrackCandidates_cff.electronGSGsfTrackCandidates
-_reco.electronGsfTracking.replace(_reco.electronCkfTrackCandidates,_reco.electronGSGsfTrackCandidates)
-_reco.electronGsfTracks.src = "electronGSGsfTrackCandidates"
+import FastSimulation.Tracking.electronCkfTrackCandidates_cff
+_reco.fastElectronCkfTrackCandidates = FastSimulation.Tracking.electronCkfTrackCandidates_cff.electronCkfTrackCandidates.clone()
+_reco.electronGsfTracking.replace(_reco.electronCkfTrackCandidates,_reco.fastElectronCkfTrackCandidates)
+_reco.electronGsfTracks.src = "fastElectronCkfTrackCandidates"
 
 # FastSim has no template fit on tracker hits
 _reco.electronGsfTracks.TTRHBuilder = "WithoutRefit"

diff --git a/FastSimulation/EgammaElectronAlgos/BuildFile.xml b/FastSimulation/EgammaElectronAlgos/BuildFile.xml
diff --git a/FastSimulation/EgammaElectronAlgos/doc/EgammaElectronAlgos.doc b/FastSimulation/EgammaElectronAlgos/doc/EgammaElectronAlgos.doc
diff --git a/FastSimulation/EgammaElectronAlgos/python/electronGSGsfTrackCandidates_cff.py b/FastSimulation/EgammaElectronAlgos/python/electronGSGsfTrackCandidates_cff.py
diff --git a/FastSimulation/EgammaElectronAlgos/src/ElectronGSPixelSeedGenerator.h b/FastSimulation/EgammaElectronAlgos/src/ElectronGSPixelSeedGenerator.h
diff --git a/FastSimulation/EgammaElectronAlgos/src/ElectronGSPixelSeedProducer.h b/FastSimulation/EgammaElectronAlgos/src/ElectronGSPixelSeedProducer.h