Skip to content

Commit

Permalink
Merge pull request #35555 from jeongeun/tracker12_1_X
Browse files Browse the repository at this point in the history 
Migrate module config in RecoTracker to use default seedingLayersEDProducer in cfipython v2
  • Loading branch information
@cmsbuild
cmsbuild authored Oct 9, 2021
2 parents 93ae6fc + 281f16e commit 233ad1f
Show file tree
Hide file tree
Showing 8 changed files with 184 additions and 144 deletions.
48 changes: 31 additions & 17 deletions RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py
View file
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(
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
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

0 comments on commit 233ad1f

Please sign in to comment.