Merge pull request cms-sw#31784 from jeongeun/vtxupdate112X

drop type specs in RecoVertex RecoPixelVertexing
claralasa · Oct 14, 2020 · d773e11 · d773e11
2 parents 7f62a84 + 26c731f
commit d773e11
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 57 deletions.
diff --git a/RecoPixelVertexing/PixelLowPtUtilities/python/ClusterShapeExtractor_cfi.py b/RecoPixelVertexing/PixelLowPtUtilities/python/ClusterShapeExtractor_cfi.py
@@ -20,5 +20,5 @@
 
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 phase2_tracker.toModify(clusterShapeExtractor,
-    pixelSimLinkSrc = cms.InputTag('simSiPixelDigis', 'Pixel'),
+    pixelSimLinkSrc = 'simSiPixelDigis:Pixel'
 )
diff --git a/RecoPixelVertexing/PixelLowPtUtilities/python/MinBiasCkfTrajectoryFilter_cfi.py b/RecoPixelVertexing/PixelLowPtUtilities/python/MinBiasCkfTrajectoryFilter_cfi.py
@@ -2,17 +2,16 @@
 
 # Trajectory filter for min bias
 import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff
-ckfBaseTrajectoryFilterForMinBias = TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone()
-
-ckfBaseTrajectoryFilterForMinBias.minimumNumberOfHits = 3
-ckfBaseTrajectoryFilterForMinBias.minPt               = 0.075
-
+ckfBaseTrajectoryFilterForMinBias = TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone(
+    minimumNumberOfHits = 3,
+    minPt               = 0.075
+)
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import *
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import *
 
 # Composite filter
 MinBiasCkfTrajectoryFilter = TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone(
     filters   = [cms.PSet(refToPSet_ = cms.string('ckfBaseTrajectoryFilterForMinBias')),
                  cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))]
-    )
+)
 
diff --git a/RecoPixelVertexing/PixelTriplets/python/PixelTripletHLTGenerator_cfi.py b/RecoPixelVertexing/PixelTriplets/python/PixelTripletHLTGenerator_cfi.py
@@ -19,12 +19,12 @@
 
 # do thy make any difference anywhere?
 trackingPhase2PU140.toModify(PixelTripletHLTGenerator,
-    extraHitRPhitolerance = cms.double(0.016),
-    extraHitRZtolerance = cms.double(0.020)
+    extraHitRPhitolerance = 0.016,
+    extraHitRZtolerance   = 0.020
 )
 
 import RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi
-PixelTripletHLTGeneratorWithFilter = PixelTripletHLTGenerator.clone()
-PixelTripletHLTGeneratorWithFilter.SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone()
-
+PixelTripletHLTGeneratorWithFilter = PixelTripletHLTGenerator.clone(
+    SeedComparitorPSet = RecoPixelVertexing.PixelLowPtUtilities.LowPtClusterShapeSeedComparitor_cfi.LowPtClusterShapeSeedComparitor.clone()
+)
 
diff --git a/RecoVertex/Configuration/python/RecoVertex_cff.py b/RecoVertex/Configuration/python/RecoVertex_cff.py
@@ -14,11 +14,19 @@
 from RecoJets.JetProducers.caloJetsForTrk_cff import *
 
 unsortedOfflinePrimaryVertices=offlinePrimaryVertices.clone()
-offlinePrimaryVertices=sortedPrimaryVertices.clone(vertices="unsortedOfflinePrimaryVertices", particles="trackRefsForJetsBeforeSorting")
-offlinePrimaryVerticesWithBS=sortedPrimaryVertices.clone(vertices=cms.InputTag("unsortedOfflinePrimaryVertices","WithBS"), particles="trackRefsForJetsBeforeSorting")
-trackWithVertexRefSelectorBeforeSorting = trackWithVertexRefSelector.clone(vertexTag="unsortedOfflinePrimaryVertices")
-trackWithVertexRefSelectorBeforeSorting.ptMax=9e99
-trackWithVertexRefSelectorBeforeSorting.ptErrorCut=9e99
+offlinePrimaryVertices=sortedPrimaryVertices.clone(
+    vertices="unsortedOfflinePrimaryVertices", 
+    particles="trackRefsForJetsBeforeSorting"
+)
+offlinePrimaryVerticesWithBS=sortedPrimaryVertices.clone(
+    vertices="unsortedOfflinePrimaryVertices:WithBS", 
+    particles="trackRefsForJetsBeforeSorting"
+)
+trackWithVertexRefSelectorBeforeSorting = trackWithVertexRefSelector.clone(
+    vertexTag="unsortedOfflinePrimaryVertices",
+    ptMax=9e99,
+    ptErrorCut=9e99
+)
 trackRefsForJetsBeforeSorting = trackRefsForJets.clone(src="trackWithVertexRefSelectorBeforeSorting")
 
 

diff --git a/RecoVertex/Configuration/python/RecoVertex_phase2_timing_cff.py b/RecoVertex/Configuration/python/RecoVertex_phase2_timing_cff.py
@@ -3,46 +3,73 @@
 
 from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA2D_vectParameters
 
-unsortedOfflinePrimaryVertices4D = unsortedOfflinePrimaryVertices.clone(TkClusParameters = DA2D_vectParameters,
-                                                                        TrackTimesLabel = cms.InputTag("trackTimeValueMapProducer","generalTracksConfigurableFlatResolutionModel"),
-                                                                        TrackTimeResosLabel = cms.InputTag("trackTimeValueMapProducer","generalTracksConfigurableFlatResolutionModelResolution"),
-                                                                        )
-trackWithVertexRefSelectorBeforeSorting4D = trackWithVertexRefSelector.clone(vertexTag="unsortedOfflinePrimaryVertices4D",
-                                                                                    ptMax=9e99,
-                                                                                    ptErrorCut=9e99)
-trackRefsForJetsBeforeSorting4D = trackRefsForJets.clone(src="trackWithVertexRefSelectorBeforeSorting4D")
-offlinePrimaryVertices4D=sortedPrimaryVertices.clone(vertices="unsortedOfflinePrimaryVertices4D",
-                                                            particles="trackRefsForJetsBeforeSorting4D",
-                                                            trackTimeTag=cms.InputTag("trackTimeValueMapProducer","generalTracksConfigurableFlatResolutionModel"),
-                                                            trackTimeResoTag=cms.InputTag("trackTimeValueMapProducer","generalTracksConfigurableFlatResolutionModelResolution"),
-                                                            assignment=dict(useTiming=True))
-offlinePrimaryVertices4DWithBS=offlinePrimaryVertices4D.clone(vertices="unsortedOfflinePrimaryVertices4D:WithBS")
-
-unsortedOfflinePrimaryVertices4DnoPID = unsortedOfflinePrimaryVertices4D.clone(TrackTimesLabel = "trackExtenderWithMTD:generalTrackt0",
-                                                                         TrackTimeResosLabel = "trackExtenderWithMTD:generalTracksigmat0",
-                                                                         )
-trackWithVertexRefSelectorBeforeSorting4DnoPID = trackWithVertexRefSelector.clone(vertexTag="unsortedOfflinePrimaryVertices4DnoPID",
-                                                                                  ptMax=9e99,
-                                                                                  ptErrorCut=9e99)
-trackRefsForJetsBeforeSorting4DnoPID = trackRefsForJets.clone(src="trackWithVertexRefSelectorBeforeSorting4DnoPID")
-offlinePrimaryVertices4DnoPID=offlinePrimaryVertices4D.clone(vertices="unsortedOfflinePrimaryVertices4DnoPID",
-                                                          particles="trackRefsForJetsBeforeSorting4DnoPID",
-                                                          trackTimeTag="trackExtenderWithMTD:generalTrackt0",
-                                                          trackTimeResoTag="trackExtenderWithMTD:generalTracksigmat0")
-offlinePrimaryVertices4DnoPIDWithBS=offlinePrimaryVertices4DnoPID.clone(vertices="unsortedOfflinePrimaryVertices4DnoPID:WithBS")
-
-unsortedOfflinePrimaryVertices4DwithPID = unsortedOfflinePrimaryVertices4D.clone(TrackTimesLabel = "tofPID4DnoPID:t0safe",
-                                                                                 TrackTimeResosLabel = "tofPID4DnoPID:sigmat0safe",
-                                                                                 )
-trackWithVertexRefSelectorBeforeSorting4DwithPID = trackWithVertexRefSelector.clone(vertexTag="unsortedOfflinePrimaryVertices4DwithPID",
-                                                                             ptMax=9e99,
-                                                                             ptErrorCut=9e99)
-trackRefsForJetsBeforeSorting4DwithPID = trackRefsForJets.clone(src="trackWithVertexRefSelectorBeforeSorting4DwithPID")
-offlinePrimaryVertices4DwithPID=offlinePrimaryVertices4D.clone(vertices="unsortedOfflinePrimaryVertices4DwithPID",
-                                                     particles="trackRefsForJetsBeforeSorting4DwithPID",
-                                                     trackTimeTag="tofPID4DnoPID:t0safe",
-                                                     trackTimeResoTag="tofPID4DnoPID:sigmat0safe")
-offlinePrimaryVertices4DwithPIDWithBS=offlinePrimaryVertices4DwithPID.clone(vertices="unsortedOfflinePrimaryVertices4DwithPID:WithBS")
+unsortedOfflinePrimaryVertices4D = unsortedOfflinePrimaryVertices.clone(
+    TkClusParameters = DA2D_vectParameters,
+    TrackTimesLabel = cms.InputTag("trackTimeValueMapProducer","generalTracksConfigurableFlatResolutionModel"),
+    TrackTimeResosLabel = cms.InputTag("trackTimeValueMapProducer","generalTracksConfigurableFlatResolutionModelResolution"),
+)
+trackWithVertexRefSelectorBeforeSorting4D = trackWithVertexRefSelector.clone(
+    vertexTag = "unsortedOfflinePrimaryVertices4D",
+    ptMax = 9e99,
+    ptErrorCut = 9e99
+)
+trackRefsForJetsBeforeSorting4D = trackRefsForJets.clone(
+    src = "trackWithVertexRefSelectorBeforeSorting4D"
+)
+offlinePrimaryVertices4D = sortedPrimaryVertices.clone(
+    vertices = "unsortedOfflinePrimaryVertices4D",
+    particles = "trackRefsForJetsBeforeSorting4D",
+    trackTimeTag = "trackTimeValueMapProducer:generalTracksConfigurableFlatResolutionModel",
+    trackTimeResoTag = "trackTimeValueMapProducer:generalTracksConfigurableFlatResolutionModelResolution",
+    assignment = dict(useTiming = True)
+)
+offlinePrimaryVertices4DWithBS = offlinePrimaryVertices4D.clone(
+    vertices = "unsortedOfflinePrimaryVertices4D:WithBS"
+)
+
+unsortedOfflinePrimaryVertices4DnoPID = unsortedOfflinePrimaryVertices4D.clone(
+    TrackTimesLabel = "trackExtenderWithMTD:generalTrackt0",
+    TrackTimeResosLabel = "trackExtenderWithMTD:generalTracksigmat0"
+)
+trackWithVertexRefSelectorBeforeSorting4DnoPID = trackWithVertexRefSelector.clone(
+    vertexTag = "unsortedOfflinePrimaryVertices4DnoPID",
+    ptMax = 9e99,
+    ptErrorCut = 9e99
+)
+trackRefsForJetsBeforeSorting4DnoPID = trackRefsForJets.clone(
+    src = "trackWithVertexRefSelectorBeforeSorting4DnoPID"
+)
+offlinePrimaryVertices4DnoPID = offlinePrimaryVertices4D.clone(
+    vertices = "unsortedOfflinePrimaryVertices4DnoPID",
+    particles = "trackRefsForJetsBeforeSorting4DnoPID",
+    trackTimeTag = "trackExtenderWithMTD:generalTrackt0",
+    trackTimeResoTag = "trackExtenderWithMTD:generalTracksigmat0"
+)
+offlinePrimaryVertices4DnoPIDWithBS=offlinePrimaryVertices4DnoPID.clone(
+    vertices = "unsortedOfflinePrimaryVertices4DnoPID:WithBS"
+)
+
+unsortedOfflinePrimaryVertices4DwithPID = unsortedOfflinePrimaryVertices4D.clone(
+    TrackTimesLabel = "tofPID4DnoPID:t0safe",
+    TrackTimeResosLabel = "tofPID4DnoPID:sigmat0safe"
+)
+trackWithVertexRefSelectorBeforeSorting4DwithPID = trackWithVertexRefSelector.clone(
+    vertexTag = "unsortedOfflinePrimaryVertices4DwithPID",
+    ptMax = 9e99,
+    ptErrorCut = 9e99
+)
+trackRefsForJetsBeforeSorting4DwithPID = trackRefsForJets.clone(
+    src = "trackWithVertexRefSelectorBeforeSorting4DwithPID"
+)
+offlinePrimaryVertices4DwithPID=offlinePrimaryVertices4D.clone(
+    vertices = "unsortedOfflinePrimaryVertices4DwithPID",
+    particles = "trackRefsForJetsBeforeSorting4DwithPID",
+    trackTimeTag = "tofPID4DnoPID:t0safe",
+    trackTimeResoTag = "tofPID4DnoPID:sigmat0safe"
+)
+offlinePrimaryVertices4DwithPIDWithBS = offlinePrimaryVertices4DwithPID.clone(
+    vertices = "unsortedOfflinePrimaryVertices4DwithPID:WithBS"
+)
 
 from SimTracker.TrackerHitAssociation.tpClusterProducer_cfi import tpClusterProducer
 from SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi import quickTrackAssociatorByHits