Merge pull request #20127 from makortel/removeQuadrupletSeedMerger

Remove QuadrupletSeedMerger as obsolete
cms-sw · Aug 15, 2017 · 52100a6 · 52100a6
2 parents 6ab7ce3 + caa4f5b
commit 52100a6
Show file tree

Hide file tree

Showing 16 changed files with 64 additions and 1,172 deletions.
diff --git a/RecoHI/HiTracking/python/HIPixel3PrimTracks_cfi.py b/RecoHI/HiTracking/python/HIPixel3PrimTracks_cfi.py
@@ -3,18 +3,16 @@
 from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer
 from RecoPixelVertexing.PixelTriplets.pixelTripletHLTEDProducer_cfi import pixelTripletHLTEDProducer as _pixelTripletHLTEDProducer
 from RecoPixelVertexing.PixelTriplets.pixelQuadrupletEDProducer_cfi import pixelQuadrupletEDProducer as _pixelQuadrupletEDProducer
-from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import *
 from RecoPixelVertexing.PixelLowPtUtilities.trackCleaner_cfi import *
 from RecoPixelVertexing.PixelTrackFitting.pixelFitterByHelixProjections_cfi import *
 from RecoHI.HiTracking.HIPixelTrackFilter_cff import *
 from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
-from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
+from RecoTracker.TkSeedingLayers.PixelLayerQuadruplets_cfi import PixelLayerQuadruplets as _PixelLayerQuadruplets
 
 #from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *
 
-hiPixelLayerQuadruplets = PixelLayerTriplets.clone()
-hiPixelLayerQuadruplets.layerList = PixelSeedMergerQuadruplets.layerList
+hiPixelLayerQuadruplets = _PixelLayerQuadruplets.clone()
 
 # Hit ntuplets
 hiPixel3PrimTracksHitDoublets = _hitPairEDProducer.clone(

diff --git a/RecoHI/HiTracking/python/HIPixelTripletSeeds_cff.py b/RecoHI/HiTracking/python/HIPixelTripletSeeds_cff.py
@@ -2,6 +2,7 @@
 
 # pixel track producer (with vertex)
 from RecoHI.HiTracking.HIPixel3PrimTracks_cfi import *
+from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
 
 # pixel seeds
 import RecoPixelVertexing.PixelLowPtUtilities.TrackSeeds_cfi

diff --git a/RecoPixelVertexing/PixelTriplets/interface/QuadrupletSeedMerger.h b/RecoPixelVertexing/PixelTriplets/interface/QuadrupletSeedMerger.h
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/PixelQuadrupletMergerEDProducer.cc b/RecoPixelVertexing/PixelTriplets/plugins/PixelQuadrupletMergerEDProducer.cc
diff --git a/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py b/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py