Skip to content

Commit 875f645

Browse files
jeongeunjeongeun
committed
replace EDProducer with clone from cfipy and drop type spec
1 parent 92e9d9d commit 875f645

8 files changed

+74
-45
lines changed

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cff.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
from RecoTracker.TkSeedingLayers.PixelLayerPairs_cfi import *
55
#get the module combinatorialbeamhaloseedfinder
66
from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForBeamHalo_cfi import *
7+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
78

8-
beamhaloTrackerSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
9-
layerInfo,
10-
layerList = layerList
9+
beamhaloTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
10+
layerList = layerList,
11+
**layerInfo
1112
)

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from RecoTracker.TkTrackingRegions.GlobalTrackingRegion_cfi import *
1010
from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *
1111

12-
layerInfo = cms.PSet(
12+
layerInfo = dict(
1313
TID = cms.PSet(
1414
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
1515
useRingSlector = cms.bool(False),
@@ -41,7 +41,7 @@
4141
),
4242
)
4343

44-
layerList = cms.vstring(
44+
layerList = [
4545
'FPix1_pos+FPix2_pos',
4646
'FPix1_neg+FPix2_neg',
4747
'TID2_pos+TID3_pos',
@@ -60,7 +60,7 @@
6060
'MTEC7_pos+MTEC8_pos',
6161
'MTEC8_neg+MTEC9_neg',
6262
'MTEC8_pos+MTEC9_pos'
63-
)
63+
]
6464

6565
beamhaloTrackerSeeds = cms.EDProducer("CtfSpecialSeedGenerator",
6666
SeedMomentum = cms.double(15.0), ##initial momentum in GeV !!!set to a lower value for slice test data

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsP5_cff.py‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,32 @@
2020
from RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilder_cfi import *
2121
from RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilderWithoutRefit_cfi import *
2222
from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi import *
23+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
24+
2325
# seeding layers
24-
combinatorialcosmicseedingtripletsP5 = cms.EDProducer("SeedingLayersEDProducer",
25-
layerInfo,
26-
layerList = cms.vstring('MTOB4+MTOB5+MTOB6',
26+
combinatorialcosmicseedingtripletsP5 = _mod.seedingLayersEDProducer.clone(
27+
layerList = ['MTOB4+MTOB5+MTOB6',
2728
'MTOB3+MTOB5+MTOB6',
2829
'MTOB3+MTOB4+MTOB5',
2930
'TOB2+MTOB4+MTOB5',
3031
'MTOB3+MTOB4+MTOB6',
31-
'TOB2+MTOB4+MTOB6')
32+
'TOB2+MTOB4+MTOB6'],
33+
**layerInfo
3234
)
33-
combinatorialcosmicseedingpairsTOBP5 = cms.EDProducer("SeedingLayersEDProducer",
34-
layerInfo,
35-
layerList = cms.vstring('MTOB5+MTOB6',
36-
'MTOB4+MTOB5')
35+
combinatorialcosmicseedingpairsTOBP5 = _mod.seedingLayersEDProducer.clone(
36+
layerList = ['MTOB5+MTOB6',
37+
'MTOB4+MTOB5'],
38+
**layerInfo
3739
)
38-
combinatorialcosmicseedingpairsTECposP5 = cms.EDProducer("SeedingLayersEDProducer",
39-
layerList = cms.vstring('TEC1_pos+TEC2_pos',
40+
combinatorialcosmicseedingpairsTECposP5 = _mod.seedingLayersEDProducer.clone(
41+
layerList = ['TEC1_pos+TEC2_pos',
4042
'TEC2_pos+TEC3_pos',
4143
'TEC3_pos+TEC4_pos',
4244
'TEC4_pos+TEC5_pos',
4345
'TEC5_pos+TEC6_pos',
4446
'TEC6_pos+TEC7_pos',
4547
'TEC7_pos+TEC8_pos',
46-
'TEC8_pos+TEC9_pos'),
48+
'TEC8_pos+TEC9_pos'],
4749
TEC = cms.PSet(
4850
minRing = cms.int32(5),
4951
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
@@ -54,15 +56,15 @@
5456
maxRing = cms.int32(7)
5557
)
5658
)
57-
combinatorialcosmicseedingpairsTECnegP5 = cms.EDProducer("SeedingLayersEDProducer",
58-
layerList = cms.vstring('TEC1_neg+TEC2_neg',
59+
combinatorialcosmicseedingpairsTECnegP5 = _mod.seedingLayersEDProducer.clone(
60+
layerList = ['TEC1_neg+TEC2_neg',
5961
'TEC2_neg+TEC3_neg',
6062
'TEC3_neg+TEC4_neg',
6163
'TEC4_neg+TEC5_neg',
6264
'TEC5_neg+TEC6_neg',
6365
'TEC6_neg+TEC7_neg',
6466
'TEC7_neg+TEC8_neg',
65-
'TEC8_neg+TEC9_neg'),
67+
'TEC8_neg+TEC9_neg'],
6668
TEC = cms.PSet(
6769
minRing = cms.int32(5),
6870
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cff.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import FWCore.ParameterSet.Config as cms
22

33
from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi import *
4+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
45

5-
regionalCosmicTrackerSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
6-
layerInfo,
7-
layerList = layerList
6+
regionalCosmicTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
7+
layerList = layerList,
8+
**layerInfo
89
)

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *
44

5-
layerInfo = cms.PSet(
5+
layerInfo = dict(
66
TOB = cms.PSet(
77
TTRHBuilder = cms.string('WithTrackAngle'),
88
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
@@ -15,19 +15,19 @@
1515
maxRing = cms.int32(7)
1616
)
1717
)
18-
layerList = cms.vstring('TOB6+TOB5',
19-
'TOB6+TOB4',
20-
'TOB6+TOB3',
21-
'TOB5+TOB4',
22-
'TOB5+TOB3',
23-
'TOB4+TOB3',
24-
'TEC1_neg+TOB6',
25-
'TEC1_neg+TOB5',
26-
'TEC1_neg+TOB4',
27-
'TEC1_pos+TOB6',
28-
'TEC1_pos+TOB5',
29-
'TEC1_pos+TOB4'
30-
)
18+
layerList = ['TOB6+TOB5',
19+
'TOB6+TOB4',
20+
'TOB6+TOB3',
21+
'TOB5+TOB4',
22+
'TOB5+TOB3',
23+
'TOB4+TOB3',
24+
'TEC1_neg+TOB6',
25+
'TEC1_neg+TOB5',
26+
'TEC1_neg+TOB4',
27+
'TEC1_pos+TOB6',
28+
'TEC1_pos+TOB5',
29+
'TEC1_pos+TOB4'
30+
]
3131
from RecoTracker.TkSeedGenerator.SeedFromConsecutiveHitsCreator_cfi import SeedFromConsecutiveHitsCreator as _SeedFromConsecutiveHitsCreator
3232
CosmicSeedCreator = _SeedFromConsecutiveHitsCreator.clone(
3333
ComponentName = 'CosmicSeedCreator',

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from RecoTracker.TkTrackingRegions.GlobalTrackingRegion_cfi import *
77
from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *
88

9-
layerInfo = cms.PSet(
9+
layerInfo = dict(
1010
MTIB = cms.PSet(
1111
TTRHBuilder = cms.string('WithTrackAngle'),
1212
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),

‎RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cff.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import FWCore.ParameterSet.Config as cms
22

33
from RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cfi import *
4+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
45

5-
simpleCosmicBONSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
6-
layerInfo,
7-
layerList = cms.vstring(*layerList)
6+
simpleCosmicBONSeedingLayers= _mod.seedingLayersEDProducer.clone(
7+
layerList = cms.vstring(*layerList),
8+
**layerInfo
89
)

‎RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import FWCore.ParameterSet.Config as cms
22

3-
import RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi
4-
53
def makeSimpleCosmicSeedLayers(*layers):
64
layerList = cms.vstring()
75
if 'ALL' in layers:
@@ -29,8 +27,34 @@ def makeSimpleCosmicSeedLayers(*layers):
2927
#print "SEEDING LAYER LIST = ", layerList
3028
return layerList
3129

32-
layerInfo = RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi.layerInfo.clone(
33-
TEC = dict(useSimpleRphiHitsCleaner = False)
30+
layerInfo = dict(
31+
MTIB = cms.PSet(
32+
TTRHBuilder = cms.string('WithTrackAngle'),
33+
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
34+
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit")
35+
),
36+
TIB = cms.PSet(
37+
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
38+
TTRHBuilder = cms.string('WithTrackAngle'),
39+
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
40+
),
41+
MTOB = cms.PSet(
42+
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
43+
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit")
44+
),
45+
TOB = cms.PSet(
46+
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
47+
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
48+
),
49+
TEC = cms.PSet(
50+
useSimpleRphiHitsCleaner = cms.bool(False),
51+
minRing = cms.int32(5),
52+
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
53+
useRingSlector = cms.bool(False),
54+
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
55+
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
56+
maxRing = cms.int32(7)
57+
),
3458
)
3559
layerList = makeSimpleCosmicSeedLayers('ALL'),
3660

0 commit comments

Comments
 (0)