Skip to content

Commit f985502

Browse files
jeongeunjeongeun
committed
revert to use PSet
1 parent 875f645 commit f985502

8 files changed

+42
-65
lines changed

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cff.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
88

99
beamhaloTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
10+
layerInfo,
1011
layerList = layerList,
11-
**layerInfo
1212
)

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py‎

Lines changed: 1 addition & 1 deletion
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 = dict(
12+
layerInfo = cms.PSet(
1313
TID = cms.PSet(
1414
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
1515
useRingSlector = cms.bool(False),

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsP5_cff.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@
2424

2525
# seeding layers
2626
combinatorialcosmicseedingtripletsP5 = _mod.seedingLayersEDProducer.clone(
27+
layerInfo,
2728
layerList = ['MTOB4+MTOB5+MTOB6',
28-
'MTOB3+MTOB5+MTOB6',
29-
'MTOB3+MTOB4+MTOB5',
30-
'TOB2+MTOB4+MTOB5',
31-
'MTOB3+MTOB4+MTOB6',
32-
'TOB2+MTOB4+MTOB6'],
33-
**layerInfo
29+
'MTOB3+MTOB5+MTOB6',
30+
'MTOB3+MTOB4+MTOB5',
31+
'TOB2+MTOB4+MTOB5',
32+
'MTOB3+MTOB4+MTOB6',
33+
'TOB2+MTOB4+MTOB6'],
3434
)
3535
combinatorialcosmicseedingpairsTOBP5 = _mod.seedingLayersEDProducer.clone(
36+
layerInfo,
3637
layerList = ['MTOB5+MTOB6',
37-
'MTOB4+MTOB5'],
38-
**layerInfo
38+
'MTOB4+MTOB5'],
3939
)
4040
combinatorialcosmicseedingpairsTECposP5 = _mod.seedingLayersEDProducer.clone(
4141
layerList = ['TEC1_pos+TEC2_pos',
42-
'TEC2_pos+TEC3_pos',
43-
'TEC3_pos+TEC4_pos',
44-
'TEC4_pos+TEC5_pos',
45-
'TEC5_pos+TEC6_pos',
46-
'TEC6_pos+TEC7_pos',
47-
'TEC7_pos+TEC8_pos',
48-
'TEC8_pos+TEC9_pos'],
42+
'TEC2_pos+TEC3_pos',
43+
'TEC3_pos+TEC4_pos',
44+
'TEC4_pos+TEC5_pos',
45+
'TEC5_pos+TEC6_pos',
46+
'TEC6_pos+TEC7_pos',
47+
'TEC7_pos+TEC8_pos',
48+
'TEC8_pos+TEC9_pos'],
4949
TEC = cms.PSet(
5050
minRing = cms.int32(5),
5151
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
@@ -58,13 +58,13 @@
5858
)
5959
combinatorialcosmicseedingpairsTECnegP5 = _mod.seedingLayersEDProducer.clone(
6060
layerList = ['TEC1_neg+TEC2_neg',
61-
'TEC2_neg+TEC3_neg',
62-
'TEC3_neg+TEC4_neg',
63-
'TEC4_neg+TEC5_neg',
64-
'TEC5_neg+TEC6_neg',
65-
'TEC6_neg+TEC7_neg',
66-
'TEC7_neg+TEC8_neg',
67-
'TEC8_neg+TEC9_neg'],
61+
'TEC2_neg+TEC3_neg',
62+
'TEC3_neg+TEC4_neg',
63+
'TEC4_neg+TEC5_neg',
64+
'TEC5_neg+TEC6_neg',
65+
'TEC6_neg+TEC7_neg',
66+
'TEC7_neg+TEC8_neg',
67+
'TEC8_neg+TEC9_neg'],
6868
TEC = cms.PSet(
6969
minRing = cms.int32(5),
7070
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
55

66
regionalCosmicTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
7-
layerList = layerList,
8-
**layerInfo
7+
layerInfo,
8+
layerList = layerList
99
)

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *
44

5-
layerInfo = dict(
5+
layerInfo = cms.PSet(
66
TOB = cms.PSet(
77
TTRHBuilder = cms.string('WithTrackAngle'),
88
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,37 @@
66
from RecoTracker.TkTrackingRegions.GlobalTrackingRegion_cfi import *
77
from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import *
88

9-
layerInfo = dict(
9+
layerInfo = cms.PSet(
1010
MTIB = cms.PSet(
1111
TTRHBuilder = cms.string('WithTrackAngle'),
12-
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
12+
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
1313
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit")
1414
),
1515
TIB = cms.PSet(
1616
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
1717
TTRHBuilder = cms.string('WithTrackAngle'),
18-
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
18+
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
1919
),
2020
MTOB = cms.PSet(
21-
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
21+
TTRHBuilder = cms.string('WithTrackAngle'),
22+
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
2223
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit")
2324
),
2425
TOB = cms.PSet(
2526
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
26-
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
27+
TTRHBuilder = cms.string('WithTrackAngle'),
28+
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
2729
),
2830
TEC = cms.PSet(
2931
useSimpleRphiHitsCleaner = cms.bool(True),
3032
minRing = cms.int32(5),
3133
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
3234
useRingSlector = cms.bool(False),
33-
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
35+
TTRHBuilder = cms.string('WithTrackAngle'),
36+
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
3437
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
3538
maxRing = cms.int32(7)
36-
),
39+
)
3740
)
3841
combinatorialcosmicseedingtripletsTOB_layerList = cms.vstring('MTOB4+MTOB5+MTOB6',
3942
'MTOB3+MTOB5+MTOB6',

‎RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cfi import *
44
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
55

6-
simpleCosmicBONSeedingLayers= _mod.seedingLayersEDProducer.clone(
6+
simpleCosmicBONSeedingLayers = _mod.seedingLayersEDProducer.clone(
7+
layerInfo,
78
layerList = cms.vstring(*layerList),
8-
**layerInfo
99
)

‎RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import FWCore.ParameterSet.Config as cms
2-
2+
import RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi
33
def makeSimpleCosmicSeedLayers(*layers):
44
layerList = cms.vstring()
55
if 'ALL' in layers:
@@ -27,34 +27,8 @@ def makeSimpleCosmicSeedLayers(*layers):
2727
#print "SEEDING LAYER LIST = ", layerList
2828
return layerList
2929

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-
),
30+
layerInfo = RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi.layerInfo.clone(
31+
TEC = dict(useSimpleRphiHitsCleaner = False)
5832
)
5933
layerList = makeSimpleCosmicSeedLayers('ALL'),
6034

0 commit comments

Comments
 (0)