Remove duplication of PV configuration: use master fillDescription, r…

…emove TkClusParameters_cff, fix filters
kpedro88 · Jan 22, 2024 · 7a7f05f · 7a7f05f
1 parent 6615820
commit 7a7f05f
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 130 deletions.
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/PV_cfg.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/PV_cfg.py
@@ -187,7 +187,7 @@
 )
 
 ## MM 04.05.2017 (use settings as in: https://github.com/cms-sw/cmssw/pull/18330)
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA_vectParameters
 DAClusterizationParams = DA_vectParameters.clone()
 
 GapClusterizationParams = cms.PSet(algorithm   = cms.string('gap'),

diff --git a/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py b/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py
@@ -216,7 +216,7 @@ def customiseKinksAndBows(process):
 )
 
 ## MM 04.05.2017 (use settings as in: https://github.com/cms-sw/cmssw/pull/18330)
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA_vectParameters
 DAClusterizationParams = DA_vectParameters.clone()
 
 GapClusterizationParams = cms.PSet(algorithm   = cms.string('gap'),

diff --git a/Alignment/OfflineValidation/test/PVValidation_T_cfg.py b/Alignment/OfflineValidation/test/PVValidation_T_cfg.py
@@ -279,7 +279,7 @@ def customiseKinksAndBows(process):
 )
 
 ## MM 04.05.2017 (use settings as in: https://github.com/cms-sw/cmssw/pull/18330)
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA_vectParameters
 DAClusterizationParams = DA_vectParameters.clone()
 
 GapClusterizationParams = cms.PSet(algorithm   = cms.string('gap'),

diff --git a/Alignment/OfflineValidation/test/testG4Refitter_cfg.py b/Alignment/OfflineValidation/test/testG4Refitter_cfg.py
@@ -130,7 +130,7 @@
 )
 
 ## MM 04.05.2017 (use settings as in: https://github.com/cms-sw/cmssw/pull/18330)
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA_vectParameters
 DAClusterizationParams = DA_vectParameters.clone()
 
 ####################################################################

diff --git a/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py b/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py
@@ -285,7 +285,7 @@ class RefitType(Enum):
 )
 
 ## MM 04.05.2017 (use settings as in: https://github.com/cms-sw/cmssw/pull/18330)
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA_vectParameters
 DAClusterizationParams = DA_vectParameters.clone()
 
 GapClusterizationParams = cms.PSet(algorithm   = cms.string('gap'),

diff --git a/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py b/Alignment/OfflineValidation/test/test_all_Phase2_cfg.py
@@ -258,7 +258,7 @@ class RefitType(Enum):
 )
 
 ## MM 04.05.2017 (use settings as in: https://github.com/cms-sw/cmssw/pull/18330)
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA_vectParameters
 DAClusterizationParams = DA_vectParameters.clone()
 
 GapClusterizationParams = cms.PSet(algorithm   = cms.string('gap'),

diff --git a/Alignment/OfflineValidation/test/test_all_cfg.py b/Alignment/OfflineValidation/test/test_all_cfg.py
@@ -256,7 +256,7 @@ class RefitType(Enum):
 )
 
 ## MM 04.05.2017 (use settings as in: https://github.com/cms-sw/cmssw/pull/18330)
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA_vectParameters
 DAClusterizationParams = DA_vectParameters.clone()
 
 GapClusterizationParams = cms.PSet(algorithm   = cms.string('gap'),

diff --git a/RecoVertex/Configuration/python/RecoVertex_phase2_timing_cff.py b/RecoVertex/Configuration/python/RecoVertex_phase2_timing_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from RecoVertex.Configuration.RecoVertex_cff import unsortedOfflinePrimaryVertices, trackWithVertexRefSelector, trackRefsForJets, sortedPrimaryVertices, offlinePrimaryVertices, offlinePrimaryVerticesWithBS,vertexrecoTask
 
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA2D_vectParameters
+from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import DA2D_vectParameters
 
 unsortedOfflinePrimaryVertices4D = unsortedOfflinePrimaryVertices.clone(
     TkClusParameters = DA2D_vectParameters,

diff --git a/RecoVertex/PrimaryVertexProducer/interface/HITrackFilterForPVFinding.h b/RecoVertex/PrimaryVertexProducer/interface/HITrackFilterForPVFinding.h
@@ -39,7 +39,6 @@ class HITrackFilterForPVFinding : public TrackFilterForPVFinding {
   }
 
   static void fillPSetDescription(edm::ParameterSetDescription& desc) {
-    TrackFilterForPVFinding::fillPSetDescription(desc);
     desc.add<int>("numTracksThreshold", 0);  // HI only
     desc.add<int>("maxNumTracksThreshold", std::numeric_limits<int>::max());
     desc.add<double>("minPtTight", 0.0);

diff --git a/RecoVertex/PrimaryVertexProducer/plugins/PrimaryVertexProducer.cc b/RecoVertex/PrimaryVertexProducer/plugins/PrimaryVertexProducer.cc
@@ -391,9 +391,7 @@ void PrimaryVertexProducer::fillDescriptions(edm::ConfigurationDescriptions& des
   {
     edm::ParameterSetDescription psd0;
     TrackFilterForPVFinding::fillPSetDescription(psd0);
-    psd0.add<int>("numTracksThreshold", 0);            // HI only
-    psd0.add<int>("maxNumTracksThreshold", 10000000);  // HI only
-    psd0.add<double>("minPtTight", 0.0);               // HI only
+    HITrackFilterForPVFinding::fillPSetDescription(psd0); // HI only
     desc.add<edm::ParameterSetDescription>("TkFilterParameters", psd0);
   }
   desc.add<edm::InputTag>("beamSpotLabel", edm::InputTag("offlineBeamSpot"));

diff --git a/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py b/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py
@@ -1,51 +1,38 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters
+from RecoVertex.PrimaryVertexProducer.primaryVertexProducer_cfi import primaryVertexProducer
 
-offlinePrimaryVertices = cms.EDProducer(
-    "PrimaryVertexProducer",
+offlinePrimaryVertices = primaryVertexProducer.clone()
 
-    verbose = cms.untracked.bool(False),
-    TrackLabel = cms.InputTag("generalTracks"),
-    beamSpotLabel = cms.InputTag("offlineBeamSpot"),
-
-    TkFilterParameters = cms.PSet(
-        algorithm=cms.string('filter'),
-        maxNormalizedChi2 = cms.double(10.0),
-        minPixelLayersWithHits=cms.int32(2),
-        minSiliconLayersWithHits = cms.int32(5),
-        maxD0Significance = cms.double(4.0), 
-        maxD0Error = cms.double(1.0), 
-        maxDzError = cms.double(1.0), 
-        minPt = cms.double(0.0),
-        maxEta = cms.double(2.4),
-        trackQuality = cms.string("any")
-    ),
+DA_vectParameters = cms.PSet(primaryVertexProducer.TkClusParameters.clone())
 
-    TkClusParameters = DA_vectParameters,
+from Configuration.ProcessModifiers.vertexInBlocks_cff import vertexInBlocks
+vertexInBlocks.toModify(offlinePrimaryVertices,
+    TkDAClusParameters = dict(
+    runInBlocks = True,
+    block_size = 128,
+    overlap_frac = 0.5
+    )
+)
 
-    vertexCollections = cms.VPSet(
-     [cms.PSet(label=cms.string(""),
-               algorithm=cms.string("AdaptiveVertexFitter"),
-               chi2cutoff = cms.double(2.5),
-               minNdof=cms.double(0.0),
-               useBeamConstraint = cms.bool(False),
-               maxDistanceToBeam = cms.double(1.0)
-               ),
-      cms.PSet(label=cms.string("WithBS"),
-               algorithm = cms.string('AdaptiveVertexFitter'),
-               chi2cutoff = cms.double(2.5),
-               minNdof=cms.double(2.0),
-               useBeamConstraint = cms.bool(True),
-               maxDistanceToBeam = cms.double(1.0),
-               )
-      ]
-    ),
-
-    isRecoveryIteration = cms.bool(False),
-    recoveryVtxCollection = cms.InputTag("")
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
+(phase2_tracker & vertexInBlocks).toModify(offlinePrimaryVertices,
+        TkDAClusParameters = dict(
+        block_size = 512,
+        overlap_frac = 0.5))
 
-
+from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
+highBetaStar_2018.toModify(offlinePrimaryVertices,
+     TkDAClusParameters = dict(
+        Tmin = 4.0,
+        Tpurge = 1.0,
+        Tstop = 1.0,
+        vertexSize = 0.01,
+        d0CutOff = 4.,
+        dzCutOff = 5.,
+        zmerge = 2.e-2,
+        uniquetrkweight = 0.9
+     )
 )
 
 from Configuration.ProcessModifiers.weightedVertexing_cff import weightedVertexing
@@ -122,3 +109,26 @@
      }
 )
 
+DA2D_vectParameters = cms.PSet(
+    algorithm   = cms.string("DA2D_vect"),
+    TkDAClusParameters = cms.PSet(
+        coolingFactor = cms.double(0.6),  # moderate annealing speed
+        zrange = cms.double(4.),          # consider only clusters within 4 sigma*sqrt(T) of a track
+        delta_highT = cms.double(1.e-2),  # convergence requirement at high T
+        delta_lowT = cms.double(1.e-3),   # convergence requirement at low T
+        convergence_mode = cms.int32(0),  # 0 = two steps, 1 = dynamic with sqrt(T)
+        Tmin = cms.double(4.0),           # end of vertex splitting
+        Tpurge = cms.double(4.0),         # cleaning 
+        Tstop = cms.double(2.0),          # end of annealing 
+        vertexSize = cms.double(0.006),   # added in quadrature to track-z resolutions
+        vertexSizeTime = cms.double(0.008),
+        d0CutOff = cms.double(3.),        # downweight high IP tracks 
+        dzCutOff = cms.double(3.),        # outlier rejection after freeze-out (T<Tmin)
+        dtCutOff = cms.double(4.),        # outlier rejection after freeze-out (T<Tmin)
+        t0Max = cms.double(1.0),          # outlier rejection for use of timing information
+        zmerge = cms.double(1e-2),        # merge intermediat clusters separated by less than zmerge and tmerge
+        tmerge = cms.double(1e-1),        # merge intermediat clusters separated by less than zmerge and tmerge
+        uniquetrkweight = cms.double(0.8),# require at least two tracks with this weight at T=Tpurge
+        uniquetrkminp = cms.double(0.0)   # minimal a priori track weight for counting unique tracks
+        )
+)
diff --git a/RecoVertex/PrimaryVertexProducer/python/TkClusParameters_cff.py b/RecoVertex/PrimaryVertexProducer/python/TkClusParameters_cff.py