Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Configuration/GlobalRuns/python/reco_TLR_35X.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ######

Expand Down
6 changes: 3 additions & 3 deletions Configuration/GlobalRuns/python/reco_TLR_36X.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Configuration/GlobalRuns/python/reco_TLR_37X.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Configuration/GlobalRuns/python/reco_TLR_38X.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(''),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)'),
Expand Down
15 changes: 15 additions & 0 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be "MaxNumberOfStripClusters" ?

Copy link
Contributor Author

@mmusich mmusich Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. MaxNumberOfStripClusters in the name of the new parameter. Here I am deleting the old one (which if mainained would make the configuration validation fail).


return process

# CMSSW version specific customizations
def customizeHLTforCMSSW(process, menuType="GRun"):
Expand All @@ -257,5 +271,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
# process = customiseFor12718(process)

process = customizeHLTfor42497(process)
process = customizeHLTfor42943(process)

return process
2 changes: 1 addition & 1 deletion HLTrigger/special/test/test_CosmicsFilters_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" ),
Expand Down
2 changes: 1 addition & 1 deletion RecoHI/HiTracking/python/hiPixelPairStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
),
ClusterCheckPSet = dict(
MaxNumberOfPixelClusters = 5000000,
MaxNumberOfCosmicClusters = 50000000,
MaxNumberOfStripClusters = 50000000,
cut = ""
),
SeedComparitorPSet = cms.PSet(
Expand Down
12 changes: 6 additions & 6 deletions RecoTracker/Configuration/python/RecoTrackerTopBottom_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
SeedsFromPositiveY = True,
SeedsFromNegativeY = False,
ClusterCollectionLabel = 'siStripClustersTop',
MaxNumberOfCosmicClusters = 150,
MaxNumberOfStripClusters = 150,

OrderedHitsFactoryPSets = {0: dict(LayerSrc = "combinatorialcosmicseedingtripletsP5Top"),
1: dict(LayerSrc = "combinatorialcosmicseedingpairsTOBP5Top"),
Expand All @@ -106,7 +106,7 @@
NegativeYOnly = False,
ClusterCheckPSet = dict(
ClusterCollectionLabel = 'siStripClustersTop',
MaxNumberOfCosmicClusters = 150,
MaxNumberOfStripClusters = 150,
),
TripletsSrc = 'simpleCosmicBONSeedingLayersTop',
)
Expand Down Expand Up @@ -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"),
Expand All @@ -204,7 +204,7 @@
NegativeYOnly = True,
ClusterCheckPSet = dict(
ClusterCollectionLabel = 'siStripClustersBottom',
MaxNumberOfCosmicClusters = 150
MaxNumberOfStripClusters = 150
),
TripletsSrc = 'simpleCosmicBONSeedingLayersBottom'
)
Expand Down Expand Up @@ -253,7 +253,7 @@
ClusterCollectionLabel = 'siStripClustersTop',
PositiveYOnly = True,
NegativeYOnly = False,
MaxNumberOfCosmicClusters = 150
MaxNumberOfStripClusters = 150
)

cosmicCandidateFinderP5Top = cosmicCandidateFinderP5.clone(
Expand Down Expand Up @@ -283,7 +283,7 @@
ClusterCollectionLabel = 'siStripClustersBottom',
PositiveYOnly = False,
NegativeYOnly = True,
MaxNumberOfCosmicClusters = 150
MaxNumberOfStripClusters = 150
)

cosmicCandidateFinderP5Bottom = cosmicCandidateFinderP5.clone(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
)
Expand All @@ -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
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/SpecialSeedGenerators/python/CosmicSeed_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion RecoTracker/TkSeedGenerator/interface/ClusterChecker.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ClusterChecker {
bool doACheck_;
edm::InputTag clusterCollectionInputTag_;
edm::InputTag pixelClusterCollectionInputTag_;
unsigned int maxNrOfCosmicClusters_;
unsigned int maxNrOfStripClusters_;
unsigned int maxNrOfPixelClusters_;
StringCutObjectSelector<reco::utils::ClusterTotals> selector_;
unsigned int ignoreDetsAboveNClusters_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
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
egamma_lowPt_exclusive.toModify(trackerClusterCheck,
doClusterCheck=True,
cut = "strip < 1000 && pixel < 300 ",
MaxNumberOfPixelClusters = 300,
MaxNumberOfCosmicClusters = 1000
MaxNumberOfStripClusters = 1000
)

6 changes: 3 additions & 3 deletions RecoTracker/TkSeedGenerator/src/ClusterChecker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ClusterChecker::ClusterChecker(const edm::ParameterSet& conf, edm::ConsumesColle
pixelClusterCollectionInputTag_ = conf.getParameter<edm::InputTag>("PixelClusterCollectionLabel");
token_sc = iC.consumes<edmNew::DetSetVector<SiStripCluster> >(clusterCollectionInputTag_);
token_pc = iC.consumes<edmNew::DetSetVector<SiPixelCluster> >(pixelClusterCollectionInputTag_);
maxNrOfCosmicClusters_ = conf.getParameter<unsigned int>("MaxNumberOfCosmicClusters");
maxNrOfStripClusters_ = conf.getParameter<unsigned int>("MaxNumberOfStripClusters");
maxNrOfPixelClusters_ = conf.getParameter<unsigned int>("MaxNumberOfPixelClusters");
if (conf.existsAs<uint32_t>("DontCountDetsAboveNClusters")) {
ignoreDetsAboveNClusters_ = conf.getParameter<uint32_t>("DontCountDetsAboveNClusters");
Expand All @@ -31,7 +31,7 @@ ClusterChecker::ClusterChecker(const edm::ParameterSet& conf, edm::ConsumesColle

void ClusterChecker::fillDescriptions(edm::ParameterSetDescription& desc) {
desc.add<bool>("doClusterCheck", true);
desc.add<unsigned>("MaxNumberOfCosmicClusters", 400000);
desc.add<unsigned>("MaxNumberOfStripClusters", 400000);
desc.add<edm::InputTag>("ClusterCollectionLabel", edm::InputTag("siStripClusters"));
desc.add<unsigned>("MaxNumberOfPixelClusters", 40000);
desc.add<edm::InputTag>("PixelClusterCollectionLabel", edm::InputTag("siPixelClusters"));
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down