diff --git a/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py b/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py index 391055bd870e8..e0d1dbc8a1c25 100644 --- a/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py +++ b/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py @@ -13,9 +13,9 @@ from Configuration.ProcessModifiers.pixelNtupletFit_cff import pixelNtupletFit # build the pixel vertices in SoA format on the CPU -from RecoPixelVertexing.PixelVertexFinding.pixelVertexCUDA_cfi import pixelVertexCUDA as _pixelVertexCUDA +from RecoPixelVertexing.PixelVertexFinding.pixelVerticesCUDA_cfi import pixelVerticesCUDA as _pixelVerticesCUDA pixelVerticesSoA = SwitchProducerCUDA( - cpu = _pixelVertexCUDA.clone( + cpu = _pixelVerticesCUDA.clone( pixelTrackSrc = "pixelTracksSoA", onGPU = False ) @@ -39,15 +39,15 @@ from Configuration.ProcessModifiers.gpu_cff import gpu # build pixel vertices in SoA format on the GPU -pixelVerticesCUDA = _pixelVertexCUDA.clone( +pixelVerticesCUDA = _pixelVerticesCUDA.clone( pixelTrackSrc = "pixelTracksCUDA", onGPU = True ) # transfer the pixel vertices in SoA format to the CPU -from RecoPixelVertexing.PixelVertexFinding.pixelVertexSoA_cfi import pixelVertexSoA as _pixelVertexSoA +from RecoPixelVertexing.PixelVertexFinding.pixelVerticesSoA_cfi import pixelVerticesSoA as _pixelVerticesSoA gpu.toModify(pixelVerticesSoA, - cuda = _pixelVertexSoA.clone( + cuda = _pixelVerticesSoA.clone( src = cms.InputTag("pixelVerticesCUDA") ) ) diff --git a/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackDumpCUDA.cc b/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackDumpCUDA.cc index 04cc57db5876c..a73b773824f18 100644 --- a/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackDumpCUDA.cc +++ b/RecoPixelVertexing/PixelTrackFitting/plugins/PixelTrackDumpCUDA.cc @@ -55,7 +55,7 @@ void PixelTrackDumpCUDA::fillDescriptions(edm::ConfigurationDescriptions& descri desc.add("onGPU", true); desc.add("pixelTrackSrc", edm::InputTag("pixelTracksCUDA")); - desc.add("pixelVertexSrc", edm::InputTag("pixelVertexCUDA")); + desc.add("pixelVertexSrc", edm::InputTag("pixelVerticesCUDA")); descriptions.add("pixelTrackDumpCUDA", desc); } diff --git a/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc b/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc index 2989403fa4214..4c17a2971fc5f 100644 --- a/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc +++ b/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc @@ -87,7 +87,7 @@ void PixelVertexProducerCUDA::fillDescriptions(edm::ConfigurationDescriptions& d desc.add("PtMin", 0.5); desc.add("pixelTrackSrc", edm::InputTag("pixelTracksCUDA")); - auto label = "pixelVertexCUDA"; + auto label = "pixelVerticesCUDA"; descriptions.add(label, desc); } diff --git a/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc b/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc index 62b9bb46bd4a5..696e534273766 100644 --- a/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc +++ b/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc @@ -54,7 +54,7 @@ void PixelVertexProducerFromSoA::fillDescriptions(edm::ConfigurationDescriptions desc.add("TrackCollection", edm::InputTag("pixelTracks")); desc.add("beamSpot", edm::InputTag("offlineBeamSpot")); - desc.add("src", edm::InputTag("pixelVertexSoA")); + desc.add("src", edm::InputTag("pixelVerticesSoA")); descriptions.add("pixelVertexFromSoA", desc); } diff --git a/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc b/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc index 0cadf24580cf7..dc125878b1058 100644 --- a/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc +++ b/RecoPixelVertexing/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc @@ -43,8 +43,8 @@ PixelVertexSoAFromCUDA::PixelVertexSoAFromCUDA(const edm::ParameterSet& iConfig) void PixelVertexSoAFromCUDA::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; - desc.add("src", edm::InputTag("pixelVertexCUDA")); - descriptions.add("pixelVertexSoA", desc); + desc.add("src", edm::InputTag("pixelVerticesCUDA")); + descriptions.add("pixelVerticesSoA", desc); } void PixelVertexSoAFromCUDA::acquire(edm::Event const& iEvent, diff --git a/RecoTracker/Configuration/python/customizePixelOnlyForProfiling.py b/RecoTracker/Configuration/python/customizePixelOnlyForProfiling.py index 045738b37dde1..3d121a8736f8e 100644 --- a/RecoTracker/Configuration/python/customizePixelOnlyForProfiling.py +++ b/RecoTracker/Configuration/python/customizePixelOnlyForProfiling.py @@ -6,7 +6,7 @@ def customizePixelOnlyForProfilingGPUOnly(process): process.consumer = cms.EDAnalyzer("GenericConsumer", - eventProducts = cms.untracked.vstring('pixelTracksCUDA', 'pixelVertexCUDA') + eventProducts = cms.untracked.vstring('pixelTracksCUDA', 'pixelVerticesCUDA') ) process.consume_step = cms.EndPath(process.consumer) @@ -28,7 +28,7 @@ def customizePixelOnlyForProfilingGPUWithHostCopy(process): #? process.siPixelRecHitSoAFromLegacy.convertToLegacy = False process.consumer = cms.EDAnalyzer("GenericConsumer", - eventProducts = cms.untracked.vstring('pixelTracksSoA', 'pixelVertexSoA') + eventProducts = cms.untracked.vstring('pixelTracksSoA', 'pixelVerticesSoA') ) process.consume_step = cms.EndPath(process.consumer)