Skip to content

Commit 6c388df

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

File tree

3 files changed

+77
-84
lines changed

3 files changed

+77
-84
lines changed

‎RecoTracker/ConversionSeedGenerators/python/ConversionStep2_cff.py‎

Lines changed: 63 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -13,79 +13,80 @@
1313
TrackQuality = 'highPurity'
1414
)
1515

16-
conv2LayerPairs = cms.EDProducer('SeedingLayersEDProducer',
17-
layerList = cms.vstring('BPix1+BPix2',
16+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
1817

19-
'BPix2+BPix3',
20-
'BPix2+FPix1_pos',
21-
'BPix2+FPix1_neg',
22-
'BPix2+FPix2_pos',
23-
'BPix2+FPix2_neg',
18+
conv2LayerPairs = _mod.seedingLayersEDProducer.clone(
19+
layerList = ['BPix1+BPix2',
20+
'BPix2+BPix3',
21+
'BPix2+FPix1_pos',
22+
'BPix2+FPix1_neg',
23+
'BPix2+FPix2_pos',
24+
'BPix2+FPix2_neg',
2425

25-
'FPix1_pos+FPix2_pos',
26-
'FPix1_neg+FPix2_neg',
26+
'FPix1_pos+FPix2_pos',
27+
'FPix1_neg+FPix2_neg',
2728

28-
'BPix3+TIB1',
29-
30-
'TIB1+TID1_pos',
31-
'TIB1+TID1_neg',
32-
'TIB1+TID2_pos',
33-
'TIB1+TID2_neg',
34-
'TIB1+TIB2',
35-
36-
'TIB2+TID1_pos',
37-
'TIB2+TID1_neg',
38-
'TIB2+TID2_pos',
39-
'TIB2+TID2_neg',
40-
'TIB2+TIB3',
41-
42-
'TIB3+TIB4',
43-
'TIB3+TID1_pos',
44-
'TIB3+TID1_neg',
29+
'BPix3+TIB1',
30+
31+
'TIB1+TID1_pos',
32+
'TIB1+TID1_neg',
33+
'TIB1+TID2_pos',
34+
'TIB1+TID2_neg',
35+
'TIB1+TIB2',
36+
37+
'TIB2+TID1_pos',
38+
'TIB2+TID1_neg',
39+
'TIB2+TID2_pos',
40+
'TIB2+TID2_neg',
41+
'TIB2+TIB3',
42+
43+
'TIB3+TIB4',
44+
'TIB3+TID1_pos',
45+
'TIB3+TID1_neg',
4546

46-
'TIB4+TOB1',
47+
'TIB4+TOB1',
4748

48-
'TOB1+TOB2',
49-
'TOB1+TEC1_pos',
50-
'TOB1+TEC1_neg',
49+
'TOB1+TOB2',
50+
'TOB1+TEC1_pos',
51+
'TOB1+TEC1_neg',
5152

52-
'TOB2+TOB3',
53-
'TOB2+TEC1_pos',
54-
'TOB2+TEC1_neg',
55-
56-
'TOB3+TOB4',
57-
'TOB3+TEC1_pos',
58-
'TOB3+TEC1_neg',
59-
60-
'TOB4+TOB5',
53+
'TOB2+TOB3',
54+
'TOB2+TEC1_pos',
55+
'TOB2+TEC1_neg',
56+
57+
'TOB3+TOB4',
58+
'TOB3+TEC1_pos',
59+
'TOB3+TEC1_neg',
60+
61+
'TOB4+TOB5',
6162

62-
'TOB5+TOB6',
63+
'TOB5+TOB6',
6364

64-
'TID1_pos+TID2_pos',
65-
'TID2_pos+TID3_pos',
66-
'TID3_pos+TEC1_pos',
65+
'TID1_pos+TID2_pos',
66+
'TID2_pos+TID3_pos',
67+
'TID3_pos+TEC1_pos',
6768

68-
'TID1_neg+TID2_neg',
69-
'TID2_neg+TID3_neg',
70-
'TID3_neg+TEC1_neg',
69+
'TID1_neg+TID2_neg',
70+
'TID2_neg+TID3_neg',
71+
'TID3_neg+TEC1_neg',
7172

72-
'TEC1_pos+TEC2_pos',
73-
'TEC2_pos+TEC3_pos',
74-
'TEC3_pos+TEC4_pos',
75-
'TEC4_pos+TEC5_pos',
76-
'TEC5_pos+TEC6_pos',
77-
'TEC6_pos+TEC7_pos',
78-
'TEC7_pos+TEC8_pos',
73+
'TEC1_pos+TEC2_pos',
74+
'TEC2_pos+TEC3_pos',
75+
'TEC3_pos+TEC4_pos',
76+
'TEC4_pos+TEC5_pos',
77+
'TEC5_pos+TEC6_pos',
78+
'TEC6_pos+TEC7_pos',
79+
'TEC7_pos+TEC8_pos',
7980

80-
'TEC1_neg+TEC2_neg',
81-
'TEC2_neg+TEC3_neg',
82-
'TEC3_neg+TEC4_neg',
83-
'TEC4_neg+TEC5_neg',
84-
'TEC5_neg+TEC6_neg',
85-
'TEC6_neg+TEC7_neg',
86-
'TEC7_neg+TEC8_neg'
87-
#other combinations could be added
88-
),
81+
'TEC1_neg+TEC2_neg',
82+
'TEC2_neg+TEC3_neg',
83+
'TEC3_neg+TEC4_neg',
84+
'TEC4_neg+TEC5_neg',
85+
'TEC5_neg+TEC6_neg',
86+
'TEC6_neg+TEC7_neg',
87+
'TEC7_neg+TEC8_neg'
88+
#other combinations could be added
89+
],
8990

9091
BPix = cms.PSet(
9192
TTRHBuilder = cms.string('WithTrackAngle'),

‎RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,10 @@
120120
_convLayerPairsLayerList.extend(_convLayerPairsStripOnlyLayers)
121121

122122

123-
124-
convLayerPairs = cms.EDProducer('SeedingLayersEDProducer',
125-
layerList = cms.vstring(_convLayerPairsLayerList),
123+
import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
124+
125+
convLayerPairs = _mod.seedingLayersEDProducer.clone(
126+
layerList = _convLayerPairsLayerList,
126127
BPix = cms.PSet(
127128
TTRHBuilder = cms.string('WithTrackAngle'),
128129
HitProducer = cms.string('siPixelRecHits'),

‎RecoTracker/DeDx/python/dedxEstimators_cff.py‎

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

33
dedxHitInfo = cms.EDProducer("DeDxHitInfoProducer",
4-
tracks = cms.InputTag("generalTracks"),
4+
tracks = cms.InputTag("generalTracks"),
55

66
minTrackHits = cms.uint32(0),
77
minTrackPt = cms.double(10),
@@ -26,24 +26,15 @@
2626
lowPtTracksDeDxThreshold = cms.double(3.5), # threshold on tracks
2727
)
2828

29-
dedxHarmonic2 = cms.EDProducer("DeDxEstimatorProducer",
30-
tracks = cms.InputTag("generalTracks"),
31-
32-
estimator = cms.string('generic'),
33-
fraction = cms.double(0.4), #Used only if estimator='truncated'
34-
exponent = cms.double(-2.0), #Used only if estimator='generic'
35-
36-
UseStrip = cms.bool(True),
37-
UsePixel = cms.bool(False),
38-
ShapeTest = cms.bool(True),
39-
MeVperADCStrip = cms.double(3.61e-06*265),
40-
MeVperADCPixel = cms.double(3.61e-06),
41-
42-
Reccord = cms.string("SiStripDeDxMip_3D_Rcd"), #used only for discriminators : estimators='productDiscrim' or 'btagDiscrim' or 'smirnovDiscrim' or 'asmirnovDiscrim'
43-
ProbabilityMode = cms.string("Accumulation"), #used only for discriminators : estimators='productDiscrim' or 'btagDiscrim' or 'smirnovDiscrim' or 'asmirnovDiscrim'
44-
45-
UseCalibration = cms.bool(False),
46-
calibrationPath = cms.string(""),
29+
import RecoTracker.DeDx.DeDxEstimatorProducer_cfi as _mod
30+
31+
dedxHarmonic2 = _mod.DeDxEstimatorProducer.clone(
32+
estimator = 'generic',
33+
fraction = 0.4, #Used only if estimator='truncated'
34+
exponent = -2.0, #Used only if estimator='generic'
35+
36+
Reccord = "SiStripDeDxMip_3D_Rcd", #used only for discriminators : estimators='productDiscrim' or 'btagDiscrim' or 'smirnovDiscrim' or 'asmirnovDiscrim'
37+
ProbabilityMode = "Accumulation", #used only for discriminators : estimators='productDiscrim' or 'btagDiscrim' or 'smirnovDiscrim' or 'asmirnovDiscrim'
4738
)
4839

4940
from Configuration.Eras.Modifier_fastSim_cff import fastSim

0 commit comments

Comments
 (0)