From e282ba806cdcb2ac4c1bfa53f90c21ad8945cc25 Mon Sep 17 00:00:00 2001 From: mmusich Date: Mon, 2 Oct 2023 15:24:31 +0200 Subject: [PATCH 1/3] rename MaxNumberOfCosmicClusters parameters in ClusterChecker to MaxNumberOfStripClusters --- Configuration/GlobalRuns/python/reco_TLR_35X.py | 6 +++--- Configuration/GlobalRuns/python/reco_TLR_36X.py | 6 +++--- Configuration/GlobalRuns/python/reco_TLR_37X.py | 6 +++--- Configuration/GlobalRuns/python/reco_TLR_38X.py | 6 +++--- .../clients/pixel_dqm_sourceclient-live_cfg.py | 4 ++-- .../clients/sistrip_dqm_sourceclient-live_cfg.py | 4 ++-- HLTrigger/special/test/test_CosmicsFilters_cfg.py | 2 +- RecoHI/HiTracking/python/hiPixelPairStep_cff.py | 2 +- .../Configuration/python/RecoTrackerTopBottom_cff.py | 12 ++++++------ ...rsionTrajectorySeedProducerFromQuadruplets_cfi.py | 2 +- ...versionTrajectorySeedProducerFromSingleLeg_cfi.py | 4 ++-- .../CombinatorialSeedGeneratorForBeamHalo_cfi.py | 2 +- ...dGeneratorForCosmicsRegionalReconstruction_cfi.py | 2 +- .../CombinatorialSeedGeneratorForCosmics_cfi.py | 2 +- .../SpecialSeedGenerators/python/CosmicSeed_cfi.py | 2 +- .../python/SimpleCosmicBONSeeder_cfi.py | 2 +- .../TkSeedGenerator/interface/ClusterChecker.h | 2 +- .../python/GlobalPixelLessSeeds_cff.py | 2 +- .../SeedGeneratorFromRegionHitsEDProducer_cfi.py | 2 +- .../python/trackerClusterCheck_cfi.py | 4 ++-- RecoTracker/TkSeedGenerator/src/ClusterChecker.cc | 6 +++--- .../recoT0DQM_EvContent_40T_digiOnly_cfg.py | 2 +- 22 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Configuration/GlobalRuns/python/reco_TLR_35X.py b/Configuration/GlobalRuns/python/reco_TLR_35X.py index 334dea9bfc609..fec99e083d461 100644 --- a/Configuration/GlobalRuns/python/reco_TLR_35X.py +++ b/Configuration/GlobalRuns/python/reco_TLR_35X.py @@ -11,10 +11,10 @@ def customiseCommon(process): ## TRACKING: ## Skip events with HV off process.newSeedFromTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfCosmicClusters=10000 + process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfStripClusters=10000 process.secTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.fifthSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters = 10000 - process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters=10000 + process.fifthSeeds.ClusterCheckPSet.MaxNumberOfStripClusters = 10000 + process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfStripClusters=10000 ###### FIXES TRIPLETS FOR LARGE BS DISPLACEMENT ###### diff --git a/Configuration/GlobalRuns/python/reco_TLR_36X.py b/Configuration/GlobalRuns/python/reco_TLR_36X.py index 89c064a43ed15..d2b3b38ebef6f 100644 --- a/Configuration/GlobalRuns/python/reco_TLR_36X.py +++ b/Configuration/GlobalRuns/python/reco_TLR_36X.py @@ -10,10 +10,10 @@ def customiseCommon(process): ## TRACKING: ## Skip events with HV off process.newSeedFromTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfCosmicClusters=20000 + process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfStripClusters=20000 process.secTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.fifthSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters = 20000 - process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters=20000 + process.fifthSeeds.ClusterCheckPSet.MaxNumberOfStripClusters = 20000 + process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfStripClusters=20000 process.thTripletsA.ClusterCheckPSet.MaxNumberOfPixelClusters = 5000 process.thTripletsB.ClusterCheckPSet.MaxNumberOfPixelClusters = 5000 diff --git a/Configuration/GlobalRuns/python/reco_TLR_37X.py b/Configuration/GlobalRuns/python/reco_TLR_37X.py index 4a316aa59ae22..1d9a254f76c72 100644 --- a/Configuration/GlobalRuns/python/reco_TLR_37X.py +++ b/Configuration/GlobalRuns/python/reco_TLR_37X.py @@ -10,10 +10,10 @@ def customiseCommon(process): ## TRACKING: ## Skip events with HV off process.newSeedFromTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfCosmicClusters=20000 + process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfStripClusters=20000 process.secTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.fifthSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters = 20000 - process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters=20000 + process.fifthSeeds.ClusterCheckPSet.MaxNumberOfStripClusters = 20000 + process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfStripClusters=20000 process.thTripletsA.ClusterCheckPSet.MaxNumberOfPixelClusters = 5000 process.thTripletsB.ClusterCheckPSet.MaxNumberOfPixelClusters = 5000 diff --git a/Configuration/GlobalRuns/python/reco_TLR_38X.py b/Configuration/GlobalRuns/python/reco_TLR_38X.py index 202091caf8156..ea8a87b11f162 100644 --- a/Configuration/GlobalRuns/python/reco_TLR_38X.py +++ b/Configuration/GlobalRuns/python/reco_TLR_38X.py @@ -10,10 +10,10 @@ def customiseCommon(process): ## TRACKING: ## Skip events with HV off process.newSeedFromTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfCosmicClusters=20000 + process.newSeedFromPairs.ClusterCheckPSet.MaxNumberOfStripClusters=20000 process.secTriplets.ClusterCheckPSet.MaxNumberOfPixelClusters=2000 - process.fifthSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters = 20000 - process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters=20000 + process.fifthSeeds.ClusterCheckPSet.MaxNumberOfStripClusters = 20000 + process.fourthPLSeeds.ClusterCheckPSet.MaxNumberOfStripClusters=20000 process.thTripletsA.ClusterCheckPSet.MaxNumberOfPixelClusters = 5000 process.thTripletsB.ClusterCheckPSet.MaxNumberOfPixelClusters = 5000 diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py index ad72f83bb39bc..7df9fa22ac802 100644 --- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py @@ -185,8 +185,8 @@ # Reco for cosmic data process.load('RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cfi') - process.simpleCosmicBONSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters = 450 - process.combinatorialcosmicseedfinderP5.MaxNumberOfCosmicClusters = 450 + process.simpleCosmicBONSeeds.ClusterCheckPSet.MaxNumberOfStripClusters = 450 + process.combinatorialcosmicseedfinderP5.MaxNumberOfStripClusters = 450 diff --git a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py index 287022e5e1cfc..e06ddfada3199 100644 --- a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py @@ -270,8 +270,8 @@ # Reco for cosmic data process.load('RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cfi') - process.simpleCosmicBONSeeds.ClusterCheckPSet.MaxNumberOfCosmicClusters = 450 - process.combinatorialcosmicseedfinderP5.MaxNumberOfCosmicClusters = 450 + process.simpleCosmicBONSeeds.ClusterCheckPSet.MaxNumberOfStripClusters = 450 + process.combinatorialcosmicseedfinderP5.MaxNumberOfStripClusters = 450 process.RecoForDQM_TrkReco_cosmic = cms.Sequence(process.offlineBeamSpot*process.MeasurementTrackerEvent*process.ctftracksP5) diff --git a/HLTrigger/special/test/test_CosmicsFilters_cfg.py b/HLTrigger/special/test/test_CosmicsFilters_cfg.py index b8ddef8ec71e3..11c0e2ec1a324 100644 --- a/HLTrigger/special/test/test_CosmicsFilters_cfg.py +++ b/HLTrigger/special/test/test_CosmicsFilters_cfg.py @@ -88,7 +88,7 @@ process.hltRegionalCosmicTrackerSeeds = cms.EDProducer( "SeedGeneratorFromRegionHitsEDProducer", ClusterCheckPSet = cms.PSet( - MaxNumberOfCosmicClusters = cms.uint32( 50000 ), + MaxNumberOfStripClusters = cms.uint32( 50000 ), ClusterCollectionLabel = cms.InputTag( "hltSiStripClusters" ), doClusterCheck = cms.bool( False ), PixelClusterCollectionLabel = cms.InputTag( "hltSiPixelClusters" ), diff --git a/RecoHI/HiTracking/python/hiPixelPairStep_cff.py b/RecoHI/HiTracking/python/hiPixelPairStep_cff.py index 6cf737bb9f025..e29f0e125de77 100644 --- a/RecoHI/HiTracking/python/hiPixelPairStep_cff.py +++ b/RecoHI/HiTracking/python/hiPixelPairStep_cff.py @@ -66,7 +66,7 @@ ), ClusterCheckPSet = dict( MaxNumberOfPixelClusters = 5000000, - MaxNumberOfCosmicClusters = 50000000, + MaxNumberOfStripClusters = 50000000, cut = "" ), SeedComparitorPSet = cms.PSet( diff --git a/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py b/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py index 99f27e143fd47..c45eb3e2e996c 100644 --- a/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py +++ b/RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py @@ -80,7 +80,7 @@ SeedsFromPositiveY = True, SeedsFromNegativeY = False, ClusterCollectionLabel = 'siStripClustersTop', - MaxNumberOfCosmicClusters = 150, + MaxNumberOfStripClusters = 150, OrderedHitsFactoryPSets = {0: dict(LayerSrc = "combinatorialcosmicseedingtripletsP5Top"), 1: dict(LayerSrc = "combinatorialcosmicseedingpairsTOBP5Top"), @@ -106,7 +106,7 @@ NegativeYOnly = False, ClusterCheckPSet = dict( ClusterCollectionLabel = 'siStripClustersTop', - MaxNumberOfCosmicClusters = 150, + MaxNumberOfStripClusters = 150, ), TripletsSrc = 'simpleCosmicBONSeedingLayersTop', ) @@ -180,7 +180,7 @@ SeedsFromPositiveY = False, SeedsFromNegativeY = True, ClusterCollectionLabel = 'siStripClustersBottom', - MaxNumberOfCosmicClusters = 150, + MaxNumberOfStripClusters = 150, OrderedHitsFactoryPSets = {0: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingtripletsP5Bottom"), 1: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingpairsTOBP5Bottom"), 2: dict(PropagationDirection = 'oppositeToMomentum', LayerSrc = "combinatorialcosmicseedingpairsTECposP5Bottom"), @@ -204,7 +204,7 @@ NegativeYOnly = True, ClusterCheckPSet = dict( ClusterCollectionLabel = 'siStripClustersBottom', - MaxNumberOfCosmicClusters = 150 + MaxNumberOfStripClusters = 150 ), TripletsSrc = 'simpleCosmicBONSeedingLayersBottom' ) @@ -253,7 +253,7 @@ ClusterCollectionLabel = 'siStripClustersTop', PositiveYOnly = True, NegativeYOnly = False, - MaxNumberOfCosmicClusters = 150 + MaxNumberOfStripClusters = 150 ) cosmicCandidateFinderP5Top = cosmicCandidateFinderP5.clone( @@ -283,7 +283,7 @@ ClusterCollectionLabel = 'siStripClustersBottom', PositiveYOnly = False, NegativeYOnly = True, - MaxNumberOfCosmicClusters = 150 + MaxNumberOfStripClusters = 150 ) cosmicCandidateFinderP5Bottom = cosmicCandidateFinderP5.clone( diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cfi.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cfi.py index 5d65ca392aba2..cee9e464d3d88 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cfi.py +++ b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromQuadruplets_cfi.py @@ -21,7 +21,7 @@ ), ClusterCheckPSet = cms.PSet( PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), - MaxNumberOfCosmicClusters = cms.uint32(50000), + MaxNumberOfStripClusters = cms.uint32(50000), doClusterCheck = cms.bool(True), ClusterCollectionLabel = cms.InputTag("siStripClusters"), MaxNumberOfPixelClusters = cms.uint32(10000) diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py index 2de005fbd6d89..512ab85cbd23c 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py +++ b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py @@ -45,7 +45,7 @@ trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, OrderedHitsFactoryPSet = dict(maxElement = 10000), ClusterCheckPSet = dict( - MaxNumberOfCosmicClusters = 150000, + MaxNumberOfStripClusters = 150000, MaxNumberOfPixelClusters = 20000, cut = "strip < 150000 && pixel < 20000 && (strip < 20000 + 7* pixel)" ) @@ -54,7 +54,7 @@ from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 trackingPhase2PU140.toModify(photonConvTrajSeedFromSingleLeg, ClusterCheckPSet = dict( - MaxNumberOfCosmicClusters = 1000000, + MaxNumberOfStripClusters = 1000000, MaxNumberOfPixelClusters = 100000, cut = None ), diff --git a/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py b/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py index f1191d56856e4..c12903994b8c4 100644 --- a/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py @@ -92,7 +92,7 @@ SeedsFromNegativeY = cms.bool(False), doClusterCheck = cms.bool(True), ClusterCollectionLabel = cms.InputTag("siStripClusters"), - MaxNumberOfCosmicClusters = cms.uint32(10000), + MaxNumberOfStripClusters = cms.uint32(10000), MaxNumberOfPixelClusters = cms.uint32(10000), PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), CheckHitsAreOnDifferentLayers = cms.bool(False), diff --git a/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py b/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py index d4a15a485c2c5..7e0f16b36522f 100644 --- a/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py @@ -70,7 +70,7 @@ ), ClusterCheckPSet = cms.PSet ( - MaxNumberOfCosmicClusters = cms.uint32(10000), + MaxNumberOfStripClusters = cms.uint32(10000), ClusterCollectionLabel = cms.InputTag( "siStripClusters" ), MaxNumberOfPixelClusters = cms.uint32(10000), PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), diff --git a/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py b/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py index 771a5bfc5a7c8..7615846590095 100644 --- a/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py @@ -107,7 +107,7 @@ CheckHitsAreOnDifferentLayers = cms.bool(False), SetMomentum = cms.bool(True), ClusterCollectionLabel = cms.InputTag("siStripClusters"), - MaxNumberOfCosmicClusters = cms.uint32(300), + MaxNumberOfStripClusters = cms.uint32(300), PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), MaxNumberOfPixelClusters = cms.uint32(300), requireBOFF = cms.bool(False), diff --git a/RecoTracker/SpecialSeedGenerators/python/CosmicSeed_cfi.py b/RecoTracker/SpecialSeedGenerators/python/CosmicSeed_cfi.py index 53630f212b000..a02f700d15f86 100644 --- a/RecoTracker/SpecialSeedGenerators/python/CosmicSeed_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/CosmicSeed_cfi.py @@ -6,7 +6,7 @@ GeometricStructure = cms.untracked.string('STANDARD'), ##other choice: TIBD+ matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"), - MaxNumberOfCosmicClusters = cms.uint32(300), + MaxNumberOfStripClusters = cms.uint32(300), maxSeeds = cms.int32(10000), SeedPt = cms.double(5.0), HitsForSeeds = cms.untracked.string('pairs'), diff --git a/RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py b/RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py index dda2dd33afd08..0139e2cfe4826 100644 --- a/RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py @@ -36,7 +36,7 @@ def makeSimpleCosmicSeedLayers(*layers): TTRHBuilder = cms.string('WithTrackAngle'), ClusterCheckPSet = cms.PSet( doClusterCheck = cms.bool(True), - MaxNumberOfCosmicClusters = cms.uint32(300), + MaxNumberOfStripClusters = cms.uint32(300), ClusterCollectionLabel = cms.InputTag("siStripClusters"), DontCountDetsAboveNClusters = cms.uint32(20), # if N > 0, ignore in total the dets with more than N clusters MaxNumberOfPixelClusters = cms.uint32(300), diff --git a/RecoTracker/TkSeedGenerator/interface/ClusterChecker.h b/RecoTracker/TkSeedGenerator/interface/ClusterChecker.h index 7a476e0ac2b83..7b4ce9bddcb48 100644 --- a/RecoTracker/TkSeedGenerator/interface/ClusterChecker.h +++ b/RecoTracker/TkSeedGenerator/interface/ClusterChecker.h @@ -42,7 +42,7 @@ class ClusterChecker { bool doACheck_; edm::InputTag clusterCollectionInputTag_; edm::InputTag pixelClusterCollectionInputTag_; - unsigned int maxNrOfCosmicClusters_; + unsigned int maxNrOfStripClusters_; unsigned int maxNrOfPixelClusters_; StringCutObjectSelector selector_; unsigned int ignoreDetsAboveNClusters_; diff --git a/RecoTracker/TkSeedGenerator/python/GlobalPixelLessSeeds_cff.py b/RecoTracker/TkSeedGenerator/python/GlobalPixelLessSeeds_cff.py index 52ee0f2fac94b..22f89bdc62f65 100644 --- a/RecoTracker/TkSeedGenerator/python/GlobalPixelLessSeeds_cff.py +++ b/RecoTracker/TkSeedGenerator/python/GlobalPixelLessSeeds_cff.py @@ -20,5 +20,5 @@ ## whatever happens to the beam spot RegionFactoryPSet = dict(RegionPSet = dict(originHalfLength = 40)), ## safe against APV-induced noise - ClusterCheckPSet = dict(MaxNumberOfCosmicClusters = 5000) + ClusterCheckPSet = dict(MaxNumberOfStripClusters = 5000) ) diff --git a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py index 40a6304b444d8..01f9134bb494f 100644 --- a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py @@ -28,7 +28,7 @@ ##add a protection for too many clusters in the event. ClusterCheckPSet = cms.PSet( doClusterCheck = cms.bool(True), - MaxNumberOfCosmicClusters = cms.uint32(400000), + MaxNumberOfStripClusters = cms.uint32(400000), ClusterCollectionLabel = cms.InputTag("siStripClusters"), MaxNumberOfPixelClusters = cms.uint32(40000), PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), diff --git a/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py b/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py index d6071f52b432c..e8d07bc719229 100644 --- a/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py @@ -24,7 +24,7 @@ doClusterCheck=True, cut = "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + strip/2.)", MaxNumberOfPixelClusters = 150000, - MaxNumberOfCosmicClusters = 500000 + MaxNumberOfStripClusters = 500000 ) from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive @@ -32,6 +32,6 @@ doClusterCheck=True, cut = "strip < 1000 && pixel < 300 ", MaxNumberOfPixelClusters = 300, - MaxNumberOfCosmicClusters = 1000 + MaxNumberOfStripClusters = 1000 ) diff --git a/RecoTracker/TkSeedGenerator/src/ClusterChecker.cc b/RecoTracker/TkSeedGenerator/src/ClusterChecker.cc index c17e272cb32bc..b8889acaae884 100644 --- a/RecoTracker/TkSeedGenerator/src/ClusterChecker.cc +++ b/RecoTracker/TkSeedGenerator/src/ClusterChecker.cc @@ -19,7 +19,7 @@ ClusterChecker::ClusterChecker(const edm::ParameterSet& conf, edm::ConsumesColle pixelClusterCollectionInputTag_ = conf.getParameter("PixelClusterCollectionLabel"); token_sc = iC.consumes >(clusterCollectionInputTag_); token_pc = iC.consumes >(pixelClusterCollectionInputTag_); - maxNrOfCosmicClusters_ = conf.getParameter("MaxNumberOfCosmicClusters"); + maxNrOfStripClusters_ = conf.getParameter("MaxNumberOfStripClusters"); maxNrOfPixelClusters_ = conf.getParameter("MaxNumberOfPixelClusters"); if (conf.existsAs("DontCountDetsAboveNClusters")) { ignoreDetsAboveNClusters_ = conf.getParameter("DontCountDetsAboveNClusters"); @@ -31,7 +31,7 @@ ClusterChecker::ClusterChecker(const edm::ParameterSet& conf, edm::ConsumesColle void ClusterChecker::fillDescriptions(edm::ParameterSetDescription& desc) { desc.add("doClusterCheck", true); - desc.add("MaxNumberOfCosmicClusters", 400000); + desc.add("MaxNumberOfStripClusters", 400000); desc.add("ClusterCollectionLabel", edm::InputTag("siStripClusters")); desc.add("MaxNumberOfPixelClusters", 40000); desc.add("PixelClusterCollectionLabel", edm::InputTag("siPixelClusters")); @@ -69,7 +69,7 @@ size_t ClusterChecker::tooManyClusters(const edm::Event& e) const { } } } - if (totals.strip > int(maxNrOfCosmicClusters_)) + if (totals.strip > int(maxNrOfStripClusters_)) return totals.strip; // get special input for pixel cluster multiplicity filter diff --git a/SimGeneral/DataMixingModule/python/supplementary/recoT0DQM_EvContent_40T_digiOnly_cfg.py b/SimGeneral/DataMixingModule/python/supplementary/recoT0DQM_EvContent_40T_digiOnly_cfg.py index b8d78491bacf4..15910a24ba5f7 100644 --- a/SimGeneral/DataMixingModule/python/supplementary/recoT0DQM_EvContent_40T_digiOnly_cfg.py +++ b/SimGeneral/DataMixingModule/python/supplementary/recoT0DQM_EvContent_40T_digiOnly_cfg.py @@ -94,7 +94,7 @@ process.load("L1TriggerConfig.CSCTFConfigProducers.CSCTFConfigProducer_cfi") process.load("L1TriggerConfig.CSCTFConfigProducers.L1MuCSCTFConfigurationRcdSrc_cfi") -#process.roadSearchSeedsP5.MaxNumberOfCosmicClusters = 100 +#process.roadSearchSeedsP5.MaxNumberOfStripClusters = 100 #Paths From 5a1f7515382ad2dd13b0c2fd82ab79b93d400c27 Mon Sep 17 00:00:00 2001 From: mmusich Date: Tue, 3 Oct 2023 09:42:06 +0200 Subject: [PATCH 2/3] add customization function for changing MaxNumberOfCosmicClusters -> MaxNumberOfStripClusters in the HLT menus --- .../Configuration/python/customizeHLTforCMSSW.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index dc63336e1b733..6f145fb14545c 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -247,6 +247,20 @@ def customizeHLTfor42497(process): return process +def customizeHLTfor42943(process): + + for prod in producers_by_type(process, 'ClusterCheckerEDProducer'): + if hasattr(prod, "MaxNumberOfCosmicClusters"): + prod.MaxNumberOfStripClusters = getattr(prod,"MaxNumberOfCosmicClusters") + prod.__delattr__("MaxNumberOfCosmicClusters") + + for prod in producers_by_type(process, 'SeedGeneratorFromRegionHitsEDProducer'): + if hasattr(prod, "ClusterCheckPSet"): + clustCheckPSet = getattr(prod,"ClusterCheckPSet") + prod.ClusterCheckPSet.MaxNumberOfStripClusters = getattr(clustCheckPSet,"MaxNumberOfCosmicClusters") + clustCheckPSet.__delattr__("MaxNumberOfCosmicClusters") + + return process # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -257,5 +271,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # process = customiseFor12718(process) process = customizeHLTfor42497(process) + process = customizeHLTfor42943(process) return process From 8ec9dc6f5be5f05a4ec2d15822911a1bcede2185 Mon Sep 17 00:00:00 2001 From: mmusich Date: Wed, 4 Oct 2023 12:58:38 +0200 Subject: [PATCH 3/3] change MaxNumberOfCosmicClusters -> MaxNumberOfStripClusters in the Phase-2 HLT menus --- .../hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py | 2 +- .../python/HLT_75e33/modules/trackerClusterCheck_cfi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py index c66c972bca81b..48afa1d05df5d 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltIter2Phase2L3FromL1TkMuonPixelClusterCheck_cfi.py @@ -2,7 +2,7 @@ hltIter2Phase2L3FromL1TkMuonPixelClusterCheck = cms.EDProducer("ClusterCheckerEDProducer", ClusterCollectionLabel = cms.InputTag("MeasurementTrackerEvent"), - MaxNumberOfCosmicClusters = cms.uint32(50000), + MaxNumberOfStripClusters = cms.uint32(50000), MaxNumberOfPixelClusters = cms.uint32(10000), PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), cut = cms.string(''), diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/trackerClusterCheck_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/trackerClusterCheck_cfi.py index 96d0b420d4e89..e201339880723 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/trackerClusterCheck_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/trackerClusterCheck_cfi.py @@ -2,7 +2,7 @@ trackerClusterCheck = cms.EDProducer("ClusterCheckerEDProducer", ClusterCollectionLabel = cms.InputTag("siStripClusters"), - MaxNumberOfCosmicClusters = cms.uint32(400000), + MaxNumberOfStripClusters = cms.uint32(400000), MaxNumberOfPixelClusters = cms.uint32(40000), PixelClusterCollectionLabel = cms.InputTag("siPixelClusters"), cut = cms.string('strip < 400000 && pixel < 40000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + 0.1*strip)'),