Skip to content

Commit 558cfc3

Browse files
jeongeunjeongeun
committed
replace EDProducer with clone from cfipy and drop type spec
1 parent 2c737cd commit 558cfc3

File tree

6 files changed

+54
-44
lines changed

6 files changed

+54
-44
lines changed

‎RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
)
3030
)
3131
trackingPhase2PU140.toReplaceWith(pixelPairStepSeedClusterMask, seedClusterRemoverPhase2.clone(
32-
trajectories = cms.InputTag('detachedQuadStepSeeds'),
32+
trajectories = 'detachedQuadStepSeeds',
3333
oldClusterRemovalInfo = cms.InputTag('highPtTripletStepSeedClusterMask')
3434
)
3535
)
@@ -52,10 +52,12 @@
5252
oldClusterRemovalInfo = cms.InputTag('mixedTripletStepSeedClusterMask')
5353
)
5454

55-
tripletElectronSeedLayers = cms.EDProducer('SeedingLayersEDProducer',
56-
layerList = cms.vstring('BPix1+BPix2+BPix3',
57-
'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg',
58-
'BPix1+FPix1_pos+FPix2_pos', 'BPix1+FPix1_neg+FPix2_neg'),
55+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
56+
57+
tripletElectronSeedLayers = _mod.seedingLayersEDProducer.clone(
58+
layerList = ['BPix1+BPix2+BPix3',
59+
'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg',
60+
'BPix1+FPix1_pos+FPix2_pos', 'BPix1+FPix1_neg+FPix2_neg'],
5961
BPix = cms.PSet(
6062
TTRHBuilder = cms.string('TTRHBuilderWithoutAngle4PixelTriplets'),
6163
HitProducer = cms.string('siPixelRecHits'),
@@ -138,12 +140,12 @@
138140
)
139141
)
140142

141-
pixelPairElectronSeedLayers = cms.EDProducer('SeedingLayersEDProducer',
142-
layerList = cms.vstring('BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3',
143-
'BPix1+FPix1_pos', 'BPix1+FPix1_neg',
144-
'BPix1+FPix2_pos', 'BPix1+FPix2_neg',
145-
'BPix2+FPix1_pos', 'BPix2+FPix1_neg',
146-
'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'),
143+
pixelPairElectronSeedLayers = _mod.seedingLayersEDProducer.clone(
144+
layerList = ['BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3',
145+
'BPix1+FPix1_pos', 'BPix1+FPix1_neg',
146+
'BPix1+FPix2_pos', 'BPix1+FPix2_neg',
147+
'BPix2+FPix1_pos', 'BPix2+FPix1_neg',
148+
'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'],
147149
BPix = cms.PSet(
148150
TTRHBuilder = cms.string('WithTrackAngle'),
149151
HitProducer = cms.string('siPixelRecHits'),
@@ -188,10 +190,10 @@
188190
seedingHitSets = 'pixelPairElectronHitDoublets',
189191
)
190192

191-
stripPairElectronSeedLayers = cms.EDProducer('SeedingLayersEDProducer',
192-
layerList = cms.vstring('TIB1+TIB2', 'TIB1+TID1_pos', 'TIB1+TID1_neg', 'TID2_pos+TID3_pos', 'TID2_neg+TID3_neg',
193-
'TEC1_pos+TEC2_pos','TEC2_pos+TEC3_pos','TEC3_pos+TEC4_pos','TEC3_pos+TEC5_pos',
194-
'TEC1_neg+TEC2_neg','TEC2_neg+TEC3_neg','TEC3_neg+TEC4_neg','TEC3_neg+TEC5_neg'),
193+
stripPairElectronSeedLayers = _mod.seedingLayersEDProducer.clone(
194+
layerList = ['TIB1+TIB2', 'TIB1+TID1_pos', 'TIB1+TID1_neg', 'TID2_pos+TID3_pos', 'TID2_neg+TID3_neg',
195+
'TEC1_pos+TEC2_pos','TEC2_pos+TEC3_pos','TEC3_pos+TEC4_pos','TEC3_pos+TEC5_pos',
196+
'TEC1_neg+TEC2_neg','TEC2_neg+TEC3_neg','TEC3_neg+TEC4_neg','TEC3_neg+TEC5_neg'],
195197
TIB = cms.PSet(
196198
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
197199
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),

‎RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@
2222
src=cms.InputTag('firstStepPrimaryVertices')
2323
)
2424

25+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
26+
2527
# SEEDING LAYERS
26-
jetCoreRegionalStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer',
27-
layerList = cms.vstring('BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3',
28-
'BPix1+FPix1_pos', 'BPix1+FPix1_neg',
29-
'BPix2+FPix1_pos', 'BPix2+FPix1_neg',
30-
'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg',
31-
#'BPix2+TIB1','BPix2+TIB2',
32-
'BPix3+TIB1','BPix3+TIB2'),
28+
jetCoreRegionalStepSeedLayers = _mod.seedingLayersEDProducer.clone(
29+
layerList = ['BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3',
30+
'BPix1+FPix1_pos', 'BPix1+FPix1_neg',
31+
'BPix2+FPix1_pos', 'BPix2+FPix1_neg',
32+
'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg',
33+
#'BPix2+TIB1','BPix2+TIB2',
34+
'BPix3+TIB1','BPix3+TIB2'],
3335
TIB = cms.PSet(
3436
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
3537
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))

‎RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,11 @@
160160
)
161161
fastSim.toReplaceWith(mixedTripletStepSeedsA,_fastSim_mixedTripletStepSeedsA)
162162

163+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
163164

164165
# SEEDING LAYERS
165-
mixedTripletStepSeedLayersB = cms.EDProducer('SeedingLayersEDProducer',
166-
layerList = cms.vstring('BPix2+BPix3+TIB1'),
166+
mixedTripletStepSeedLayersB = _mod.seedingLayersEDProducer.clone(
167+
layerList = ['BPix2+BPix3+TIB1'],
167168
BPix = cms.PSet(
168169
TTRHBuilder = cms.string('WithTrackAngle'),
169170
HitProducer = cms.string('siPixelRecHits'),

‎RecoTracker/IterativeTracking/python/PixelLessStep_cff.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919

2020
# SEEDING LAYERS
2121
from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *
22-
pixelLessStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer',
23-
layerList = cms.vstring(
22+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
23+
24+
pixelLessStepSeedLayers = _mod.seedingLayersEDProducer.clone(
25+
layerList = [
2426
#TIB
2527
'TIB1+TIB2+MTIB3','TIB1+TIB2+MTIB4',
2628
#TIB+TID
@@ -45,7 +47,7 @@
4547
'TEC3_pos+TEC4_pos+MTEC5_pos','TEC3_neg+TEC4_neg+MTEC5_neg',
4648
'TEC3_pos+TEC5_pos+TEC6_pos', 'TEC3_neg+TEC5_neg+TEC6_neg',
4749
'TEC4_pos+TEC5_pos+TEC6_pos', 'TEC4_neg+TEC5_neg+TEC6_neg'
48-
),
50+
],
4951
TIB = cms.PSet(
5052
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
5153
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),

‎RecoTracker/IterativeTracking/python/PixelPairStep_cff.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
for _eraName, _postfix, _era in _cfg.nonDefaultEras():
1313
_era.toReplaceWith(pixelPairStepClusters, _cfg.clusterRemoverForIter('PixelPairStep', _eraName, _postfix))
1414

15+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
1516

1617
# SEEDING LAYERS
17-
pixelPairStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer',
18-
layerList = cms.vstring('BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3',
18+
pixelPairStepSeedLayers = _mod.seedingLayersEDProducer.clone(
19+
layerList = ['BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3',
1920
'BPix1+FPix1_pos', 'BPix1+FPix1_neg',
2021
'BPix2+FPix1_pos', 'BPix2+FPix1_neg',
21-
'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'),
22+
'FPix1_pos+FPix2_pos', 'FPix1_neg+FPix2_neg'],
2223
BPix = cms.PSet(
2324
TTRHBuilder = cms.string('WithTrackAngle'),
2425
HitProducer = cms.string('siPixelRecHits'),

‎RecoTracker/IterativeTracking/python/TobTecStep_cff.py‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616

1717
# TRIPLET SEEDING LAYERS
1818
from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *
19-
tobTecStepSeedLayersTripl = cms.EDProducer('SeedingLayersEDProducer',
20-
layerList = cms.vstring(
19+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
20+
21+
tobTecStepSeedLayersTripl = _mod.seedingLayersEDProducer.clone(
22+
layerList = [
2123
#TOB
2224
'TOB1+TOB2+MTOB3','TOB1+TOB2+MTOB4',
2325
#TOB+MTEC
2426
'TOB1+TOB2+MTEC1_pos','TOB1+TOB2+MTEC1_neg',
25-
),
27+
],
2628
TOB = cms.PSet(
2729
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
2830
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
@@ -119,14 +121,14 @@
119121
fastSim.toReplaceWith(tobTecStepSeedsTripl,_fastSim_tobTecStepSeedsTripl)
120122

121123
# PAIR SEEDING LAYERS
122-
tobTecStepSeedLayersPair = cms.EDProducer('SeedingLayersEDProducer',
123-
layerList = cms.vstring('TOB1+TEC1_pos','TOB1+TEC1_neg',
124-
'TEC1_pos+TEC2_pos','TEC1_neg+TEC2_neg',
125-
'TEC2_pos+TEC3_pos','TEC2_neg+TEC3_neg',
126-
'TEC3_pos+TEC4_pos','TEC3_neg+TEC4_neg',
127-
'TEC4_pos+TEC5_pos','TEC4_neg+TEC5_neg',
128-
'TEC5_pos+TEC6_pos','TEC5_neg+TEC6_neg',
129-
'TEC6_pos+TEC7_pos','TEC6_neg+TEC7_neg'),
124+
tobTecStepSeedLayersPair = _mod.seedingLayersEDProducer.clone(
125+
layerList = ['TOB1+TEC1_pos','TOB1+TEC1_neg',
126+
'TEC1_pos+TEC2_pos','TEC1_neg+TEC2_neg',
127+
'TEC2_pos+TEC3_pos','TEC2_neg+TEC3_neg',
128+
'TEC3_pos+TEC4_pos','TEC3_neg+TEC4_neg',
129+
'TEC4_pos+TEC5_pos','TEC4_neg+TEC5_neg',
130+
'TEC5_pos+TEC6_pos','TEC5_neg+TEC6_neg',
131+
'TEC6_pos+TEC7_pos','TEC6_neg+TEC7_neg'],
130132
TOB = cms.PSet(
131133
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
132134
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
@@ -453,15 +455,15 @@
453455
### Following are specific for LowPU, they're collected here to
454456
### not to interfere too much with the default configuration
455457
# SEEDING LAYERS
456-
tobTecStepSeedLayers = cms.EDProducer('SeedingLayersEDProducer',
457-
layerList = cms.vstring('TOB1+TOB2',
458+
tobTecStepSeedLayers = _mod.seedingLayersEDProducer.clone(
459+
layerList = ['TOB1+TOB2',
458460
'TOB1+TEC1_pos', 'TOB1+TEC1_neg',
459461
'TEC1_pos+TEC2_pos', 'TEC2_pos+TEC3_pos',
460462
'TEC3_pos+TEC4_pos', 'TEC4_pos+TEC5_pos',
461463
'TEC5_pos+TEC6_pos', 'TEC6_pos+TEC7_pos',
462464
'TEC1_neg+TEC2_neg', 'TEC2_neg+TEC3_neg',
463465
'TEC3_neg+TEC4_neg', 'TEC4_neg+TEC5_neg',
464-
'TEC5_neg+TEC6_neg', 'TEC6_neg+TEC7_neg'),
466+
'TEC5_neg+TEC6_neg', 'TEC6_neg+TEC7_neg'],
465467
TOB = cms.PSet(
466468
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
467469
skipClusters = cms.InputTag('tobTecStepClusters'),

0 commit comments

Comments
 (0)