Skip to content

Commit db286fb

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#34480 from jeongeun/recohi12X
Migrate module config in RecoHI to use default cfipython
2 parents 3bb685f + 7dc61f5 commit db286fb

11 files changed

+112
-135
lines changed

‎RecoHI/HiJetAlgos/python/IterativeConePu5Jets_PbPb_cff.py‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@
1818
minimumEt = cms.double(0.0),
1919
et = cms.double(0.0)
2020
)
21-
22-
iterativeConePu5CaloJets = cms.EDProducer("FastjetJetProducer",
23-
CaloJetParameters,
24-
AnomalousCellParameters,
25-
jetAlgorithm = cms.string("IterativeCone"),
26-
rParam = cms.double(0.5),
27-
)
28-
29-
iterativeConePu5CaloJets.doPUOffsetCorr = True
30-
iterativeConePu5CaloJets.doPVCorrection = False
31-
iterativeConePu5CaloJets.jetPtMin = 10
32-
21+
import RecoJets.JetProducers.FastjetJetProducer_cfi as _mod
22+
23+
iterativeConePu5CaloJets = _mod.FastjetJetProducer.clone(
24+
CaloJetParameters,
25+
AnomalousCellParameters,
26+
jetAlgorithm = "IterativeCone",
27+
rParam = 0.5,
28+
doPUOffsetCorr = True,
29+
doPVCorrection = False,
30+
jetPtMin = 10
31+
)
3332

3433
# REPLACE with UP-TO-DATE Corrections
3534
#MCJetCorJetIconePu5 = cms.EDProducer("CaloJetCorrectionProducer",

‎RecoHI/HiTracking/python/HILowPtConformalPixelTracks_cfi.py‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,19 @@
2323
produceSeedingHitSets = True,
2424
)
2525

26+
import RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi as _mod
2627
# Pixel tracks
27-
hiConformalPixelTracks = cms.EDProducer("PixelTrackProducer",
28-
29-
#passLabel = cms.string('Pixel triplet low-pt tracks with vertex constraint'),
30-
31-
# Ordered Hits
32-
SeedingHitSets = cms.InputTag("hiConformalPixelTracksHitTriplets"),
33-
34-
# Fitter
35-
Fitter = cms.InputTag('pixelFitterByConformalMappingAndLine'),
36-
37-
# Filter
38-
Filter = cms.InputTag("hiConformalPixelFilter"),
39-
40-
# Cleaner
41-
Cleaner = cms.string("trackCleaner")
42-
)
43-
44-
45-
46-
28+
hiConformalPixelTracks = _mod.pixelTracks.clone(
29+
#passLabel = 'Pixel triplet low-pt tracks with vertex constraint',
30+
# Ordered Hits
31+
SeedingHitSets = "hiConformalPixelTracksHitTriplets",
32+
# Fitter
33+
Fitter = 'pixelFitterByConformalMappingAndLine',
34+
# Filter
35+
Filter = "hiConformalPixelFilter",
36+
# Cleaner
37+
Cleaner = "trackCleaner"
38+
)
4739

4840
###Pixel Tracking - PhaseI geometry
4941

‎RecoHI/HiTracking/python/HIPixel3PrimTracks_cfi.py‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,19 @@
5353
CAPhiCut = 0.2,
5454
)
5555

56-
# Pixel tracks
57-
hiPixel3PrimTracks = cms.EDProducer("PixelTrackProducer",
58-
59-
passLabel = cms.string('Pixel triplet primary tracks with vertex constraint'),
56+
import RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi as _mod
6057

58+
# Pixel tracks
59+
hiPixel3PrimTracks = _mod.pixelTracks.clone(
60+
passLabel = 'Pixel triplet primary tracks with vertex constraint',
6161
# Ordered Hits
62-
SeedingHitSets = cms.InputTag("hiPixel3PrimTracksHitTriplets"),
63-
62+
SeedingHitSets = "hiPixel3PrimTracksHitTriplets",
6463
# Fitter
65-
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
66-
64+
Fitter = "pixelFitterByHelixProjections",
6765
# Filter
68-
Filter = cms.InputTag("hiFilter"),
69-
66+
Filter = "hiFilter",
7067
# Cleaner
71-
Cleaner = cms.string("trackCleaner")
68+
Cleaner = "trackCleaner"
7269
)
7370
trackingPhase1.toModify(hiPixel3PrimTracks,
7471
SeedingHitSets = "hiPixel3PrimTracksHitQuadrupletsCA",

‎RecoHI/HiTracking/python/HIPixel3ProtoTracks_cfi.py‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,19 @@
2424
produceSeedingHitSets = True,
2525
)
2626

27-
# Pixel tracks
28-
hiPixel3ProtoTracks = cms.EDProducer( "PixelTrackProducer",
27+
import RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi as _mod
2928

30-
passLabel = cms.string('Pixel triplet tracks for vertexing'),
31-
29+
# Pixel tracks
30+
hiPixel3ProtoTracks = _mod.pixelTracks.clone(
31+
passLabel = 'Pixel triplet tracks for vertexing',
3232
# Ordered Hits
33-
SeedingHitSets = cms.InputTag("hiPixel3ProtoTracksHitTriplets"),
34-
33+
SeedingHitSets = "hiPixel3ProtoTracksHitTriplets",
3534
# Fitter
36-
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
37-
35+
Fitter = "pixelFitterByHelixProjections",
3836
# Filter
39-
Filter = cms.InputTag("hiProtoTrackFilter"),
40-
37+
Filter = "hiProtoTrackFilter",
4138
# Cleaner
42-
Cleaner = cms.string("pixelTrackCleanerBySharedHits")
39+
Cleaner = "pixelTrackCleanerBySharedHits"
4340
)
4441

4542
hiPixel3ProtoTracksTask = cms.Task(

‎RecoHI/HiTracking/python/HIPixelAdaptiveVertex_cfi.py‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
import FWCore.ParameterSet.Config as cms
2+
import RecoVertex.PrimaryVertexProducer.primaryVertexProducer_cfi as _mod
23

3-
hiPixelAdaptiveVertex = cms.EDProducer("PrimaryVertexProducer",
4-
verbose = cms.untracked.bool(False),
5-
TkFilterParameters = cms.PSet(
6-
algorithm = cms.string('filterWithThreshold'),
7-
maxNormalizedChi2 = cms.double(5.0),
8-
minSiliconLayersWithHits = cms.int32(0), ## >=0 (was 5 for generalTracks)
9-
minPixelLayersWithHits = cms.int32(2), ## >=2 (was 2 for generalTracks)
10-
maxD0Significance = cms.double(3.0), ## keep most primary tracks (was 5.0)
11-
minPt = cms.double(0.0), ## better for softish events
12-
maxEta = cms.double(100.),
13-
trackQuality = cms.string("any"),
14-
numTracksThreshold = cms.int32(2)
4+
hiPixelAdaptiveVertex = _mod.primaryVertexProducer.clone(
5+
verbose = False,
6+
TkFilterParameters = dict(
7+
algorithm = 'filterWithThreshold',
8+
maxNormalizedChi2 = 5.0,
9+
minSiliconLayersWithHits = 0, ## >=0 (was 5 for generalTracks)
10+
minPixelLayersWithHits = 2, ## >=2 (was 2 for generalTracks)
11+
maxD0Significance = 3.0, ## keep most primary tracks (was 5.0)
12+
minPt = 0.0, ## better for softish events
13+
maxEta = 100.,
14+
numTracksThreshold = 2
1515
),
16-
beamSpotLabel = cms.InputTag("offlineBeamSpot"),
1716
# label of tracks to be used
18-
TrackLabel = cms.InputTag("hiSelectedProtoTracks"),
17+
TrackLabel = "hiSelectedProtoTracks",
1918
# clustering
20-
TkClusParameters = cms.PSet(
21-
algorithm = cms.string("gap"),
19+
TkClusParameters = dict(
20+
algorithm = "gap",
2221
TkGapClusParameters = cms.PSet(
23-
zSeparation = cms.double(1.0) ## 1 cm max separation between clusters
22+
zSeparation = cms.double(1.0) ## 1 cm max separation between clusters
2423
)
2524
),
2625
vertexCollections = cms.VPSet(
@@ -34,4 +33,3 @@
3433
)
3534
)
3635
)
37-

‎RecoHI/HiTracking/python/hiDetachedQuadStep_cff.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,19 @@
8383
tipMax = 1.0,
8484
ptMin = 0.95, #seeding region is 0.3
8585
)
86-
hiDetachedQuadStepPixelTracks = cms.EDProducer("PixelTrackProducer",
8786

88-
passLabel = cms.string('Pixel detached tracks with vertex constraint'),
87+
import RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi as _mod
8988

89+
hiDetachedQuadStepPixelTracks = _mod.pixelTracks.clone(
90+
passLabel = 'Pixel detached tracks with vertex constraint',
9091
# Ordered Hits
91-
SeedingHitSets = cms.InputTag("hiDetachedQuadStepTracksHitQuadrupletsCA"),
92-
92+
SeedingHitSets = "hiDetachedQuadStepTracksHitQuadrupletsCA",
9393
# Fitter
94-
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
95-
94+
Fitter = "pixelFitterByHelixProjections",
9695
# Filter
97-
Filter = cms.InputTag("hiDetachedQuadStepPixelTracksFilter"),
98-
96+
Filter = "hiDetachedQuadStepPixelTracksFilter",
9997
# Cleaner
100-
Cleaner = cms.string("trackCleaner")
98+
Cleaner = "trackCleaner"
10199
)
102100

103101

‎RecoHI/HiTracking/python/hiDetachedTripletStep_cff.py‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,31 +100,29 @@
100100
tipMax = 1.0,
101101
ptMin = 0.95,
102102
)
103-
hiDetachedTripletStepPixelTracks = cms.EDProducer("PixelTrackProducer",
104103

105-
passLabel = cms.string('Pixel detached tracks with vertex constraint'),
104+
import RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi as _mod
106105

106+
hiDetachedTripletStepPixelTracks = _mod.pixelTracks.clone(
107+
passLabel = 'Pixel detached tracks with vertex constraint',
107108
# Ordered Hits
108-
SeedingHitSets = cms.InputTag("hiDetachedTripletStepTracksHitTriplets"),
109-
109+
SeedingHitSets = "hiDetachedTripletStepTracksHitTriplets",
110110
# Fitter
111-
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
112-
111+
Fitter = "pixelFitterByHelixProjections",
113112
# Filter
114-
Filter = cms.InputTag("hiDetachedTripletStepPixelTracksFilter"),
115-
113+
Filter = "hiDetachedTripletStepPixelTracksFilter",
116114
# Cleaner
117-
Cleaner = cms.string("trackCleaner")
115+
Cleaner = "trackCleaner"
118116
)
119117
trackingPhase1.toModify(hiDetachedTripletStepPixelTracks,
120-
SeedingHitSets = cms.InputTag("hiDetachedTripletStepTracksHitTripletsCA")
118+
SeedingHitSets = "hiDetachedTripletStepTracksHitTripletsCA"
121119
)
122120

123121

124122
import RecoPixelVertexing.PixelLowPtUtilities.TrackSeeds_cfi
125123
hiDetachedTripletStepSeeds = RecoPixelVertexing.PixelLowPtUtilities.TrackSeeds_cfi.pixelTrackSeeds.clone(
126124
InputCollection = 'hiDetachedTripletStepPixelTracks'
127-
)
125+
)
128126

129127
# QUALITY CUTS DURING TRACK BUILDING
130128
import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff

‎RecoHI/HiTracking/python/hiHighPtTripletStep_cff.py‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,21 @@
8282
tipMax = 1.0,
8383
ptMin = 1.0, #seeding region is 0.6
8484
)
85-
hiHighPtTripletStepPixelTracks = cms.EDProducer("PixelTrackProducer",
8685

87-
passLabel = cms.string('Pixel detached tracks with vertex constraint'),
86+
import RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi as _mod
8887

88+
hiHighPtTripletStepPixelTracks = _mod.pixelTracks.clone(
89+
passLabel = 'Pixel detached tracks with vertex constraint',
8990
# Ordered Hits
90-
SeedingHitSets = cms.InputTag("hiHighPtTripletStepTracksHitTripletsCA"),
91-
91+
SeedingHitSets = "hiHighPtTripletStepTracksHitTripletsCA",
9292
# Fitter
93-
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
94-
93+
Fitter = "pixelFitterByHelixProjections",
9594
# Filter
96-
Filter = cms.InputTag("hiHighPtTripletStepPixelTracksFilter"),
97-
95+
Filter = "hiHighPtTripletStepPixelTracksFilter",
9896
# Cleaner
99-
Cleaner = cms.string("trackCleaner")
97+
Cleaner = "trackCleaner"
10098
)
10199

102-
103100
import RecoPixelVertexing.PixelLowPtUtilities.TrackSeeds_cfi
104101
hiHighPtTripletStepSeeds = RecoPixelVertexing.PixelLowPtUtilities.TrackSeeds_cfi.pixelTrackSeeds.clone(
105102
InputCollection = 'hiHighPtTripletStepPixelTracks'

‎RecoHI/HiTracking/python/hiJetCoreRegionalStep_cff.py‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,34 @@
2121
src=cms.InputTag('hiSelectedPixelVertex')
2222
)
2323

24+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
25+
2426
# SEEDING LAYERS
25-
hiJetCoreRegionalStepSeedLayers = cms.EDProducer("SeedingLayersEDProducer",
26-
layerList = cms.vstring('BPix1+BPix2+BPix3',
27-
'BPix1+BPix2+FPix1_pos',
28-
'BPix1+BPix2+FPix1_neg',
29-
'BPix1+FPix1_pos+FPix2_pos',
30-
'BPix1+FPix1_neg+FPix2_neg',
31-
'BPix1+BPix2+TIB1',
32-
'BPix1+BPix3+TIB1',
33-
'BPix2+BPix3+TIB1',
34-
),
35-
TIB = cms.PSet(
27+
hiJetCoreRegionalStepSeedLayers = _mod.seedingLayersEDProducer.clone(
28+
layerList = ['BPix1+BPix2+BPix3',
29+
'BPix1+BPix2+FPix1_pos',
30+
'BPix1+BPix2+FPix1_neg',
31+
'BPix1+FPix1_pos+FPix2_pos',
32+
'BPix1+FPix1_neg+FPix2_neg',
33+
'BPix1+BPix2+TIB1',
34+
'BPix1+BPix3+TIB1',
35+
'BPix2+BPix3+TIB1',
36+
],
37+
TIB = dict(
3638
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
37-
TTRHBuilder = cms.string('WithTrackAngle'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
39+
TTRHBuilder = cms.string('WithTrackAngle'),
40+
clusterChargeCut = cms.PSet(
41+
refToPSet_ = cms.string('SiStripClusterChargeCutNone')
42+
)
3843
),
39-
BPix = cms.PSet(
44+
BPix = dict(
4045
useErrorsFromParam = cms.bool(True),
4146
hitErrorRPhi = cms.double(0.0027),
4247
hitErrorRZ = cms.double(0.006),
4348
TTRHBuilder = cms.string('WithTrackAngle'),
4449
HitProducer = cms.string('siPixelRecHits'),
4550
),
46-
FPix = cms.PSet(
51+
FPix = dict(
4752
useErrorsFromParam = cms.bool(True),
4853
hitErrorRPhi = cms.double(0.0051),
4954
hitErrorRZ = cms.double(0.0036),

‎RecoHI/HiTracking/python/hiLowPtQuadStep_cff.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,19 @@
8585
tipMax = 1.0,
8686
ptMin = 0.4, #seeding region is 0.3
8787
)
88-
hiLowPtQuadStepPixelTracks = cms.EDProducer("PixelTrackProducer",
8988

90-
passLabel = cms.string('Pixel detached tracks with vertex constraint'),
89+
import RecoPixelVertexing.PixelTrackFitting.pixelTracks_cfi as _mod
9190

91+
hiLowPtQuadStepPixelTracks = _mod.pixelTracks.clone(
92+
passLabel = 'Pixel detached tracks with vertex constraint',
9293
# Ordered Hits
93-
SeedingHitSets = cms.InputTag("hiLowPtQuadStepTracksHitQuadrupletsCA"),
94-
94+
SeedingHitSets = "hiLowPtQuadStepTracksHitQuadrupletsCA",
9595
# Fitter
96-
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
97-
96+
Fitter = "pixelFitterByHelixProjections",
9897
# Filter
99-
Filter = cms.InputTag("hiLowPtQuadStepPixelTracksFilter"),
100-
98+
Filter = "hiLowPtQuadStepPixelTracksFilter",
10199
# Cleaner
102-
Cleaner = cms.string("trackCleaner")
100+
Cleaner = "trackCleaner"
103101
)
104102

105103

0 commit comments

Comments
 (0)