Merge pull request #19738 from makortel/pixelTracksCleanup

Cleanup pixel tracking configurations

DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py

@@ -336,9 +336,7 @@
 
 
         #pixel  track/vertices reco
-        process.load("RecoPixelVertexing.PixelTrackFitting.PixelTracks_2017_cff")
-        process.load("RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi")
-        process.recopixelvertexing = cms.Sequence(process.pixelTracksSequence + process.pixelVertices)
+        process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff")
         process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4
         process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 6
         process.pixelTracksTrackingRegions.RegionPSet.originXPos = 0.08

DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

@@ -127,9 +127,7 @@
     from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import *
     process.siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(src = 'siPixelClustersPreSplitting')
     process.load("RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi")
-    process.load("RecoPixelVertexing.PixelTrackFitting.PixelTracks_2017_cff")
-    process.load("RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi")
-    process.recopixelvertexing = cms.Sequence(process.pixelTracksSequence + process.pixelVertices)
+    process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff")
     process.pixelVertices.TkFilterParameters.minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin
     process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4
     process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 15

RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py

@@ -6,14 +6,4 @@
 #
 #from RecoPixelVertexing.PixelVertexFinding.PixelVertexes_cff import *
 from RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi import *
-recopixelvertexing = cms.Sequence(PixelLayerTriplets*pixelTracksSequence*pixelVertices)
-
-# For LowPU
-PixelLayerTripletsPreSplitting = PixelLayerTriplets.clone(
-    BPix = dict(HitProducer = "siPixelRecHitsPreSplitting"),
-    FPix = dict(HitProducer = "siPixelRecHitsPreSplitting"),
-)
-_recopixelvertexing_LowPU = recopixelvertexing.copy()
-_recopixelvertexing_LowPU.replace(PixelLayerTriplets, PixelLayerTripletsPreSplitting)
-from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
-trackingLowPU.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU)
+recopixelvertexing = cms.Sequence(pixelTracksSequence*pixelVertices)

RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py

@@ -1,17 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-# Magntic field
-# Geometry (all CMS)
-# Tracker Geometry Builder
-# Tracker Numbering Builder
-# Reco geometry 
-#from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-# for Transient rechits?
 from RecoLocalTracker.SiPixelRecHits.PixelCPEParmError_cfi import *
 from RecoLocalTracker.SiStripRecHitConverter.StripCPEfromTrackAngle_cfi import *
 from RecoLocalTracker.SiStripRecHitConverter.SiStripRecHitMatcher_cfi import *
-#-ap   include "CalibTracker/Configuration/data/SiPixelLorentzAngle/SiPixelLorentzAngle_Fake.cff"
-# include "RecoTracker/TransientTrackingRecHit/data/TransientTrackingRecHitBuilderWithoutRefit.cfi"
 from RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilder_cfi import *
 import RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilder_cfi
 myTTRHBuilderWithoutAngle = RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilder_cfi.ttrhbwr.clone(
@@ -23,42 +14,65 @@
 from RecoPixelVertexing.PixelTrackFitting.pixelFitterByHelixProjections_cfi import pixelFitterByHelixProjections
 from RecoPixelVertexing.PixelTrackFitting.pixelTrackFilterByKinematics_cfi import pixelTrackFilterByKinematics
 from RecoPixelVertexing.PixelTrackFitting.pixelTrackCleanerBySharedHits_cfi import pixelTrackCleanerBySharedHits
-from RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi import pixelTracks
+from RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi import pixelTracks as _pixelTracks
+from RecoTracker.TkTrackingRegions.globalTrackingRegion_cfi import globalTrackingRegion as _globalTrackingRegion
 from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpot_cfi import globalTrackingRegionFromBeamSpot as _globalTrackingRegionFromBeamSpot
 from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer
 from RecoPixelVertexing.PixelTriplets.pixelTripletHLTEDProducer_cfi import pixelTripletHLTEDProducer as _pixelTripletHLTEDProducer
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import *
 import RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi
-from RecoPixelVertexing.PixelTriplets.pixelQuadrupletMergerEDProducer_cfi import pixelQuadrupletMergerEDProducer as _pixelQuadrupletMergerEDProducer
-from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *
+from RecoTracker.FinalTrackSelectors.trackAlgoPriorityOrder_cfi import trackAlgoPriorityOrder
 
 from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
 
+# SEEDING LAYERS
+from RecoTracker.IterativeTracking.InitialStep_cff import initialStepSeedLayers, initialStepHitDoublets, initialStepHitQuadruplets
+
 # TrackingRegion
-pixelTracksTrackingRegions = _globalTrackingRegionFromBeamSpot.clone()
+pixelTracksTrackingRegions = _globalTrackingRegion.clone()
+trackingLowPU.toReplaceWith(pixelTracksTrackingRegions, _globalTrackingRegionFromBeamSpot.clone())
+
+
+# Pixel Quadruplets Tracking
+pixelTracksSeedLayers = initialStepSeedLayers.clone(
+    BPix = dict(HitProducer = "siPixelRecHitsPreSplitting"),
+    FPix = dict(HitProducer = "siPixelRecHitsPreSplitting")
+)
 
-# Hit ntuplets
-pixelTracksHitDoublets = _hitPairEDProducer.clone(
+pixelTracksHitDoublets = initialStepHitDoublets.clone(
     clusterCheck = "",
-    seedingLayers = "PixelLayerTriplets",
-    trackingRegions = "pixelTracksTrackingRegions",
-    maxElement = 0,
-    produceIntermediateHitDoublets = True,
+    seedingLayers = "pixelTracksSeedLayers",
+    trackingRegions = "pixelTracksTrackingRegions"
 )
-trackingLowPU.toModify(pixelTracksHitDoublets, seedingLayers = "PixelLayerTripletsPreSplitting")
 
+pixelTracksHitQuadruplets = initialStepHitQuadruplets.clone(
+    doublets = "pixelTracksHitDoublets",
+    SeedComparitorPSet = dict(clusterShapeCacheSrc = 'siPixelClusterShapeCachePreSplitting')
+)
+
+# for trackingLowPU
 pixelTracksHitTriplets = _pixelTripletHLTEDProducer.clone(
     doublets = "pixelTracksHitDoublets",
     produceSeedingHitSets = True,
-    SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone()
+    SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone(
+        clusterShapeCacheSrc = "siPixelClusterShapeCachePreSplitting"
+    )
+)
+
+pixelTracks = _pixelTracks.clone(
+    SeedingHitSets = "pixelTracksHitQuadruplets"
 )
-trackingLowPU.toModify(pixelTracksHitTriplets, SeedComparitorPSet = dict(clusterShapeCacheSrc = "siPixelClusterShapeCachePreSplitting"))
+trackingLowPU.toModify(pixelTracks, SeedingHitSets = "pixelTracksHitTriplets")
 
 pixelTracksSequence = cms.Sequence(
     pixelTracksTrackingRegions +
-    pixelTracksHitDoublets +
-    pixelTracksHitTriplets +
     pixelFitterByHelixProjections +
     pixelTrackFilterByKinematics +
+    pixelTracksSeedLayers +
+    pixelTracksHitDoublets +
+    pixelTracksHitQuadruplets +
     pixelTracks
 )
+_pixelTracksSequence_lowPU = pixelTracksSequence.copy()
+_pixelTracksSequence_lowPU.replace(pixelTracksHitQuadruplets, pixelTracksHitTriplets)
+trackingLowPU.toReplaceWith(pixelTracksSequence, _pixelTracksSequence_lowPU)

RecoTracker/IterativeTracking/python/InitialStep_cff.py

@@ -60,8 +60,25 @@
 initialStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone(
     seedingHitSets = "initialStepHitTriplets",
 )
+from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer
+initialStepHitQuadruplets = _caHitQuadrupletEDProducer.clone(
+    doublets = "initialStepHitDoublets",
+    extraHitRPhitolerance = initialStepHitTriplets.extraHitRPhitolerance,
+    SeedComparitorPSet = initialStepHitTriplets.SeedComparitorPSet,
+    maxChi2 = dict(
+        pt1    = 0.7, pt2    = 2,
+        value1 = 200, value2 = 50,
+    ),
+    useBendingCorrection = True,
+    fitFastCircle = True,
+    fitFastCircleChi2Cut = True,
+    CAThetaCut = 0.0012,
+    CAPhiCut = 0.2,
+)
+trackingPhase1.toModify(initialStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3)
+
 from RecoPixelVertexing.PixelTriplets.pixelQuadrupletEDProducer_cfi import pixelQuadrupletEDProducer as _pixelQuadrupletEDProducer
-initialStepHitQuadruplets = _pixelQuadrupletEDProducer.clone(
+trackingPhase1QuadProp.toReplaceWith(initialStepHitQuadruplets, _pixelQuadrupletEDProducer.clone(
     triplets = "initialStepHitTriplets",
     extraHitRZtolerance = initialStepHitTriplets.extraHitRZtolerance,
     extraHitRPhitolerance = initialStepHitTriplets.extraHitRPhitolerance,
@@ -79,45 +96,12 @@
     fitFastCircle = True,
     fitFastCircleChi2Cut = True,
     SeedComparitorPSet = initialStepHitTriplets.SeedComparitorPSet
-)
-
-from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer
-trackingPhase1.toModify(initialStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3)
-trackingPhase1.toReplaceWith(initialStepHitQuadruplets, _caHitQuadrupletEDProducer.clone(
-    doublets = "initialStepHitDoublets",
-    extraHitRPhitolerance = initialStepHitTriplets.extraHitRPhitolerance,
-    SeedComparitorPSet = initialStepHitTriplets.SeedComparitorPSet,
-    maxChi2 = dict(
-        pt1    = 0.7, pt2    = 2,
-        value1 = 200, value2 = 50,
-    ),
-    useBendingCorrection = True,
-    fitFastCircle = True,
-    fitFastCircleChi2Cut = True,
-    CAThetaCut = 0.0012,
-    CAPhiCut = 0.2,
 ))
 
 trackingPhase2PU140.toModify(initialStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3)
-trackingPhase2PU140.toReplaceWith(initialStepHitQuadruplets, _caHitQuadrupletEDProducer.clone(
-    doublets = "initialStepHitDoublets",
-    extraHitRPhitolerance = initialStepHitTriplets.extraHitRPhitolerance,
-    SeedComparitorPSet = initialStepHitTriplets.SeedComparitorPSet,
-    maxChi2 = dict(
-        pt1    = 0.7, pt2    = 2,
-        value1 = 200, value2 = 50,
-    ),
-    useBendingCorrection = True,
-    fitFastCircle = True,
-    fitFastCircleChi2Cut = True,
+trackingPhase2PU140.toModify(initialStepHitQuadruplets,
     CAThetaCut = 0.0010,
     CAPhiCut = 0.175,
-))
-
-
-trackingPhase2PU140.toModify(initialStepHitTriplets,
-    produceSeedingHitSets = False,
-    produceIntermediateHitTriplets = True,
 )
 
 from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cff import seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer as _seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer