Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate module config in RecoTracker to use default seedingLayersEDProducer in cfipython v2 #35555

Merged
merged 1 commit into from
Oct 9, 2021
Merged

Migrate module config in RecoTracker to use default seedingLayersEDProducer in cfipython v2 #35555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 31 additions & 17 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,41 +88,46 @@
#other combinations could be added
],

BPix = cms.PSet(
BPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
skipClusters = cms.InputTag('conv2Clusters'),
),
FPix = cms.PSet(
FPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TIB1 = cms.PSet(
Copy link
Contributor

Choose a reason for hiding this comment

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

sorry if I misunderstand, but why not doing PSet->dict here for TIB1? Is it because here FPix is defined, but TIB1 is not? Same goes for TIB2, TIB3 and others that are kept as PSet below.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jpata Yes, you are correct. TIB1, TIB2 TIB3 ...etc are not defined in fillDescriptions so I didn't replace it.

TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TIB2 = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TIB3 = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TIB4 = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TID1 = cms.PSet(
useSimpleRphiHitsCleaner = cms.bool(False),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
maxRing = cms.int32(2),
minRing = cms.int32(1),
skipClusters = cms.InputTag('conv2Clusters'),
Expand All @@ -131,7 +136,8 @@
useSimpleRphiHitsCleaner = cms.bool(False),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
maxRing = cms.int32(2),
minRing = cms.int32(1),
skipClusters = cms.InputTag('conv2Clusters'),
Expand All @@ -140,49 +146,57 @@
useSimpleRphiHitsCleaner = cms.bool(False),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
maxRing = cms.int32(2),
minRing = cms.int32(1),
skipClusters = cms.InputTag('conv2Clusters'),
),
TEC = cms.PSet(
TEC = dict(
useSimpleRphiHitsCleaner = cms.bool(False),
minRing = cms.int32(1),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHitUnmatched'),
maxRing = cms.int32(7),
stereoRecHits = cms.InputTag('siStripMatchedRecHits','stereoRecHitUnmatched'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TOB1 = cms.PSet(
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
skipClusters = cms.InputTag('conv2Clusters'),
),
TOB2 = cms.PSet(
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
skipClusters = cms.InputTag('conv2Clusters'),
),
TOB3 = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TOB4 = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TOB5 = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
),
TOB6 = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('conv2Clusters'),
)
Expand Down
34 changes: 20 additions & 14 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,53 +124,59 @@

convLayerPairs = _mod.seedingLayersEDProducer.clone(
layerList = _convLayerPairsLayerList,
BPix = cms.PSet(
BPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
skipClusters = cms.InputTag('convClusters'),
),
FPix = cms.PSet(
FPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
skipClusters = cms.InputTag('convClusters'),
),
TIB = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TIB = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
skipClusters = cms.InputTag('convClusters'),
),
MTIB = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
MTIB = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('convClusters'),
),
TID = cms.PSet(
TID = dict(
useSimpleRphiHitsCleaner = cms.bool(False),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
maxRing = cms.int32(2),
minRing = cms.int32(1),
skipClusters = cms.InputTag('convClusters'),
),
TEC = cms.PSet(
TEC = dict(
useSimpleRphiHitsCleaner = cms.bool(False),
minRing = cms.int32(1),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHitUnmatched'),
maxRing = cms.int32(7),
stereoRecHits = cms.InputTag('siStripMatchedRecHits','stereoRecHitUnmatched'),
skipClusters = cms.InputTag('convClusters'),
),
TOB = cms.PSet(
TOB = dict(
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
skipClusters = cms.InputTag('convClusters'),
),
MTOB = cms.PSet(
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
MTOB = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('convClusters'),
),
Expand Down
Loading