From 8cf7a09c216751f2feba823b1c6fe5c55be59685 Mon Sep 17 00:00:00 2001 From: AdrianoDee Date: Mon, 9 Dec 2024 10:57:35 +0100 Subject: [PATCH] Small fixes --- .../python/ALCARECOLumiPixels_cff.py | 4 ++-- .../StandardSequences/python/RawToDigi_Repacked_cff.py | 2 +- .../python/clients/beam_dqm_sourceclient-live_cfg.py | 2 +- .../clients/beampixel_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/csc_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/fed_dqm_sourceclient-live_cfg.py | 6 +++--- .../python/clients/l1t_dqm_sourceclient-live_cfg.py | 4 ++-- .../clients/l1temulator_dqm_sourceclient-live_cfg.py | 4 ++-- .../clients/l1tstage1_dqm_sourceclient-live_cfg.py | 4 ++-- .../l1tstage1emulator_dqm_sourceclient-live_cfg.py | 4 ++-- .../clients/l1tstage2_dqm_sourceclient-live_cfg.py | 2 +- .../l1tstage2emulator_dqm_sourceclient-live_cfg.py | 2 +- .../python/clients/lumi_dqm_sourceclient-live_cfg.py | 2 +- .../python/clients/physics_dqm_sourceclient-live_cfg.py | 4 ++-- .../python/clients/pixel_dqm_sourceclient-live_cfg.py | 6 +++--- .../clients/pixellumi_dqm_sourceclient-live_cfg.py | 6 +++--- .../python/clients/scal_dqm_sourceclient-live_cfg.py | 2 +- .../clients/sistrip_approx_dqm_sourceclient-live_cfg.py | 2 +- .../python/clients/sistrip_dqm_sourceclient-live_cfg.py | 4 ++-- DQM/Physics/python/qcdLowPtDQM_cfi.py | 2 +- .../SiPixelRecHits/python/SiPixelRecHits_cfi.py | 9 +++------ 21 files changed, 38 insertions(+), 41 deletions(-) diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOLumiPixels_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOLumiPixels_cff.py index 25c7e5e60cb26..153c944ea4721 100644 --- a/Calibration/LumiAlCaRecoProducers/python/ALCARECOLumiPixels_cff.py +++ b/Calibration/LumiAlCaRecoProducers/python/ALCARECOLumiPixels_cff.py @@ -9,12 +9,12 @@ ) from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import siPixelDigis -siPixelDigisForLumi = siPixelDigis.cpu.clone( +siPixelDigisForLumi = siPixelDigis.clone( InputLabel = "hltFEDSelectorLumiPixels" ) from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizerPreSplitting_cfi import siPixelClustersPreSplitting -siPixelClustersForLumi = siPixelClustersPreSplitting.cpu.clone( +siPixelClustersForLumi = siPixelClustersPreSplitting.clone( src = "siPixelDigisForLumi" ) diff --git a/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py b/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py index e40eaee29c6e1..63ccf991d7e92 100644 --- a/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py +++ b/Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py @@ -11,7 +11,7 @@ gctDigis.inputLabel = 'rawDataRepacker' gtDigis.DaqGtInputTag = 'rawDataRepacker' gtEvmDigis.EvmGtInputTag = 'rawDataRepacker' -siPixelDigis.cpu.InputLabel = 'rawDataRepacker' +siPixelDigis.InputLabel = 'rawDataRepacker' siStripDigis.ProductLabel = 'rawDataRepacker' ecalDigisCPU.InputLabel = 'rawDataRepacker' gpu.toModify(ecalDigisGPU, InputLabel = 'rawDataRepacker') diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index 32f1a9537eddf..5cf86c21e61e4 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -315,7 +315,7 @@ process.muonDTDigis.inputLabel = rawDataInputTag process.muonRPCDigis.InputLabel = rawDataInputTag process.scalersRawToDigi.scalersInputTag = rawDataInputTag -process.siPixelDigis.cpu.InputLabel = rawDataInputTag +process.siPixelDigis.InputLabel = rawDataInputTag process.siStripDigis.ProductLabel = rawDataInputTag process.tcdsDigis.InputLabel = rawDataInputTag diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py index 3c9b75122dfa9..3ddae1e585ece 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -129,7 +129,7 @@ process.muonDTDigis.inputLabel = "rawDataCollector" process.muonRPCDigis.InputLabel = "rawDataCollector" process.scalersRawToDigi.scalersInputTag = "rawDataCollector" - process.siPixelDigis.cpu.InputLabel = "rawDataCollector" + process.siPixelDigis.InputLabel = "rawDataCollector" process.siStripDigis.ProductLabel = "rawDataCollector" @@ -182,7 +182,7 @@ process.muonDTDigis.inputLabel = "rawDataRepacker" process.muonRPCDigis.InputLabel = "rawDataRepacker" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" process.siStripDigis.ProductLabel = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py index e09887f21c8ad..8399a37a17ee0 100644 --- a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py @@ -189,7 +189,7 @@ process.muonDTDigis.inputLabel = "rawDataCollector" process.muonRPCDigis.InputLabel = "rawDataCollector" process.scalersRawToDigi.scalersInputTag = "rawDataCollector" -process.siPixelDigis.cpu.InputLabel = "rawDataCollector" +process.siPixelDigis.InputLabel = "rawDataCollector" process.siStripDigis.ProductLabel = "rawDataCollector" process.cscMonitor.FEDRawDataCollectionTag = "rawDataCollector" process.dqmCSCClient.InputObjects = "rawDataCollector" @@ -214,7 +214,7 @@ process.muonDTDigis.inputLabel = "rawDataRepacker" process.muonRPCDigis.InputLabel = "rawDataRepacker" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" process.siStripDigis.ProductLabel = "rawDataRepacker" process.cscMonitor.FEDRawDataCollectionTag = "rawDataRepacker" process.dqmCSCClient.InputObjects = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py index 2ea853810e263..6e0e1a2684ab0 100644 --- a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py @@ -49,7 +49,7 @@ # Pixel sequence: process.load('Configuration.StandardSequences.MagneticField_cff') process.load('EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi') -process.siPixelDigis.cpu.IncludeErrors = True +process.siPixelDigis.IncludeErrors = True process.load('DQM.SiPixelMonitorRawData.SiPixelMonitorHLT_cfi') process.SiPixelHLTSource.saveFile = False process.SiPixelHLTSource.slowDown = False @@ -95,7 +95,7 @@ # Setting raw data collection label for all subsytem modules, depending on run type: if (process.runType.getRunType() == process.runType.hi_run): process.l1tStage2Fed.rawTag = 'rawDataRepacker' - process.siPixelDigis.cpu.InputLabel = 'rawDataRepacker' + process.siPixelDigis.InputLabel = 'rawDataRepacker' process.SiPixelHLTSource.RawInput = 'rawDataRepacker' process.siStripFEDCheck.RawDataTag = 'rawDataRepacker' process.esRawToDigi.sourceTag = 'rawDataRepacker' @@ -109,7 +109,7 @@ process.cscDQMEvF.InputObjects = 'rawDataRepacker' else: process.l1tStage2Fed.rawTag = 'rawDataCollector' - process.siPixelDigis.cpu.InputLabel = 'rawDataCollector' + process.siPixelDigis.InputLabel = 'rawDataCollector' process.SiPixelHLTSource.RawInput = 'rawDataCollector' process.siStripFEDCheck.RawDataTag = 'rawDataCollector' process.esRawToDigi.sourceTag = 'rawDataCollector' diff --git a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py index c28be18e08d06..69ecac59f6f4d 100644 --- a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py @@ -181,7 +181,7 @@ process.muonDTDigis.inputLabel = "rawDataCollector" process.muonRPCDigis.InputLabel = "rawDataCollector" process.scalersRawToDigi.scalersInputTag = "rawDataCollector" -process.siPixelDigis.cpu.InputLabel = "rawDataCollector" +process.siPixelDigis.InputLabel = "rawDataCollector" process.siStripDigis.ProductLabel = "rawDataCollector" process.bxTiming.FedSource = "rawDataCollector" process.l1s.fedRawData = "rawDataCollector" @@ -200,7 +200,7 @@ process.muonDTDigis.inputLabel = "rawDataRepacker" process.muonRPCDigis.InputLabel = "rawDataRepacker" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" process.siStripDigis.ProductLabel = "rawDataRepacker" process.bxTiming.FedSource = "rawDataRepacker" process.l1s.fedRawData = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py index b189cb730d78b..ff1c21439a091 100644 --- a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py @@ -197,7 +197,7 @@ process.muonDTDigis.inputLabel = "rawDataCollector" process.muonRPCDigis.InputLabel = "rawDataCollector" process.scalersRawToDigi.scalersInputTag = "rawDataCollector" -process.siPixelDigis.cpu.InputLabel = "rawDataCollector" +process.siPixelDigis.InputLabel = "rawDataCollector" process.siStripDigis.ProductLabel = "rawDataCollector" #-------------------------------------------------- @@ -219,7 +219,7 @@ process.muonDTDigis.inputLabel = "rawDataRepacker" process.muonRPCDigis.InputLabel = "rawDataRepacker" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" process.siStripDigis.ProductLabel = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py index 9a7068ab5b2d7..33ac6ac576577 100644 --- a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py @@ -192,7 +192,7 @@ process.muonDTDigis.inputLabel = "rawDataCollector" process.muonRPCDigis.InputLabel = "rawDataCollector" process.scalersRawToDigi.scalersInputTag = "rawDataCollector" -process.siPixelDigis.cpu.InputLabel = "rawDataCollector" +process.siPixelDigis.InputLabel = "rawDataCollector" process.siStripDigis.ProductLabel = "rawDataCollector" process.bxTiming.FedSource = "rawDataCollector" process.l1s.fedRawData = "rawDataCollector" @@ -211,7 +211,7 @@ process.muonDTDigis.inputLabel = "rawDataRepacker" process.muonRPCDigis.InputLabel = "rawDataRepacker" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" process.siStripDigis.ProductLabel = "rawDataRepacker" process.bxTiming.FedSource = "rawDataRepacker" process.l1s.fedRawData = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py index 000daa236ecc0..3093a87e67f59 100644 --- a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py @@ -204,7 +204,7 @@ process.muonDTDigis.inputLabel = "rawDataCollector" process.muonRPCDigis.InputLabel = "rawDataCollector" process.scalersRawToDigi.scalersInputTag = "rawDataCollector" -process.siPixelDigis.cpu.InputLabel = "rawDataCollector" +process.siPixelDigis.InputLabel = "rawDataCollector" process.siStripDigis.ProductLabel = "rawDataCollector" #-------------------------------------------------- @@ -226,7 +226,7 @@ process.muonDTDigis.inputLabel = "rawDataRepacker" process.muonRPCDigis.InputLabel = "rawDataRepacker" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" process.siStripDigis.ProductLabel = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py index b9410f2f87fa0..7d69080b6077b 100644 --- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py @@ -142,7 +142,7 @@ process.muonRPCDigis.InputLabel = rawDataRepackerLabel process.muonGEMDigis.InputLabel = rawDataRepackerLabel process.scalersRawToDigi.scalersInputTag = rawDataRepackerLabel - process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel + process.siPixelDigis.InputLabel = rawDataRepackerLabel process.siStripDigis.ProductLabel = rawDataRepackerLabel process.tcdsDigis.InputLabel = rawDataRepackerLabel process.tcdsRawToDigi.InputLabel = rawDataRepackerLabel diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py index 695c24a42fa4d..ac12957c8fc75 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -139,7 +139,7 @@ process.muonRPCDigis.InputLabel = rawDataRepackerLabel process.muonGEMDigis.InputLabel = rawDataRepackerLabel process.scalersRawToDigi.scalersInputTag = rawDataRepackerLabel - process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel + process.siPixelDigis.InputLabel = rawDataRepackerLabel process.siStripDigis.ProductLabel = rawDataRepackerLabel process.tcdsDigis.InputLabel = rawDataRepackerLabel process.tcdsRawToDigi.InputLabel = rawDataRepackerLabel diff --git a/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py index fc5e12b92e68d..cc96a75d9c717 100644 --- a/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py @@ -50,7 +50,7 @@ process.load("Configuration.StandardSequences.EndOfProcess_cff") process.load("Configuration.EventContent.EventContent_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.siPixelDigis.cpu.InputLabel = cms.InputTag("hltFEDSelectorLumiPixels") +process.siPixelDigis.InputLabel = cms.InputTag("hltFEDSelectorLumiPixels") process.reconstruction_step = cms.Sequence( process.siPixelDigis + diff --git a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py index b9a8baef18c87..b9d1024aa5bf9 100644 --- a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py @@ -61,7 +61,7 @@ # process.dqmSaverPB ) -process.siPixelDigis.cpu.InputLabel = "rawDataCollector" +process.siPixelDigis.InputLabel = "rawDataCollector" ### process customizations included here from DQM.Integration.config.online_customizations_cfi import * @@ -74,4 +74,4 @@ print("Running with run type = ", process.runType.getRunType()) if (process.runType.getRunType() == process.runType.hi_run): - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py index aee5a5157257c..2e4a3e0ff867c 100644 --- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py @@ -105,20 +105,20 @@ # PixelPhase1 Real data raw to digi process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi") -process.siPixelDigis.cpu.IncludeErrors = True +process.siPixelDigis.IncludeErrors = True if (process.runType.getRunType() == process.runType.hi_run): rawDataRepackerLabel = 'rawDataRepacker' #-------------------------------- # Heavy Ion Configuration Changes #-------------------------------- - process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel + process.siPixelDigis.InputLabel = rawDataRepackerLabel process.siStripDigis.ProductLabel = rawDataRepackerLabel process.scalersRawToDigi.scalersInputTag = rawDataRepackerLabel process.tcdsDigis.InputLabel = rawDataRepackerLabel else : rawDataCollectorLabel = 'rawDataCollector' - process.siPixelDigis.cpu.InputLabel = rawDataCollectorLabel + process.siPixelDigis.InputLabel = rawDataCollectorLabel process.siStripDigis.ProductLabel = rawDataCollectorLabel ## Collision Reconstruction diff --git a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py index d4dba8722178f..a46b00523b345 100644 --- a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py @@ -82,7 +82,7 @@ #----------------------- # Real data raw to digi process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi") -process.siPixelDigis.cpu.IncludeErrors = True +process.siPixelDigis.IncludeErrors = True # Local Reconstruction process.load("RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizer_cfi") @@ -95,13 +95,13 @@ # SelectEvents = cms.vstring('HLT_600Tower*','HLT_L1*','HLT_Jet*','HLT_*Cosmic*','HLT_HT*','HLT_MinBias_*','HLT_Physics*', 'HLT_ZeroBias*','HLT_HcalNZS*')) -process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector") +process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector") #-------------------------------- # Heavy Ion Configuration Changes #-------------------------------- if (process.runType.getRunType() == process.runType.hi_run): process.load('Configuration.StandardSequences.RawToDigi_Repacked_cff') - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" if not unitTest: process.source.SelectEvents = ['HLT_HIL1MinimumBiasHF2AND*'] diff --git a/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py index 1ff0bfaf4f903..21fa87d29783f 100644 --- a/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py @@ -99,7 +99,7 @@ process.muonDTDigis.inputLabel = "rawDataRepacker" process.muonRPCDigis.InputLabel = "rawDataRepacker" process.scalersRawToDigi.scalersInputTag = "rawDataRepacker" - process.siPixelDigis.cpu.InputLabel = "rawDataRepacker" + process.siPixelDigis.InputLabel = "rawDataRepacker" process.siStripDigis.ProductLabel = "rawDataRepacker" diff --git a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py index 4a462e5c2602d..2110a3ae8b864 100644 --- a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py @@ -193,7 +193,7 @@ process.muonDTDigis.inputLabel = rawDataRepackerLabel process.muonRPCDigis.InputLabel = rawDataRepackerLabel process.scalersRawToDigi.scalersInputTag = rawDataRepackerLabel - process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel + process.siPixelDigis.InputLabel = rawDataRepackerLabel process.siStripDigis.ProductLabel = rawDataRepackerLabel process.tcdsDigis.InputLabel = rawDataRepackerLabel diff --git a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py index 108e0d61e9db5..60f9deed8c9cb 100644 --- a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py @@ -520,7 +520,7 @@ process.muonDTDigis.inputLabel = rawDataCollectorLabel process.muonRPCDigis.InputLabel = rawDataCollectorLabel process.scalersRawToDigi.scalersInputTag = rawDataCollectorLabel -process.siPixelDigis.cpu.InputLabel = rawDataCollectorLabel +process.siPixelDigis.InputLabel = rawDataCollectorLabel process.siStripDigis.ProductLabel = rawDataCollectorLabel process.siStripFEDMonitor.RawDataTag = rawDataCollectorLabel #-------------------------------------------------- @@ -543,7 +543,7 @@ process.muonDTDigis.inputLabel = rawDataRepackerLabel process.muonRPCDigis.InputLabel = rawDataRepackerLabel process.scalersRawToDigi.scalersInputTag = rawDataRepackerLabel - process.siPixelDigis.cpu.InputLabel = rawDataRepackerLabel + process.siPixelDigis.InputLabel = rawDataRepackerLabel process.siStripDigis.ProductLabel = rawDataRepackerLabel process.siStripFEDMonitor.RawDataTag = rawDataRepackerLabel process.tcdsDigis.InputLabel = rawDataRepackerLabel diff --git a/DQM/Physics/python/qcdLowPtDQM_cfi.py b/DQM/Physics/python/qcdLowPtDQM_cfi.py index ead851164104b..c77a780bb9725 100644 --- a/DQM/Physics/python/qcdLowPtDQM_cfi.py +++ b/DQM/Physics/python/qcdLowPtDQM_cfi.py @@ -7,7 +7,7 @@ from RecoLocalTracker.SiPixelRecHits.SiPixelRecHits_cfi import * from RecoLocalTracker.SiPixelRecHits.PixelCPEESProducers_cff import * -siPixelDigis.cpu.InputLabel = cms.InputTag("source") +siPixelDigis.InputLabel = cms.InputTag("source") myRecoSeq1 = cms.Sequence( siPixelDigis * diff --git a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py index 44dd352d1f512..067270ec1ea70 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py @@ -51,20 +51,17 @@ from RecoLocalTracker.SiPixelRecHits.siPixelRecHitFromSoAAlpakaPhase2_cfi import siPixelRecHitFromSoAAlpakaPhase2 as _siPixelRecHitFromSoAAlpakaPhase2 from RecoLocalTracker.SiPixelRecHits.siPixelRecHitFromSoAAlpakaHIonPhase1_cfi import siPixelRecHitFromSoAAlpakaHIonPhase1 as _siPixelRecHitFromSoAAlpakaHIonPhase1 -(alpaka & ~phase2_tracker).toModify(siPixelRecHitsPreSplitting, - cpu = _siPixelRecHitFromSoAAlpakaPhase1.clone( +(alpaka & ~phase2_tracker).toReplaceWith(siPixelRecHitsPreSplitting, _siPixelRecHitFromSoAAlpakaPhase1.clone( pixelRecHitSrc = cms.InputTag('siPixelRecHitsPreSplittingAlpaka'), src = cms.InputTag('siPixelClustersPreSplitting')) ) -(alpaka & phase2_tracker).toModify(siPixelRecHitsPreSplitting, - cpu = _siPixelRecHitFromSoAAlpakaPhase2.clone( +(alpaka & phase2_tracker).toReplaceWith(siPixelRecHitsPreSplitting, _siPixelRecHitFromSoAAlpakaPhase2.clone( pixelRecHitSrc = cms.InputTag('siPixelRecHitsPreSplittingAlpaka'), src = cms.InputTag('siPixelClustersPreSplitting')) ) -(alpaka & pp_on_AA & ~phase2_tracker).toModify(siPixelRecHitsPreSplitting, - cpu = _siPixelRecHitFromSoAAlpakaHIonPhase1.clone( +(alpaka & pp_on_AA & ~phase2_tracker).toModify(siPixelRecHitsPreSplitting, _siPixelRecHitFromSoAAlpakaHIonPhase1.clone( pixelRecHitSrc = cms.InputTag('siPixelRecHitsPreSplittingAlpaka'), src = cms.InputTag('siPixelClustersPreSplitting')) )