Skip to content

Commit c362a61

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#34009 from jeongeun/updateRecoTracker12X
Migrate module configuration in RecoTracker{SpecialSeedGenerators} to use default cfipython
2 parents e692b3f + d4faa16 commit c362a61

8 files changed

+72
-64
lines changed

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cff.py‎

Lines changed: 3 additions & 2 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+
beamhaloTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
910
layerInfo,
10-
layerList = layerList
11+
layerList = layerList,
1112
)

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 30 additions & 28 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",
26+
combinatorialcosmicseedingtripletsP5 = _mod.seedingLayersEDProducer.clone(
2527
layerInfo,
26-
layerList = cms.vstring('MTOB4+MTOB5+MTOB6',
27-
'MTOB3+MTOB5+MTOB6',
28-
'MTOB3+MTOB4+MTOB5',
29-
'TOB2+MTOB4+MTOB5',
30-
'MTOB3+MTOB4+MTOB6',
31-
'TOB2+MTOB4+MTOB6')
28+
layerList = ['MTOB4+MTOB5+MTOB6',
29+
'MTOB3+MTOB5+MTOB6',
30+
'MTOB3+MTOB4+MTOB5',
31+
'TOB2+MTOB4+MTOB5',
32+
'MTOB3+MTOB4+MTOB6',
33+
'TOB2+MTOB4+MTOB6'],
3234
)
33-
combinatorialcosmicseedingpairsTOBP5 = cms.EDProducer("SeedingLayersEDProducer",
35+
combinatorialcosmicseedingpairsTOBP5 = _mod.seedingLayersEDProducer.clone(
3436
layerInfo,
35-
layerList = cms.vstring('MTOB5+MTOB6',
36-
'MTOB4+MTOB5')
37+
layerList = ['MTOB5+MTOB6',
38+
'MTOB4+MTOB5'],
3739
)
38-
combinatorialcosmicseedingpairsTECposP5 = cms.EDProducer("SeedingLayersEDProducer",
39-
layerList = cms.vstring('TEC1_pos+TEC2_pos',
40-
'TEC2_pos+TEC3_pos',
41-
'TEC3_pos+TEC4_pos',
42-
'TEC4_pos+TEC5_pos',
43-
'TEC5_pos+TEC6_pos',
44-
'TEC6_pos+TEC7_pos',
45-
'TEC7_pos+TEC8_pos',
46-
'TEC8_pos+TEC9_pos'),
40+
combinatorialcosmicseedingpairsTECposP5 = _mod.seedingLayersEDProducer.clone(
41+
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'],
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-
'TEC2_neg+TEC3_neg',
60-
'TEC3_neg+TEC4_neg',
61-
'TEC4_neg+TEC5_neg',
62-
'TEC5_neg+TEC6_neg',
63-
'TEC6_neg+TEC7_neg',
64-
'TEC7_neg+TEC8_neg',
65-
'TEC8_neg+TEC9_neg'),
59+
combinatorialcosmicseedingpairsTECnegP5 = _mod.seedingLayersEDProducer.clone(
60+
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'],
6668
TEC = cms.PSet(
6769
minRing = cms.int32(5),
6870
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cff.py‎

Lines changed: 2 additions & 1 deletion
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+
regionalCosmicTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
67
layerInfo,
78
layerList = layerList
89
)

‎RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,34 @@
99
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',
@@ -50,9 +53,9 @@
5053
'TEC7_pos+TEC8_pos',
5154
'TEC8_pos+TEC9_pos')
5255
combinatorialcosmicseedingtripletsTIB_layerList = cms.vstring('TIB1+TIB2+MTIB3')
56+
5357
combinatorialcosmicseedfinder = cms.EDProducer("CtfSpecialSeedGenerator",
5458
SeedMomentum = cms.double(5.0), ##initial momentum in GeV !!!set to a lower value for slice test data
55-
5659
ErrorRescaling = cms.double(50.0),
5760
RegionFactoryPSet = cms.PSet(
5861
RegionPSetBlock,
@@ -66,12 +69,13 @@
6669
GlobalY = cms.double(300.0)
6770
),
6871
Charges = cms.vint32(-1),
69-
OrderedHitsFactoryPSets = cms.VPSet(cms.PSet(
70-
ComponentName = cms.string('GenericTripletGenerator'),
71-
LayerSrc = cms.InputTag("combinatorialcosmicseedingtripletsTOB"),
72-
PropagationDirection = cms.string('alongMomentum'),
73-
NavigationDirection = cms.string('outsideIn')
74-
),
72+
OrderedHitsFactoryPSets = cms.VPSet(
73+
cms.PSet(
74+
ComponentName = cms.string('GenericTripletGenerator'),
75+
LayerSrc = cms.InputTag("combinatorialcosmicseedingtripletsTOB"),
76+
PropagationDirection = cms.string('alongMomentum'),
77+
NavigationDirection = cms.string('outsideIn')
78+
),
7579
cms.PSet(
7680
ComponentName = cms.string('GenericPairGenerator'),
7781
LayerSrc = cms.InputTag("combinatorialcosmicseedingpairsTECpos"),
@@ -83,7 +87,8 @@
8387
LayerSrc = cms.InputTag("combinatorialcosmicseedingtripletsTIB"),
8488
PropagationDirection = cms.string('oppositeToMomentum'),
8589
NavigationDirection = cms.string('insideOut')
86-
)),
90+
)
91+
),
8792
UseScintillatorsConstraint = cms.bool(True),
8893
TTRHBuilder = cms.string('WithTrackAngle'),
8994
LowerScintillatorParameters = cms.PSet(

‎RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cff.py‎

Lines changed: 3 additions & 2 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+
simpleCosmicBONSeedingLayers = _mod.seedingLayersEDProducer.clone(
67
layerInfo,
7-
layerList = cms.vstring(*layerList)
8+
layerList = cms.vstring(*layerList),
89
)

‎RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import FWCore.ParameterSet.Config as cms
2-
32
import RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi
4-
53
def makeSimpleCosmicSeedLayers(*layers):
64
layerList = cms.vstring()
75
if 'ALL' in layers:

0 commit comments

Comments
 (0)