Skip to content

Commit 60d6d10

Browse files
fwyzardfwyzard
committed
Use siPixelDigis.cpu instead of siPixelDigis (#467)
1 parent 9cb6872 commit 60d6d10

17 files changed

+34
-34
lines changed

‎DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@
275275
process.muonDTDigis.inputLabel = rawDataInputTag
276276
process.muonRPCDigis.InputLabel = rawDataInputTag
277277
process.scalersRawToDigi.scalersInputTag = rawDataInputTag
278-
process.siPixelDigis.InputLabel = rawDataInputTag
278+
process.siPixelDigis.cpu.InputLabel = rawDataInputTag
279279
process.siStripDigis.ProductLabel = rawDataInputTag
280280

281281
process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")

‎DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
119119
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
120120
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
121-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
121+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
122122
process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
123123

124124

@@ -171,7 +171,7 @@
171171
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
172172
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
173173
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
174-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
174+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
175175
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
176176

177177

‎DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
184184
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
185185
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
186-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
186+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
187187
process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
188188
process.cscMonitor.FEDRawDataCollectionTag = cms.InputTag("rawDataCollector")
189189
process.dqmCSCClient.InputObjects = cms.untracked.InputTag("rawDataCollector")
@@ -208,7 +208,7 @@
208208
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
209209
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
210210
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
211-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
211+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
212212
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
213213
process.cscMonitor.FEDRawDataCollectionTag = cms.InputTag("rawDataRepacker")
214214
process.dqmCSCClient.InputObjects = cms.untracked.InputTag("rawDataRepacker")

‎DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
# Pixel sequence:
4444
process.load('Configuration.StandardSequences.MagneticField_cff')
4545
process.load('EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi')
46-
process.siPixelDigis.Timing = False
47-
process.siPixelDigis.IncludeErrors = True
46+
process.siPixelDigis.cpu.Timing = False
47+
process.siPixelDigis.cpu.IncludeErrors = True
4848
process.load('DQM.SiPixelMonitorRawData.SiPixelMonitorHLT_cfi')
4949
process.SiPixelHLTSource.saveFile = False
5050
process.SiPixelHLTSource.slowDown = False
@@ -87,7 +87,7 @@
8787
# Setting raw data collection label for all subsytem modules, depending on run type:
8888
if (process.runType.getRunType() == process.runType.hi_run):
8989
process.l1tStage2Fed.rawTag = cms.InputTag('rawDataRepacker')
90-
process.siPixelDigis.InputLabel = cms.InputTag('rawDataRepacker')
90+
process.siPixelDigis.cpu.InputLabel = cms.InputTag('rawDataRepacker')
9191
process.SiPixelHLTSource.RawInput = cms.InputTag('rawDataRepacker')
9292
process.siStripFEDCheck.RawDataTag = cms.InputTag('rawDataRepacker')
9393
process.esRawToDigi.sourceTag = cms.InputTag('rawDataRepacker')
@@ -100,7 +100,7 @@
100100
process.cscDQMEvF.InputObjects = cms.untracked.InputTag('rawDataRepacker')
101101
else:
102102
process.l1tStage2Fed.rawTag = cms.InputTag('rawDataCollector')
103-
process.siPixelDigis.InputLabel = cms.InputTag('rawDataCollector')
103+
process.siPixelDigis.cpu.InputLabel = cms.InputTag('rawDataCollector')
104104
process.SiPixelHLTSource.RawInput = cms.InputTag('rawDataCollector')
105105
process.siStripFEDCheck.RawDataTag = cms.InputTag('rawDataCollector')
106106
process.esRawToDigi.sourceTag = cms.InputTag('rawDataCollector')
@@ -121,7 +121,7 @@
121121
# Modules for the FED
122122
process.FEDModulesPath = cms.Path(
123123
process.l1tStage2Fed
124-
+ process.siPixelDigis
124+
+ process.siPixelDigis.cpu
125125
+ process.SiPixelHLTSource
126126
+ process.siStripFEDCheck
127127
+ process.esRawToDigi

‎DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
177177
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
178178
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
179-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
179+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
180180
process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
181181
process.bxTiming.FedSource = cms.untracked.InputTag("rawDataCollector")
182182
process.l1s.fedRawData = cms.InputTag("rawDataCollector")
@@ -195,7 +195,7 @@
195195
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
196196
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
197197
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
198-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
198+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
199199
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
200200
process.bxTiming.FedSource = cms.untracked.InputTag("rawDataRepacker")
201201
process.l1s.fedRawData = cms.InputTag("rawDataRepacker")

‎DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
193193
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
194194
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
195-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
195+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
196196
process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
197197

198198
#--------------------------------------------------
@@ -214,7 +214,7 @@
214214
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
215215
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
216216
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
217-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
217+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
218218
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
219219

220220

‎DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
187187
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
188188
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
189-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
189+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
190190
process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
191191
process.bxTiming.FedSource = cms.untracked.InputTag("rawDataCollector")
192192
process.l1s.fedRawData = cms.InputTag("rawDataCollector")
@@ -205,7 +205,7 @@
205205
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
206206
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
207207
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
208-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
208+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
209209
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
210210
process.bxTiming.FedSource = cms.untracked.InputTag("rawDataRepacker")
211211
process.l1s.fedRawData = cms.InputTag("rawDataRepacker")

‎DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
202202
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
203203
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
204-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
204+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
205205
process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
206206

207207
#--------------------------------------------------
@@ -223,7 +223,7 @@
223223
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
224224
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
225225
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
226-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
226+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
227227
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
228228

229229

‎DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
133133
process.muonGEMDigis.InputLabel = cms.InputTag("rawDataRepacker")
134134
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
135-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
135+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
136136
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
137137
process.tcdsDigis.InputLabel = cms.InputTag("rawDataRepacker")
138138
process.tcdsRawToDigi.InputLabel = cms.InputTag("rawDataRepacker")

‎DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
131131
process.muonGEMDigis.InputLabel = cms.InputTag("rawDataRepacker")
132132
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
133-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
133+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
134134
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
135135
process.tcdsDigis.InputLabel = cms.InputTag("rawDataRepacker")
136136
process.tcdsRawToDigi.InputLabel = cms.InputTag("rawDataRepacker")

‎DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
process.load("Configuration.StandardSequences.EndOfProcess_cff")
4646
process.load("Configuration.EventContent.EventContent_cff")
4747
process.load("Configuration.StandardSequences.Reconstruction_cff")
48-
process.siPixelDigis.InputLabel = cms.InputTag("hltFEDSelectorLumiPixels")
48+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("hltFEDSelectorLumiPixels")
4949

5050
process.reconstruction_step = cms.Sequence(
5151
process.siPixelDigis +

‎DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
process.dqmSaver
5151
)
5252

53-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
53+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
5454

5555
### process customizations included here
5656
from DQM.Integration.config.online_customizations_cfi import *
@@ -63,4 +63,4 @@
6363
print("Running with run type = ", process.runType.getRunType())
6464

6565
if (process.runType.getRunType() == process.runType.hi_run):
66-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
66+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")

‎DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,18 +98,18 @@
9898

9999
# PixelPhase1 Real data raw to digi
100100
process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi")
101-
process.siPixelDigis.IncludeErrors = True
101+
process.siPixelDigis.cpu.IncludeErrors = True
102102

103103
if (process.runType.getRunType() == process.runType.hi_run):
104104
#--------------------------------
105105
# Heavy Ion Configuration Changes
106106
#--------------------------------
107-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
107+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
108108
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
109109
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
110110
else :
111-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
112-
process.siStripDigis.InputLabel = cms.InputTag("rawDataCollector")
111+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
112+
process.siStripDigis.InputLabel = cms.InputTag("rawDataCollector")
113113

114114

115115
## Collision Reconstruction

‎DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
#-----------------------
7474
# Real data raw to digi
7575
process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi")
76-
process.siPixelDigis.IncludeErrors = True
76+
process.siPixelDigis.cpu.IncludeErrors = True
7777

7878
# Local Reconstruction
7979
process.load("RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizer_cfi")
@@ -86,13 +86,13 @@
8686
# SelectEvents = cms.vstring('HLT_600Tower*','HLT_L1*','HLT_Jet*','HLT_*Cosmic*','HLT_HT*','HLT_MinBias_*','HLT_Physics*', 'HLT_ZeroBias*','HLT_HcalNZS*'))
8787

8888

89-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
89+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
9090
#--------------------------------
9191
# Heavy Ion Configuration Changes
9292
#--------------------------------
9393
if (process.runType.getRunType() == process.runType.hi_run):
9494
process.load('Configuration.StandardSequences.RawToDigi_Repacked_cff')
95-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
95+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
9696

9797
if not unitTest:
9898
process.source.SelectEvents = cms.untracked.vstring('HLT_HIL1MinimumBiasHF2AND*')

‎DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
9595
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
9696
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
97-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
97+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
9898
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
9999

100100

‎DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@
490490
process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector")
491491
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector")
492492
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
493-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector")
493+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector")
494494
process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector")
495495
process.siStripFEDMonitor.RawDataTag = cms.untracked.InputTag("rawDataCollector")
496496
#--------------------------------------------------
@@ -511,7 +511,7 @@
511511
process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker")
512512
process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker")
513513
process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
514-
process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker")
514+
process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataRepacker")
515515
process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker")
516516
process.siStripFEDMonitor.RawDataTag = cms.untracked.InputTag("rawDataRepacker")
517517

‎SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
# clusterizer
101101
process.siPixelClusters.ElectronPerADCGain = cms.double(135.)
102-
process.siPixelClustersPreSplitting.ElectronPerADCGain = cms.double(135.)
102+
process.siPixelClustersPreSplitting.cpu.ElectronPerADCGain = cms.double(135.)
103103

104104
from Configuration.AlCa.GlobalTag import GlobalTag
105105
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T14', '')

0 commit comments

Comments
 (0)