From 90f303c73065bcd8f29cdc092be3f371406a6cb2 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 30 Aug 2024 12:27:44 +0200 Subject: [PATCH 1/2] RecoTracker/PixelVertexFinding -> RecoVertex/PixelVertexFinding --- .../python/Reconstruction_cff.py | 2 +- .../EventContent/python/EventContent_cff.py | 2 +- .../python/Reconstruction_cff.py | 2 +- .../clients/beam_dqm_sourceclient-live_cfg.py | 2 +- .../beampixel_dqm_sourceclient-live_cfg.py | 2 +- .../SiPixelMonitorHitEfficiency_data_cfg.py | 2 +- .../SiPixelMonitorTrackResiduals_data_cfg.py | 2 +- ...SiPixelMonitorTrackResiduals_relval_cfg.py | 2 +- .../python/RecoForDQM_cff.py | 2 +- .../PixelVertexWorkSpaceSoAHostAlpaka.h | 15 -------------- .../python/PixelVertexes_cff.py | 3 --- .../RecoPixelVertexing_EventContent_cff.py | 0 .../python/RecoPixelVertexing_cff.py | 20 +++++++++---------- .../PixelVertexFinding/BuildFile.xml | 0 .../interface/Cluster1DCleaner.h | 4 ++-- .../interface/Cluster1DMerger.h | 4 ++-- .../interface/DivisiveClusterizer1D.h | 8 ++++---- .../interface/DivisiveVertexFinder.h | 10 +++++----- .../interface/FindPeakFastPV.h | 6 +++--- .../PixelVertexFinding/interface/PVCluster.h | 8 ++++---- .../interface/PVClusterComparer.h | 8 ++++---- .../interface/PVPositionBuilder.h | 6 +++--- .../interface/PixelVertexWorkSpaceLayout.h | 6 +++--- .../PixelVertexFinding/plugins/BuildFile.xml | 2 +- .../plugins/FastPrimaryVertexProducer.cc | 0 .../FastPrimaryVertexWithWeightsProducer.cc | 2 +- .../plugins/JetVertexChecker.cc | 0 .../plugins/PixelVertexCollectionTrimmer.cc | 4 ++-- .../plugins/PixelVertexProducer.cc | 2 +- .../plugins/PixelVertexProducerCUDA.cc | 0 .../plugins/PixelVertexProducerFromSoA.cc | 0 .../PixelVertexProducerFromSoAAlpaka.cc | 0 .../plugins/PixelVertexSoAFromCUDA.cc | 0 .../plugins/PixelVertexWorkSpaceSoADevice.h | 6 +++--- .../plugins/PixelVertexWorkSpaceSoAHost.h | 6 +++--- .../PixelVertexWorkSpaceSoAHostAlpaka.h | 15 ++++++++++++++ .../plugins/PixelVertexWorkSpaceUtilities.h | 4 ++-- .../alpaka/PixelVertexProducerAlpaka.cc | 0 .../PixelVertexWorkSpaceSoADeviceAlpaka.h | 10 +++++----- .../plugins/alpaka/clusterTracksByDensity.h | 8 ++++---- .../plugins/alpaka/clusterTracksDBSCAN.h | 8 ++++---- .../plugins/alpaka/clusterTracksIterative.h | 8 ++++---- .../plugins/alpaka/fitVertices.h | 6 +++--- .../plugins/alpaka/sortByPt2.h | 8 ++++---- .../plugins/alpaka/splitVertices.h | 6 +++--- .../plugins/alpaka/vertexFinder.dev.cc | 4 ++-- .../plugins/alpaka/vertexFinder.h | 10 +++++----- .../plugins/gpuClusterTracksByDensity.h | 6 +++--- .../plugins/gpuClusterTracksDBSCAN.h | 6 +++--- .../plugins/gpuClusterTracksIterative.h | 6 +++--- .../plugins/gpuFitVertices.h | 6 +++--- .../PixelVertexFinding/plugins/gpuSortByPt2.h | 6 +++--- .../plugins/gpuSplitVertices.h | 6 +++--- .../plugins/gpuVertexFinder.cc | 0 .../plugins/gpuVertexFinder.cu | 0 .../plugins/gpuVertexFinder.h | 6 +++--- .../python/PVClusterComparer_cfi.py | 0 .../python/PixelVertexes_cff.py | 3 +++ .../python/PixelVertexes_cfi.py | 2 +- .../python/fastPrimaryVertexProducer_cfi.py | 0 .../src/DivisiveVertexFinder.cc | 6 +++--- .../src/PVClusterComparer.cc | 2 +- .../src/PVPositionBuilder.cc | 2 +- .../PixelVertexFinding/test/BuildFile.xml | 0 .../PixelVertexFinding/test/VertexFinder_t.h | 18 ++++++++--------- .../test/alpaka/VertexFinder_t.cc | 0 .../test/alpaka/VertexFinder_t.dev.cc | 20 +++++++++---------- .../test/alpaka/VertexFinder_t.h | 6 +++--- .../test/cpuVertexFinder_t.cpp | 0 .../test/gpuVertexFinder_t.cu | 0 .../test/stripClusterMCanalysis_cfg.py | 2 +- 71 files changed, 164 insertions(+), 164 deletions(-) delete mode 100644 RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h delete mode 100644 RecoTracker/PixelVertexFinding/python/PixelVertexes_cff.py rename {RecoTracker => RecoVertex}/Configuration/python/RecoPixelVertexing_EventContent_cff.py (100%) rename {RecoTracker => RecoVertex}/Configuration/python/RecoPixelVertexing_cff.py (76%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/BuildFile.xml (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/Cluster1DCleaner.h (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/Cluster1DMerger.h (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/DivisiveClusterizer1D.h (97%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/DivisiveVertexFinder.h (86%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/FindPeakFastPV.h (91%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/PVCluster.h (63%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/PVClusterComparer.h (84%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/PVPositionBuilder.h (82%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h (85%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/BuildFile.xml (97%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/FastPrimaryVertexProducer.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/FastPrimaryVertexWithWeightsProducer.cc (99%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/JetVertexChecker.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexCollectionTrimmer.cc (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexProducer.cc (99%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexProducerFromSoAAlpaka.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h (75%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h (76%) create mode 100644 RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h (91%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/PixelVertexProducerAlpaka.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h (56%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/fitVertices.h (95%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/sortByPt2.h (90%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/splitVertices.h (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/vertexFinder.dev.cc (98%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/alpaka/vertexFinder.h (87%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h (97%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h (97%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuClusterTracksIterative.h (96%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuFitVertices.h (93%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuSortByPt2.h (90%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuSplitVertices.h (95%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuVertexFinder.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuVertexFinder.cu (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/plugins/gpuVertexFinder.h (91%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/python/PVClusterComparer_cfi.py (100%) create mode 100644 RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py rename {RecoTracker => RecoVertex}/PixelVertexFinding/python/PixelVertexes_cfi.py (89%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/python/fastPrimaryVertexProducer_cfi.py (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/src/DivisiveVertexFinder.cc (95%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/src/PVClusterComparer.cc (98%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/src/PVPositionBuilder.cc (95%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/test/BuildFile.xml (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/test/VertexFinder_t.h (94%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/test/alpaka/VertexFinder_t.cc (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc (93%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/test/alpaka/VertexFinder_t.h (51%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/test/cpuVertexFinder_t.cpp (100%) rename {RecoTracker => RecoVertex}/PixelVertexFinding/test/gpuVertexFinder_t.cu (100%) diff --git a/CalibTracker/Configuration/python/Reconstruction_cff.py b/CalibTracker/Configuration/python/Reconstruction_cff.py index dd78bb14a5540..fa1cad3d1372d 100644 --- a/CalibTracker/Configuration/python/Reconstruction_cff.py +++ b/CalibTracker/Configuration/python/Reconstruction_cff.py @@ -15,7 +15,7 @@ from RecoLocalTracker.SiStripRecHitConverter.SiStripRecHitConverter_cfi import * from RecoTracker.Configuration.RecoTracker_cff import * from RecoTracker.Configuration.RecoTrackerP5_cff import * -from RecoTracker.Configuration.RecoPixelVertexing_cff import * +from RecoVertex.Configuration.RecoPixelVertexing_cff import * recotrack = cms.Sequence(offlineBeamSpot + siPixelRecHitsPreSplitting + siStripMatchedRecHits + recopixelvertexing + ckftracks) recotrackP5 = cms.Sequence(offlineBeamSpot + siPixelRecHitsPreSplitting + siStripMatchedRecHits + recopixelvertexing + ctftracksP5) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 96303dd959a72..396b424cd3da2 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -56,7 +56,7 @@ from RecoBTag.Configuration.RecoBTag_EventContent_cff import * from RecoTauTag.Configuration.RecoTauTag_EventContent_cff import * from RecoVertex.Configuration.RecoVertex_EventContent_cff import * -from RecoTracker.Configuration.RecoPixelVertexing_EventContent_cff import * +from RecoVertex.Configuration.RecoPixelVertexing_EventContent_cff import * from RecoEgamma.Configuration.RecoEgamma_EventContent_cff import * from RecoParticleFlow.Configuration.RecoParticleFlow_EventContent_cff import * from RecoVertex.BeamSpotProducer.BeamSpot_EventContent_cff import * diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py index b30aeb4617ca9..b009833717a63 100644 --- a/Configuration/StandardSequences/python/Reconstruction_cff.py +++ b/Configuration/StandardSequences/python/Reconstruction_cff.py @@ -26,7 +26,7 @@ # Higher level objects from RecoVertex.Configuration.RecoVertex_cff import * from RecoEgamma.Configuration.RecoEgamma_cff import * -from RecoTracker.Configuration.RecoPixelVertexing_cff import * +from RecoVertex.Configuration.RecoPixelVertexing_cff import * from RecoJets.Configuration.RecoJetsGlobal_cff import * 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 a15d331b490d1..184d73e337dfd 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -336,7 +336,7 @@ #---------------------------- # Pixel tracks/vertices reco -process.load("RecoTracker.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") from RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi import * process.pixelVertices = pixelVertices.clone( TkFilterParameters = dict( minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin) 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 a20d7e6435458..ce2037d83d50b 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -93,7 +93,7 @@ from RecoTracker.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import * process.siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(src = 'siPixelClustersPreSplitting') process.load("RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi") -process.load("RecoTracker.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") from RecoVertex.PrimaryVertexProducer.OfflinePixel3DPrimaryVertices_cfi import * process.pixelVertices = pixelVertices.clone( TkFilterParameters = dict( diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py index 506c4ea36de7e..a8bd3f6fca8a5 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py @@ -40,7 +40,7 @@ process.load("RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi") process.load("RecoVertex.BeamSpotProducer.BeamSpot_cff") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") process.load("DQM.SiPixelMonitorRawData.SiPixelMonitorRawData_cfi") diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py index aae969159fbcf..05606d081afcb 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py @@ -38,7 +38,7 @@ process.load("RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi") process.load("RecoVertex.BeamSpotProducer.BeamSpot_cff") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") process.load("DQM.SiPixelMonitorRawData.SiPixelMonitorRawData_cfi") diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py index 2e35f59babf76..2087283dbb793 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py @@ -32,7 +32,7 @@ process.load("RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi") process.load("RecoVertex.BeamSpotProducer.BeamSpot_cff") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") process.load("DQM.SiPixelMonitorRawData.SiPixelMonitorRawData_cfi") diff --git a/DQM/SiStripMonitorClient/python/RecoForDQM_cff.py b/DQM/SiStripMonitorClient/python/RecoForDQM_cff.py index 004ca3bc88986..4ee5c70d95ad0 100644 --- a/DQM/SiStripMonitorClient/python/RecoForDQM_cff.py +++ b/DQM/SiStripMonitorClient/python/RecoForDQM_cff.py @@ -21,7 +21,7 @@ from RecoVertex.BeamSpotProducer.BeamSpot_cff import * # Pixel Vertex -from RecoTracker.Configuration.RecoPixelVertexing_cff import * +from RecoVertex.Configuration.RecoPixelVertexing_cff import * # Reconstruction Sequence RecoForDQMCollision = cms.Sequence(siPixelDigis*siStripDigis*trackerlocalreco*offlineBeamSpot*recopixelvertexing*ckftracks) diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h b/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h deleted file mode 100644 index 33e163dbab784..0000000000000 --- a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHostAlpaka_h -#define RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHostAlpaka_h - -#include - -#include "DataFormats/Portable/interface/PortableHostCollection.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" - -namespace vertexFinder { - - using PixelVertexWorkSpaceSoAHost = PortableHostCollection>; - -} // namespace vertexFinder - -#endif // RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHostAlpaka_h diff --git a/RecoTracker/PixelVertexFinding/python/PixelVertexes_cff.py b/RecoTracker/PixelVertexFinding/python/PixelVertexes_cff.py deleted file mode 100644 index 0f344e8578037..0000000000000 --- a/RecoTracker/PixelVertexFinding/python/PixelVertexes_cff.py +++ /dev/null @@ -1,3 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from RecoTracker.PixelVertexFinding.PixelVertexes_cfi import * diff --git a/RecoTracker/Configuration/python/RecoPixelVertexing_EventContent_cff.py b/RecoVertex/Configuration/python/RecoPixelVertexing_EventContent_cff.py similarity index 100% rename from RecoTracker/Configuration/python/RecoPixelVertexing_EventContent_cff.py rename to RecoVertex/Configuration/python/RecoPixelVertexing_EventContent_cff.py diff --git a/RecoTracker/Configuration/python/RecoPixelVertexing_cff.py b/RecoVertex/Configuration/python/RecoPixelVertexing_cff.py similarity index 76% rename from RecoTracker/Configuration/python/RecoPixelVertexing_cff.py rename to RecoVertex/Configuration/python/RecoPixelVertexing_cff.py index 82c211d952292..98da9a07c7dc1 100644 --- a/RecoTracker/Configuration/python/RecoPixelVertexing_cff.py +++ b/RecoVertex/Configuration/python/RecoPixelVertexing_cff.py @@ -3,7 +3,7 @@ from HeterogeneousCore.CUDACore.SwitchProducerCUDA import SwitchProducerCUDA from RecoTracker.PixelTrackFitting.PixelTracks_cff import * -from RecoTracker.PixelVertexFinding.PixelVertexes_cff import * +from RecoVertex.PixelVertexFinding.PixelVertexes_cff import * # legacy pixel vertex reconsruction using the divisive vertex finder pixelVerticesTask = cms.Task( @@ -18,9 +18,9 @@ from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA # build the pixel vertices in SoA format on the CPU -from RecoTracker.PixelVertexFinding.pixelVertexProducerCUDAPhase1_cfi import pixelVertexProducerCUDAPhase1 as _pixelVerticesCUDA -from RecoTracker.PixelVertexFinding.pixelVertexProducerCUDAPhase2_cfi import pixelVertexProducerCUDAPhase2 as _pixelVerticesCUDAPhase2 -from RecoTracker.PixelVertexFinding.pixelVertexProducerCUDAHIonPhase1_cfi import pixelVertexProducerCUDAHIonPhase1 as _pixelVerticesCUDAHIonPhase1 +from RecoVertex.PixelVertexFinding.pixelVertexProducerCUDAPhase1_cfi import pixelVertexProducerCUDAPhase1 as _pixelVerticesCUDA +from RecoVertex.PixelVertexFinding.pixelVertexProducerCUDAPhase2_cfi import pixelVertexProducerCUDAPhase2 as _pixelVerticesCUDAPhase2 +from RecoVertex.PixelVertexFinding.pixelVertexProducerCUDAHIonPhase1_cfi import pixelVertexProducerCUDAHIonPhase1 as _pixelVerticesCUDAHIonPhase1 pixelVerticesSoA = SwitchProducerCUDA( cpu = _pixelVerticesCUDA.clone( @@ -42,7 +42,7 @@ )) # convert the pixel vertices from SoA to legacy format -from RecoTracker.PixelVertexFinding.pixelVertexFromSoA_cfi import pixelVertexFromSoA as _pixelVertexFromSoA +from RecoVertex.PixelVertexFinding.pixelVertexFromSoA_cfi import pixelVertexFromSoA as _pixelVertexFromSoA (pixelNtupletFit).toReplaceWith(pixelVertices, _pixelVertexFromSoA.clone( src = "pixelVerticesSoA" @@ -78,7 +78,7 @@ )) # transfer the pixel vertices in SoA format to the CPU -from RecoTracker.PixelVertexFinding.pixelVerticesSoA_cfi import pixelVerticesSoA as _pixelVerticesSoA +from RecoVertex.PixelVertexFinding.pixelVerticesSoA_cfi import pixelVerticesSoA as _pixelVerticesSoA gpu.toModify(pixelVerticesSoA, cuda = _pixelVerticesSoA.clone( src = cms.InputTag("pixelVerticesCUDA") @@ -102,14 +102,14 @@ ## pixel vertex reconstruction with Alpaka # pixel vertex SoA producer with alpaka on the device -from RecoTracker.PixelVertexFinding.pixelVertexProducerAlpakaPhase1_cfi import pixelVertexProducerAlpakaPhase1 as _pixelVerticesAlpakaPhase1 -from RecoTracker.PixelVertexFinding.pixelVertexProducerAlpakaPhase2_cfi import pixelVertexProducerAlpakaPhase2 as _pixelVerticesAlpakaPhase2 -from RecoTracker.PixelVertexFinding.pixelVertexProducerAlpakaHIonPhase1_cfi import pixelVertexProducerAlpakaHIonPhase1 as _pixelVerticesAlpakaHIonPhase1 +from RecoVertex.PixelVertexFinding.pixelVertexProducerAlpakaPhase1_cfi import pixelVertexProducerAlpakaPhase1 as _pixelVerticesAlpakaPhase1 +from RecoVertex.PixelVertexFinding.pixelVertexProducerAlpakaPhase2_cfi import pixelVertexProducerAlpakaPhase2 as _pixelVerticesAlpakaPhase2 +from RecoVertex.PixelVertexFinding.pixelVertexProducerAlpakaHIonPhase1_cfi import pixelVertexProducerAlpakaHIonPhase1 as _pixelVerticesAlpakaHIonPhase1 pixelVerticesAlpaka = _pixelVerticesAlpakaPhase1.clone() phase2_tracker.toReplaceWith(pixelVerticesAlpaka,_pixelVerticesAlpakaPhase2.clone()) (pp_on_AA & ~phase2_tracker).toReplaceWith(pixelVerticesAlpaka,_pixelVerticesAlpakaHIonPhase1.clone(doSplitting = False)) -from RecoTracker.PixelVertexFinding.pixelVertexFromSoAAlpaka_cfi import pixelVertexFromSoAAlpaka as _pixelVertexFromSoAAlpaka +from RecoVertex.PixelVertexFinding.pixelVertexFromSoAAlpaka_cfi import pixelVertexFromSoAAlpaka as _pixelVertexFromSoAAlpaka alpaka.toReplaceWith(pixelVertices, _pixelVertexFromSoAAlpaka.clone()) # pixel vertex SoA producer with alpaka on the cpu, for validation diff --git a/RecoTracker/PixelVertexFinding/BuildFile.xml b/RecoVertex/PixelVertexFinding/BuildFile.xml similarity index 100% rename from RecoTracker/PixelVertexFinding/BuildFile.xml rename to RecoVertex/PixelVertexFinding/BuildFile.xml diff --git a/RecoTracker/PixelVertexFinding/interface/Cluster1DCleaner.h b/RecoVertex/PixelVertexFinding/interface/Cluster1DCleaner.h similarity index 96% rename from RecoTracker/PixelVertexFinding/interface/Cluster1DCleaner.h rename to RecoVertex/PixelVertexFinding/interface/Cluster1DCleaner.h index 5e5722f5edb66..9bed8b9e72d9f 100644 --- a/RecoTracker/PixelVertexFinding/interface/Cluster1DCleaner.h +++ b/RecoVertex/PixelVertexFinding/interface/Cluster1DCleaner.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_Cluster1DCleaner_h -#define RecoTracker_PixelVertexFinding_Cluster1DCleaner_h +#ifndef RecoVertex_PixelVertexFinding_Cluster1DCleaner_h +#define RecoVertex_PixelVertexFinding_Cluster1DCleaner_h #include "CommonTools/Clustering1D/interface/Cluster1D.h" diff --git a/RecoTracker/PixelVertexFinding/interface/Cluster1DMerger.h b/RecoVertex/PixelVertexFinding/interface/Cluster1DMerger.h similarity index 96% rename from RecoTracker/PixelVertexFinding/interface/Cluster1DMerger.h rename to RecoVertex/PixelVertexFinding/interface/Cluster1DMerger.h index 7744cd586c7ac..bf1b4681b6fd1 100644 --- a/RecoTracker/PixelVertexFinding/interface/Cluster1DMerger.h +++ b/RecoVertex/PixelVertexFinding/interface/Cluster1DMerger.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_Cluster1DMerger_h -#define RecoTracker_PixelVertexFinding_Cluster1DMerger_h +#ifndef RecoVertex_PixelVertexFinding_Cluster1DMerger_h +#define RecoVertex_PixelVertexFinding_Cluster1DMerger_h #include "CommonTools/Clustering1D/interface/Cluster1D.h" #include "CommonTools/Clustering1D/interface/WeightEstimator.h" diff --git a/RecoTracker/PixelVertexFinding/interface/DivisiveClusterizer1D.h b/RecoVertex/PixelVertexFinding/interface/DivisiveClusterizer1D.h similarity index 97% rename from RecoTracker/PixelVertexFinding/interface/DivisiveClusterizer1D.h rename to RecoVertex/PixelVertexFinding/interface/DivisiveClusterizer1D.h index fbbcd26c5a9ae..c3f899f65a84e 100644 --- a/RecoTracker/PixelVertexFinding/interface/DivisiveClusterizer1D.h +++ b/RecoVertex/PixelVertexFinding/interface/DivisiveClusterizer1D.h @@ -1,11 +1,11 @@ -#ifndef RecoTracker_PixelVertexFinding_DivisiveClusterizer1D_h -#define RecoTracker_PixelVertexFinding_DivisiveClusterizer1D_h +#ifndef RecoVertex_PixelVertexFinding_DivisiveClusterizer1D_h +#define RecoVertex_PixelVertexFinding_DivisiveClusterizer1D_h #include "CommonTools/Clustering1D/interface/Clusterizer1D.h" //#include "CommonTools/Clustering1D/interface/Cluster1DMerger.h" //#include "CommonTools/Clustering1D/interface/Cluster1DCleaner.h" -#include "RecoTracker/PixelVertexFinding/interface/Cluster1DMerger.h" -#include "RecoTracker/PixelVertexFinding/interface/Cluster1DCleaner.h" +#include "RecoVertex/PixelVertexFinding/interface/Cluster1DMerger.h" +#include "RecoVertex/PixelVertexFinding/interface/Cluster1DCleaner.h" #include "CommonTools/Clustering1D/interface/TrivialWeightEstimator.h" #include "CommonTools/Clustering1D/interface/Clusterizer1DCommons.h" diff --git a/RecoTracker/PixelVertexFinding/interface/DivisiveVertexFinder.h b/RecoVertex/PixelVertexFinding/interface/DivisiveVertexFinder.h similarity index 86% rename from RecoTracker/PixelVertexFinding/interface/DivisiveVertexFinder.h rename to RecoVertex/PixelVertexFinding/interface/DivisiveVertexFinder.h index 0598f413df383..0641cd594d758 100644 --- a/RecoTracker/PixelVertexFinding/interface/DivisiveVertexFinder.h +++ b/RecoVertex/PixelVertexFinding/interface/DivisiveVertexFinder.h @@ -1,6 +1,6 @@ -#ifndef RecoTracker_PixelVertexFinding_DivisiveVertexFinder_h -#define RecoTracker_PixelVertexFinding_DivisiveVertexFinder_h -/** \class DivisiveVertexFinder DivisiveVertexFinder.h RecoTracker/PixelVertexFinding/interface/DivisiveVertexFinder.h +#ifndef RecoVertex_PixelVertexFinding_DivisiveVertexFinder_h +#define RecoVertex_PixelVertexFinding_DivisiveVertexFinder_h +/** \class DivisiveVertexFinder DivisiveVertexFinder.h RecoVertex/PixelVertexFinding/interface/DivisiveVertexFinder.h Description: Fits a primary vertex in 1D (z) using the "divisive method" @@ -27,9 +27,9 @@ #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" //#include "CommonTools/Clustering1D/interface/DivisiveClusterizer1D.h" -#include "RecoTracker/PixelVertexFinding/interface/DivisiveClusterizer1D.h" +#include "RecoVertex/PixelVertexFinding/interface/DivisiveClusterizer1D.h" -#include "RecoTracker/PixelVertexFinding/interface/PVClusterComparer.h" +#include "RecoVertex/PixelVertexFinding/interface/PVClusterComparer.h" class DivisiveVertexFinder { public: diff --git a/RecoTracker/PixelVertexFinding/interface/FindPeakFastPV.h b/RecoVertex/PixelVertexFinding/interface/FindPeakFastPV.h similarity index 91% rename from RecoTracker/PixelVertexFinding/interface/FindPeakFastPV.h rename to RecoVertex/PixelVertexFinding/interface/FindPeakFastPV.h index 54f1df7e900e2..fc1bc709cc3b5 100644 --- a/RecoTracker/PixelVertexFinding/interface/FindPeakFastPV.h +++ b/RecoVertex/PixelVertexFinding/interface/FindPeakFastPV.h @@ -1,6 +1,6 @@ -#ifndef RecoTracker_PixelVertexFinding_FindPeakFastPV_h -#define RecoTracker_PixelVertexFinding_FindPeakFastPV_h -/** \class FindPeakFastPV FindPeakFastPV.h RecoTracker/PixelVertexFinding/FindPeakFastPV.h +#ifndef RecoVertex_PixelVertexFinding_FindPeakFastPV_h +#define RecoVertex_PixelVertexFinding_FindPeakFastPV_h +/** \class FindPeakFastPV FindPeakFastPV.h RecoVertex/PixelVertexFinding/FindPeakFastPV.h * Given *zProjections* and *zWeights* find the peak of width *m_zClusterWidth*. * Use only values with *zWeights*>*m_weightCut*. * Look near *oldVertex* within *m_zClusterSearchArea*. diff --git a/RecoTracker/PixelVertexFinding/interface/PVCluster.h b/RecoVertex/PixelVertexFinding/interface/PVCluster.h similarity index 63% rename from RecoTracker/PixelVertexFinding/interface/PVCluster.h rename to RecoVertex/PixelVertexFinding/interface/PVCluster.h index ac5c6aeb353d4..b7ea30e0028b4 100644 --- a/RecoTracker/PixelVertexFinding/interface/PVCluster.h +++ b/RecoVertex/PixelVertexFinding/interface/PVCluster.h @@ -1,10 +1,10 @@ -#ifndef RecoTracker_PixelVertexFinding_PVCluster_h -#define RecoTracker_PixelVertexFinding_PVCluster_h -/** \class PVCluster PVCluster.h RecoTracker/PixelVertexFinding/PVCluster.h +#ifndef RecoVertex_PixelVertexFinding_PVCluster_h +#define RecoVertex_PixelVertexFinding_PVCluster_h +/** \class PVCluster PVCluster.h RecoVertex/PixelVertexFinding/PVCluster.h * A simple collection of tracks that represents a physical clustering * of charged particles, ie a vertex, in one dimension. This * (typedef) class is used by the Pixel standalone vertex finding - * classes found in RecoTracker/PixelVertexFinding. + * classes found in RecoVertex/PixelVertexFinding. * * \author Aaron Dominguez (UNL) */ diff --git a/RecoTracker/PixelVertexFinding/interface/PVClusterComparer.h b/RecoVertex/PixelVertexFinding/interface/PVClusterComparer.h similarity index 84% rename from RecoTracker/PixelVertexFinding/interface/PVClusterComparer.h rename to RecoVertex/PixelVertexFinding/interface/PVClusterComparer.h index aa9ce72e07792..5c173cef5bfa8 100644 --- a/RecoTracker/PixelVertexFinding/interface/PVClusterComparer.h +++ b/RecoVertex/PixelVertexFinding/interface/PVClusterComparer.h @@ -1,7 +1,7 @@ -#ifndef RecoTracker_PixelVertexFinding_PVClusterComparer_h -#define RecoTracker_PixelVertexFinding_PVClusterComparer_h +#ifndef RecoVertex_PixelVertexFinding_PVClusterComparer_h +#define RecoVertex_PixelVertexFinding_PVClusterComparer_h /** \class PVClusterComparer PVClusterComparer.h - * RecoTracker/PixelVertexFinding/PVClusterComparer.h + * RecoVertex/PixelVertexFinding/PVClusterComparer.h * This helper class is used to sort the collection of vertexes by * sumPt. It is used in DivisiveVertexFinder. The sum of the squares * of the pT is only done for tracks with pT>2.5 GeV. If the pT>10 @@ -10,7 +10,7 @@ * * \author Aaron Dominguez (UNL) */ -#include "RecoTracker/PixelVertexFinding/interface/PVCluster.h" +#include "RecoVertex/PixelVertexFinding/interface/PVCluster.h" #include "DataFormats/VertexReco/interface/Vertex.h" class PVClusterComparer { diff --git a/RecoTracker/PixelVertexFinding/interface/PVPositionBuilder.h b/RecoVertex/PixelVertexFinding/interface/PVPositionBuilder.h similarity index 82% rename from RecoTracker/PixelVertexFinding/interface/PVPositionBuilder.h rename to RecoVertex/PixelVertexFinding/interface/PVPositionBuilder.h index 6ab979ab1038c..accd86d14366b 100644 --- a/RecoTracker/PixelVertexFinding/interface/PVPositionBuilder.h +++ b/RecoVertex/PixelVertexFinding/interface/PVPositionBuilder.h @@ -1,6 +1,6 @@ -#ifndef RecoTracker_PixelVertexFinding_PVPositionBuilder_h -#define RecoTracker_PixelVertexFinding_PVPositionBuilder_h -/** \class PVPositionBuilder PVPositionBuilder.h RecoTracker/PixelVertexFinding/PVPositionBuilder.h +#ifndef RecoVertex_PixelVertexFinding_PVPositionBuilder_h +#define RecoVertex_PixelVertexFinding_PVPositionBuilder_h +/** \class PVPositionBuilder PVPositionBuilder.h RecoVertex/PixelVertexFinding/PVPositionBuilder.h * This helper class calculates the average Z position of a collection of * tracks. You have the option of calculating the straight average, * or making a weighted average using the error of the Z of the tracks. This diff --git a/RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h b/RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h similarity index 85% rename from RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h rename to RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h index 0948d88ef3acf..d4462d0957ed0 100644 --- a/RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h +++ b/RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_interface_PixelVertexWorkSpaceLayout_h -#define RecoTracker_PixelVertexFinding_interface_PixelVertexWorkSpaceLayout_h +#ifndef RecoVertex_PixelVertexFinding_interface_PixelVertexWorkSpaceLayout_h +#define RecoVertex_PixelVertexFinding_interface_PixelVertexWorkSpaceLayout_h #include @@ -30,4 +30,4 @@ namespace vertexFinder { } // namespace vertexFinder -#endif // RecoTracker_PixelVertexFinding_interface_PixelVertexWorkSpaceLayout_h +#endif // RecoVertex_PixelVertexFinding_interface_PixelVertexWorkSpaceLayout_h diff --git a/RecoTracker/PixelVertexFinding/plugins/BuildFile.xml b/RecoVertex/PixelVertexFinding/plugins/BuildFile.xml similarity index 97% rename from RecoTracker/PixelVertexFinding/plugins/BuildFile.xml rename to RecoVertex/PixelVertexFinding/plugins/BuildFile.xml index 2df520dffcf5b..b7674b3e91c12 100644 --- a/RecoTracker/PixelVertexFinding/plugins/BuildFile.xml +++ b/RecoVertex/PixelVertexFinding/plugins/BuildFile.xml @@ -17,7 +17,7 @@ - + diff --git a/RecoTracker/PixelVertexFinding/plugins/FastPrimaryVertexProducer.cc b/RecoVertex/PixelVertexFinding/plugins/FastPrimaryVertexProducer.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/FastPrimaryVertexProducer.cc rename to RecoVertex/PixelVertexFinding/plugins/FastPrimaryVertexProducer.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/FastPrimaryVertexWithWeightsProducer.cc b/RecoVertex/PixelVertexFinding/plugins/FastPrimaryVertexWithWeightsProducer.cc similarity index 99% rename from RecoTracker/PixelVertexFinding/plugins/FastPrimaryVertexWithWeightsProducer.cc rename to RecoVertex/PixelVertexFinding/plugins/FastPrimaryVertexWithWeightsProducer.cc index 8117c55d01e0d..36143ad940680 100644 --- a/RecoTracker/PixelVertexFinding/plugins/FastPrimaryVertexWithWeightsProducer.cc +++ b/RecoVertex/PixelVertexFinding/plugins/FastPrimaryVertexWithWeightsProducer.cc @@ -47,7 +47,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "RecoLocalTracker/Records/interface/TkPixelCPERecord.h" -#include "RecoTracker/PixelVertexFinding/interface/FindPeakFastPV.h" +#include "RecoVertex/PixelVertexFinding/interface/FindPeakFastPV.h" #include "FWCore/Utilities/interface/InputTag.h" diff --git a/RecoTracker/PixelVertexFinding/plugins/JetVertexChecker.cc b/RecoVertex/PixelVertexFinding/plugins/JetVertexChecker.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/JetVertexChecker.cc rename to RecoVertex/PixelVertexFinding/plugins/JetVertexChecker.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexCollectionTrimmer.cc b/RecoVertex/PixelVertexFinding/plugins/PixelVertexCollectionTrimmer.cc similarity index 96% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexCollectionTrimmer.cc rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexCollectionTrimmer.cc index f36d5c74bc324..6f9f9fc5009e4 100644 --- a/RecoTracker/PixelVertexFinding/plugins/PixelVertexCollectionTrimmer.cc +++ b/RecoVertex/PixelVertexFinding/plugins/PixelVertexCollectionTrimmer.cc @@ -14,7 +14,7 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/Exception.h" -#include "RecoTracker/PixelVertexFinding/interface/PVClusterComparer.h" +#include "RecoVertex/PixelVertexFinding/interface/PVClusterComparer.h" class PixelVertexCollectionTrimmer : public edm::stream::EDProducer<> { public: @@ -102,7 +102,7 @@ void PixelVertexCollectionTrimmer::fillDescriptions(edm::ConfigurationDescriptio PVcomparerPSet.add("track_chi2_max", 99999.)->setComment("max track chi2"); PVcomparerPSet.add("track_prob_min", -1.)->setComment("min track prob"); desc.add("PVcomparer", PVcomparerPSet) - ->setComment("from RecoTracker/PixelVertexFinding/python/PVClusterComparer_cfi.py"); + ->setComment("from RecoVertex/PixelVertexFinding/python/PVClusterComparer_cfi.py"); descriptions.add("hltPixelVertexCollectionTrimmer", desc); } diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexProducer.cc b/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducer.cc similarity index 99% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexProducer.cc rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexProducer.cc index 5cc3eb7bd7759..6735519b118ea 100644 --- a/RecoTracker/PixelVertexFinding/plugins/PixelVertexProducer.cc +++ b/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducer.cc @@ -33,7 +33,7 @@ #include "DataFormats/VertexReco/interface/Vertex.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h" -#include "RecoTracker/PixelVertexFinding/interface/DivisiveVertexFinder.h" +#include "RecoVertex/PixelVertexFinding/interface/DivisiveVertexFinder.h" #include #include #include diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc b/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexProducerCUDA.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc b/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexProducerFromSoA.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexProducerFromSoAAlpaka.cc b/RecoVertex/PixelVertexFinding/plugins/PixelVertexProducerFromSoAAlpaka.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexProducerFromSoAAlpaka.cc rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexProducerFromSoAAlpaka.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc b/RecoVertex/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexSoAFromCUDA.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h similarity index 75% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h index 48848ff959554..e7eadd9c61dda 100644 --- a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h +++ b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h @@ -1,9 +1,9 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoADevice_h -#define RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoADevice_h +#ifndef RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoADevice_h +#define RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoADevice_h #include "CUDADataFormats/Common/interface/PortableDeviceCollection.h" #include "CUDADataFormats/Vertex/interface/ZVertexUtilities.h" -#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h" +#include "RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h" template class PixelVertexWorkSpaceSoADevice : public cms::cuda::PortableDeviceCollection> { diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h similarity index 76% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h index 9df8cc4580a1f..9a4dc49b87f23 100644 --- a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h +++ b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h @@ -1,9 +1,9 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHost_h -#define RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHost_h +#ifndef RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHost_h +#define RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHost_h #include "CUDADataFormats/Common/interface/PortableHostCollection.h" #include "CUDADataFormats/Vertex/interface/ZVertexUtilities.h" -#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h" +#include "RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h" template class PixelVertexWorkSpaceSoAHost : public cms::cuda::PortableHostCollection> { diff --git a/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h new file mode 100644 index 0000000000000..8f83f786eec20 --- /dev/null +++ b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h @@ -0,0 +1,15 @@ +#ifndef RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHostAlpaka_h +#define RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHostAlpaka_h + +#include + +#include "DataFormats/Portable/interface/PortableHostCollection.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" + +namespace vertexFinder { + + using PixelVertexWorkSpaceSoAHost = PortableHostCollection>; + +} // namespace vertexFinder + +#endif // RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceSoAHostAlpaka_h diff --git a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h similarity index 91% rename from RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h rename to RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h index 42c7582b1cdb2..cc0828f153330 100644 --- a/RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h +++ b/RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceUtilities_h -#define RecoTracker_PixelVertexFinding_plugins_PixelVertexWorkSpaceUtilities_h +#ifndef RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceUtilities_h +#define RecoVertex_PixelVertexFinding_plugins_PixelVertexWorkSpaceUtilities_h #include #include "DataFormats/SoATemplate/interface/SoALayout.h" diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexProducerAlpaka.cc b/RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexProducerAlpaka.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexProducerAlpaka.cc rename to RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexProducerAlpaka.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h similarity index 56% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h index d0ec816b32aee..f21a51e819d1e 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h @@ -1,13 +1,13 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_alpaka_PixelVertexWorkSpaceSoADeviceAlpaka_h -#define RecoTracker_PixelVertexFinding_plugins_alpaka_PixelVertexWorkSpaceSoADeviceAlpaka_h +#ifndef RecoVertex_PixelVertexFinding_plugins_alpaka_PixelVertexWorkSpaceSoADeviceAlpaka_h +#define RecoVertex_PixelVertexFinding_plugins_alpaka_PixelVertexWorkSpaceSoADeviceAlpaka_h #include #include "DataFormats/Portable/interface/alpaka/PortableCollection.h" #include "DataFormats/VertexSoA/interface/ZVertexDefinitions.h" #include "HeterogeneousCore/AlpakaInterface/interface/config.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" -#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h" namespace ALPAKA_ACCELERATOR_NAMESPACE { @@ -20,4 +20,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { } // namespace ALPAKA_ACCELERATOR_NAMESPACE -#endif // RecoTracker_PixelVertexFinding_plugins_alpaka_PixelVertexWorkSpaceSoADeviceAlpaka_h +#endif // RecoVertex_PixelVertexFinding_plugins_alpaka_PixelVertexWorkSpaceSoADeviceAlpaka_h diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h similarity index 96% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h index 122457a7d05d2..3574cfd350bc9 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_alpaka_clusterTracksByDensity_h -#define RecoTracker_PixelVertexFinding_plugins_alpaka_clusterTracksByDensity_h +#ifndef RecoVertex_PixelVertexFinding_plugins_alpaka_clusterTracksByDensity_h +#define RecoVertex_PixelVertexFinding_plugins_alpaka_clusterTracksByDensity_h #include #include @@ -11,7 +11,7 @@ #include "HeterogeneousCore/AlpakaInterface/interface/HistoContainer.h" #include "HeterogeneousCore/AlpakaInterface/interface/config.h" #include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" #include "vertexFinder.h" @@ -250,4 +250,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder { } // namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_alpaka_clusterTracksByDensity_h +#endif // RecoVertex_PixelVertexFinding_plugins_alpaka_clusterTracksByDensity_h diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h similarity index 96% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h index 7090599dcfdb0..d2cf3601650ae 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_alpaka_clusterTracksDBSCAN_h -#define RecoTracker_PixelVertexFinding_plugins_alpaka_clusterTracksDBSCAN_h +#ifndef RecoVertex_PixelVertexFinding_plugins_alpaka_clusterTracksDBSCAN_h +#define RecoVertex_PixelVertexFinding_plugins_alpaka_clusterTracksDBSCAN_h #include #include @@ -11,7 +11,7 @@ #include "HeterogeneousCore/AlpakaInterface/interface/HistoContainer.h" #include "HeterogeneousCore/AlpakaInterface/interface/config.h" #include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" #include "vertexFinder.h" @@ -258,4 +258,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder { } // namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_alpaka_clusterTracksDBSCAN_h +#endif // RecoVertex_PixelVertexFinding_plugins_alpaka_clusterTracksDBSCAN_h diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h similarity index 96% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h index 38e8429c0d28f..c779f5d4affe2 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_clusterTracksIterativeAlpaka_h -#define RecoTracker_PixelVertexFinding_clusterTracksIterativeAlpaka_h +#ifndef RecoVertex_PixelVertexFinding_clusterTracksIterativeAlpaka_h +#define RecoVertex_PixelVertexFinding_clusterTracksIterativeAlpaka_h #include #include @@ -11,7 +11,7 @@ #include "HeterogeneousCore/AlpakaInterface/interface/HistoContainer.h" #include "HeterogeneousCore/AlpakaInterface/interface/config.h" #include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" #include "vertexFinder.h" @@ -230,4 +230,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { }; } // namespace vertexFinder } // namespace ALPAKA_ACCELERATOR_NAMESPACE -#endif // RecoTracker_PixelVertexFinding_plugins_clusterTracksIterativeAlpaka_h +#endif // RecoVertex_PixelVertexFinding_plugins_clusterTracksIterativeAlpaka_h diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/fitVertices.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/fitVertices.h similarity index 95% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/fitVertices.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/fitVertices.h index 2f78723e61d9c..371eab61bb599 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/fitVertices.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/fitVertices.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_alpaka_fitVertices_h -#define RecoTracker_PixelVertexFinding_plugins_alpaka_fitVertices_h +#ifndef RecoVertex_PixelVertexFinding_plugins_alpaka_fitVertices_h +#define RecoVertex_PixelVertexFinding_plugins_alpaka_fitVertices_h #include #include @@ -135,4 +135,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder { } // namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_alpaka_fitVertices_h +#endif // RecoVertex_PixelVertexFinding_plugins_alpaka_fitVertices_h diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/sortByPt2.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/sortByPt2.h similarity index 90% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/sortByPt2.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/sortByPt2.h index ff8fab8ab635f..eae01e2061117 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/sortByPt2.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/sortByPt2.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_alpaka_sortByPt2_h -#define RecoTracker_PixelVertexFinding_plugins_alpaka_sortByPt2_h +#ifndef RecoVertex_PixelVertexFinding_plugins_alpaka_sortByPt2_h +#define RecoVertex_PixelVertexFinding_plugins_alpaka_sortByPt2_h #include #include @@ -13,7 +13,7 @@ #include "HeterogeneousCore/AlpakaInterface/interface/config.h" #include "HeterogeneousCore/AlpakaInterface/interface/radixSort.h" #include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" #include "vertexFinder.h" @@ -81,4 +81,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder { } // namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_alpaka_sortByPt2_h +#endif // RecoVertex_PixelVertexFinding_plugins_alpaka_sortByPt2_h diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/splitVertices.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/splitVertices.h similarity index 96% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/splitVertices.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/splitVertices.h index 924288eac84bf..a286b454b0716 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/splitVertices.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/splitVertices.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_alpaka_splitVertices_h -#define RecoTracker_PixelVertexFinding_plugins_alpaka_splitVertices_h +#ifndef RecoVertex_PixelVertexFinding_plugins_alpaka_splitVertices_h +#define RecoVertex_PixelVertexFinding_plugins_alpaka_splitVertices_h #include #include @@ -148,4 +148,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder { } // namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_alpaka_splitVertices_h +#endif // RecoVertex_PixelVertexFinding_plugins_alpaka_splitVertices_h diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.dev.cc b/RecoVertex/PixelVertexFinding/plugins/alpaka/vertexFinder.dev.cc similarity index 98% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.dev.cc rename to RecoVertex/PixelVertexFinding/plugins/alpaka/vertexFinder.dev.cc index 2b20e221e4eb7..2a0172262ad3a 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.dev.cc +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/vertexFinder.dev.cc @@ -3,8 +3,8 @@ #include "DataFormats/TrackSoA/interface/alpaka/TrackUtilities.h" #include "HeterogeneousCore/AlpakaInterface/interface/config.h" #include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h" #include "vertexFinder.h" #include "clusterTracksDBSCAN.h" diff --git a/RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.h b/RecoVertex/PixelVertexFinding/plugins/alpaka/vertexFinder.h similarity index 87% rename from RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.h rename to RecoVertex/PixelVertexFinding/plugins/alpaka/vertexFinder.h index 92890b89bb9c4..f01ec7e445c8a 100644 --- a/RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.h +++ b/RecoVertex/PixelVertexFinding/plugins/alpaka/vertexFinder.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_alpaka_vertexFinder_h -#define RecoTracker_PixelVertexFinding_plugins_alpaka_vertexFinder_h +#ifndef RecoVertex_PixelVertexFinding_plugins_alpaka_vertexFinder_h +#define RecoVertex_PixelVertexFinding_plugins_alpaka_vertexFinder_h #include #include @@ -12,8 +12,8 @@ #include "DataFormats/VertexSoA/interface/ZVertexSoA.h" #include "DataFormats/VertexSoA/interface/alpaka/ZVertexSoACollection.h" #include "HeterogeneousCore/AlpakaInterface/interface/config.h" -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h" namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder { @@ -74,4 +74,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder { } // namespace ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_alpaka_vertexFinder_h +#endif // RecoVertex_PixelVertexFinding_plugins_alpaka_vertexFinder_h diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h b/RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h similarity index 97% rename from RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h rename to RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h index 1bb80e0a17215..aaca1c5cc268f 100644 --- a/RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h +++ b/RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksByDensity_h -#define RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksByDensity_h +#ifndef RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksByDensity_h +#define RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksByDensity_h #include #include @@ -234,4 +234,4 @@ namespace gpuVertexFinder { } // namespace gpuVertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksByDensity_h +#endif // RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksByDensity_h diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h b/RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h similarity index 97% rename from RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h rename to RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h index 8dabe0bb3294a..d3fc38baf48b8 100644 --- a/RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h +++ b/RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksDBSCAN_h -#define RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksDBSCAN_h +#ifndef RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksDBSCAN_h +#define RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksDBSCAN_h #include #include @@ -240,4 +240,4 @@ namespace gpuVertexFinder { } // namespace gpuVertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksDBSCAN_h +#endif // RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksDBSCAN_h diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksIterative.h b/RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksIterative.h similarity index 96% rename from RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksIterative.h rename to RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksIterative.h index 0f06db4114120..9a8ef262db767 100644 --- a/RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksIterative.h +++ b/RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksIterative.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksIterative_h -#define RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksIterative_h +#ifndef RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksIterative_h +#define RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksIterative_h #include #include @@ -211,4 +211,4 @@ namespace gpuVertexFinder { } // namespace gpuVertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_gpuClusterTracksIterative_h +#endif // RecoVertex_PixelVertexFinding_plugins_gpuClusterTracksIterative_h diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuFitVertices.h b/RecoVertex/PixelVertexFinding/plugins/gpuFitVertices.h similarity index 93% rename from RecoTracker/PixelVertexFinding/plugins/gpuFitVertices.h rename to RecoVertex/PixelVertexFinding/plugins/gpuFitVertices.h index d181aaa772988..e2a5a82fd6802 100644 --- a/RecoTracker/PixelVertexFinding/plugins/gpuFitVertices.h +++ b/RecoVertex/PixelVertexFinding/plugins/gpuFitVertices.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_gpuFitVertices_h -#define RecoTracker_PixelVertexFinding_plugins_gpuFitVertices_h +#ifndef RecoVertex_PixelVertexFinding_plugins_gpuFitVertices_h +#define RecoVertex_PixelVertexFinding_plugins_gpuFitVertices_h #include #include @@ -107,4 +107,4 @@ namespace gpuVertexFinder { } // namespace gpuVertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_gpuFitVertices_h +#endif // RecoVertex_PixelVertexFinding_plugins_gpuFitVertices_h diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuSortByPt2.h b/RecoVertex/PixelVertexFinding/plugins/gpuSortByPt2.h similarity index 90% rename from RecoTracker/PixelVertexFinding/plugins/gpuSortByPt2.h rename to RecoVertex/PixelVertexFinding/plugins/gpuSortByPt2.h index dcae467739a4a..c5a0b5cfc1776 100644 --- a/RecoTracker/PixelVertexFinding/plugins/gpuSortByPt2.h +++ b/RecoVertex/PixelVertexFinding/plugins/gpuSortByPt2.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_gpuSortByPt2_h -#define RecoTracker_PixelVertexFinding_plugins_gpuSortByPt2_h +#ifndef RecoVertex_PixelVertexFinding_plugins_gpuSortByPt2_h +#define RecoVertex_PixelVertexFinding_plugins_gpuSortByPt2_h #include #include @@ -70,4 +70,4 @@ namespace gpuVertexFinder { } // namespace gpuVertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_gpuSortByPt2_h +#endif // RecoVertex_PixelVertexFinding_plugins_gpuSortByPt2_h diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuSplitVertices.h b/RecoVertex/PixelVertexFinding/plugins/gpuSplitVertices.h similarity index 95% rename from RecoTracker/PixelVertexFinding/plugins/gpuSplitVertices.h rename to RecoVertex/PixelVertexFinding/plugins/gpuSplitVertices.h index 3b3581c896435..6538bb216737b 100644 --- a/RecoTracker/PixelVertexFinding/plugins/gpuSplitVertices.h +++ b/RecoVertex/PixelVertexFinding/plugins/gpuSplitVertices.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_gpuSplitVertices_h -#define RecoTracker_PixelVertexFinding_plugins_gpuSplitVertices_h +#ifndef RecoVertex_PixelVertexFinding_plugins_gpuSplitVertices_h +#define RecoVertex_PixelVertexFinding_plugins_gpuSplitVertices_h #include #include @@ -138,4 +138,4 @@ namespace gpuVertexFinder { } // namespace gpuVertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_gpuSplitVertices_h +#endif // RecoVertex_PixelVertexFinding_plugins_gpuSplitVertices_h diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuVertexFinder.cc b/RecoVertex/PixelVertexFinding/plugins/gpuVertexFinder.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/gpuVertexFinder.cc rename to RecoVertex/PixelVertexFinding/plugins/gpuVertexFinder.cc diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuVertexFinder.cu b/RecoVertex/PixelVertexFinding/plugins/gpuVertexFinder.cu similarity index 100% rename from RecoTracker/PixelVertexFinding/plugins/gpuVertexFinder.cu rename to RecoVertex/PixelVertexFinding/plugins/gpuVertexFinder.cu diff --git a/RecoTracker/PixelVertexFinding/plugins/gpuVertexFinder.h b/RecoVertex/PixelVertexFinding/plugins/gpuVertexFinder.h similarity index 91% rename from RecoTracker/PixelVertexFinding/plugins/gpuVertexFinder.h rename to RecoVertex/PixelVertexFinding/plugins/gpuVertexFinder.h index 59ec304b67521..640f137bf76f4 100644 --- a/RecoTracker/PixelVertexFinding/plugins/gpuVertexFinder.h +++ b/RecoVertex/PixelVertexFinding/plugins/gpuVertexFinder.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_plugins_gpuVertexFinder_h -#define RecoTracker_PixelVertexFinding_plugins_gpuVertexFinder_h +#ifndef RecoVertex_PixelVertexFinding_plugins_gpuVertexFinder_h +#define RecoVertex_PixelVertexFinding_plugins_gpuVertexFinder_h #include #include @@ -67,4 +67,4 @@ namespace gpuVertexFinder { } // namespace gpuVertexFinder -#endif // RecoTracker_PixelVertexFinding_plugins_gpuVertexFinder_h +#endif // RecoVertex_PixelVertexFinding_plugins_gpuVertexFinder_h diff --git a/RecoTracker/PixelVertexFinding/python/PVClusterComparer_cfi.py b/RecoVertex/PixelVertexFinding/python/PVClusterComparer_cfi.py similarity index 100% rename from RecoTracker/PixelVertexFinding/python/PVClusterComparer_cfi.py rename to RecoVertex/PixelVertexFinding/python/PVClusterComparer_cfi.py diff --git a/RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py b/RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py new file mode 100644 index 0000000000000..12e4f90bc0b9b --- /dev/null +++ b/RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +from RecoVertex.PixelVertexFinding.PixelVertexes_cfi import * diff --git a/RecoTracker/PixelVertexFinding/python/PixelVertexes_cfi.py b/RecoVertex/PixelVertexFinding/python/PixelVertexes_cfi.py similarity index 89% rename from RecoTracker/PixelVertexFinding/python/PixelVertexes_cfi.py rename to RecoVertex/PixelVertexFinding/python/PixelVertexes_cfi.py index 0735fa41109e9..2c83cb92f3775 100644 --- a/RecoTracker/PixelVertexFinding/python/PixelVertexes_cfi.py +++ b/RecoVertex/PixelVertexFinding/python/PixelVertexes_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms -from RecoTracker.PixelVertexFinding.PVClusterComparer_cfi import * +from RecoVertex.PixelVertexFinding.PVClusterComparer_cfi import * pixelVertices = cms.EDProducer("PixelVertexProducer", WtAverage = cms.bool(True), diff --git a/RecoTracker/PixelVertexFinding/python/fastPrimaryVertexProducer_cfi.py b/RecoVertex/PixelVertexFinding/python/fastPrimaryVertexProducer_cfi.py similarity index 100% rename from RecoTracker/PixelVertexFinding/python/fastPrimaryVertexProducer_cfi.py rename to RecoVertex/PixelVertexFinding/python/fastPrimaryVertexProducer_cfi.py diff --git a/RecoTracker/PixelVertexFinding/src/DivisiveVertexFinder.cc b/RecoVertex/PixelVertexFinding/src/DivisiveVertexFinder.cc similarity index 95% rename from RecoTracker/PixelVertexFinding/src/DivisiveVertexFinder.cc rename to RecoVertex/PixelVertexFinding/src/DivisiveVertexFinder.cc index 2f4ac048593f5..fa4231353fca6 100644 --- a/RecoTracker/PixelVertexFinding/src/DivisiveVertexFinder.cc +++ b/RecoVertex/PixelVertexFinding/src/DivisiveVertexFinder.cc @@ -1,6 +1,6 @@ -#include "RecoTracker/PixelVertexFinding/interface/DivisiveVertexFinder.h" -#include "RecoTracker/PixelVertexFinding/interface/PVPositionBuilder.h" -#include "RecoTracker/PixelVertexFinding/interface/PVCluster.h" +#include "RecoVertex/PixelVertexFinding/interface/DivisiveVertexFinder.h" +#include "RecoVertex/PixelVertexFinding/interface/PVPositionBuilder.h" +#include "RecoVertex/PixelVertexFinding/interface/PVCluster.h" #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Utilities/interface/isFinite.h" diff --git a/RecoTracker/PixelVertexFinding/src/PVClusterComparer.cc b/RecoVertex/PixelVertexFinding/src/PVClusterComparer.cc similarity index 98% rename from RecoTracker/PixelVertexFinding/src/PVClusterComparer.cc rename to RecoVertex/PixelVertexFinding/src/PVClusterComparer.cc index f16727d810ffa..2c8c4997a950b 100644 --- a/RecoTracker/PixelVertexFinding/src/PVClusterComparer.cc +++ b/RecoVertex/PixelVertexFinding/src/PVClusterComparer.cc @@ -1,4 +1,4 @@ -#include "RecoTracker/PixelVertexFinding/interface/PVClusterComparer.h" +#include "RecoVertex/PixelVertexFinding/interface/PVClusterComparer.h" #include "DataFormats/TrackReco/interface/Track.h" #include "DataFormats/TrackReco/interface/TrackFwd.h" diff --git a/RecoTracker/PixelVertexFinding/src/PVPositionBuilder.cc b/RecoVertex/PixelVertexFinding/src/PVPositionBuilder.cc similarity index 95% rename from RecoTracker/PixelVertexFinding/src/PVPositionBuilder.cc rename to RecoVertex/PixelVertexFinding/src/PVPositionBuilder.cc index 38507a0942ff0..17f6cb597c6b8 100644 --- a/RecoTracker/PixelVertexFinding/src/PVPositionBuilder.cc +++ b/RecoVertex/PixelVertexFinding/src/PVPositionBuilder.cc @@ -1,4 +1,4 @@ -#include "RecoTracker/PixelVertexFinding/interface/PVPositionBuilder.h" +#include "RecoVertex/PixelVertexFinding/interface/PVPositionBuilder.h" #include /// Constructor does nothing since this class has no data diff --git a/RecoTracker/PixelVertexFinding/test/BuildFile.xml b/RecoVertex/PixelVertexFinding/test/BuildFile.xml similarity index 100% rename from RecoTracker/PixelVertexFinding/test/BuildFile.xml rename to RecoVertex/PixelVertexFinding/test/BuildFile.xml diff --git a/RecoTracker/PixelVertexFinding/test/VertexFinder_t.h b/RecoVertex/PixelVertexFinding/test/VertexFinder_t.h similarity index 94% rename from RecoTracker/PixelVertexFinding/test/VertexFinder_t.h rename to RecoVertex/PixelVertexFinding/test/VertexFinder_t.h index 9d7494ae2036a..93534f82e06c8 100644 --- a/RecoTracker/PixelVertexFinding/test/VertexFinder_t.h +++ b/RecoVertex/PixelVertexFinding/test/VertexFinder_t.h @@ -15,22 +15,22 @@ #include "CUDADataFormats/Vertex/interface/ZVertexSoAHeterogeneousHost.h" #include "CUDADataFormats/Vertex/interface/ZVertexSoAHeterogeneousDevice.h" -#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h" -#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h" -#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h" +#include "RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceUtilities.h" +#include "RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHost.h" +#include "RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoADevice.h" #ifdef USE_DBSCAN -#include "RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h" +#include "RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksDBSCAN.h" #define CLUSTERIZE gpuVertexFinder::clusterTracksDBSCAN #elif USE_ITERATIVE -#include "RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksIterative.h" +#include "RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksIterative.h" #define CLUSTERIZE gpuVertexFinder::clusterTracksIterative #else -#include "RecoTracker/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h" +#include "RecoVertex/PixelVertexFinding/plugins/gpuClusterTracksByDensity.h" #define CLUSTERIZE gpuVertexFinder::clusterTracksByDensityKernel #endif -#include "RecoTracker/PixelVertexFinding/plugins/gpuFitVertices.h" -#include "RecoTracker/PixelVertexFinding/plugins/gpuSortByPt2.h" -#include "RecoTracker/PixelVertexFinding/plugins/gpuSplitVertices.h" +#include "RecoVertex/PixelVertexFinding/plugins/gpuFitVertices.h" +#include "RecoVertex/PixelVertexFinding/plugins/gpuSortByPt2.h" +#include "RecoVertex/PixelVertexFinding/plugins/gpuSplitVertices.h" #ifdef ONE_KERNEL #ifdef __CUDACC__ diff --git a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.cc b/RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.cc similarity index 100% rename from RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.cc rename to RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.cc diff --git a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc b/RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc similarity index 93% rename from RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc rename to RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc index bab64ea7a357a..6e5c50f0dfb36 100644 --- a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc +++ b/RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.dev.cc @@ -12,22 +12,22 @@ #include "HeterogeneousCore/AlpakaInterface/interface/memory.h" #include "HeterogeneousCore/AlpakaInterface/interface/workdivision.h" #ifdef USE_DBSCAN -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksDBSCAN.h" #define CLUSTERIZE ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder::ClusterTracksDBSCAN #elif USE_ITERATIVE -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksIterative.h" #define CLUSTERIZE ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder::ClusterTracksIterative #else -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/clusterTracksByDensity.h" #define CLUSTERIZE ALPAKA_ACCELERATOR_NAMESPACE::vertexFinder::ClusterTracksByDensityKernel #endif -#include "RecoTracker/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" -#include "RecoTracker/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h" -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h" -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/fitVertices.h" -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/sortByPt2.h" -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/splitVertices.h" -#include "RecoTracker/PixelVertexFinding/plugins/alpaka/vertexFinder.h" +#include "RecoVertex/PixelVertexFinding/interface/PixelVertexWorkSpaceLayout.h" +#include "RecoVertex/PixelVertexFinding/plugins/PixelVertexWorkSpaceSoAHostAlpaka.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/PixelVertexWorkSpaceSoADeviceAlpaka.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/fitVertices.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/sortByPt2.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/splitVertices.h" +#include "RecoVertex/PixelVertexFinding/plugins/alpaka/vertexFinder.h" #include "VertexFinder_t.h" diff --git a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.h b/RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.h similarity index 51% rename from RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.h rename to RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.h index 0ada94c781446..e3968da49982f 100644 --- a/RecoTracker/PixelVertexFinding/test/alpaka/VertexFinder_t.h +++ b/RecoVertex/PixelVertexFinding/test/alpaka/VertexFinder_t.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_PixelVertexFinding_test_alpaka_VertexFinder_t_h -#define RecoTracker_PixelVertexFinding_test_alpaka_VertexFinder_t_h +#ifndef RecoVertex_PixelVertexFinding_test_alpaka_VertexFinder_t_h +#define RecoVertex_PixelVertexFinding_test_alpaka_VertexFinder_t_h #include "HeterogeneousCore/AlpakaInterface/interface/config.h" @@ -11,4 +11,4 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { } // namespace ALPAKA_ACCELERATOR_NAMESPACE -#endif // RecoTracker_PixelVertexFinding_test_alpaka_VertexFinder_t_h +#endif // RecoVertex_PixelVertexFinding_test_alpaka_VertexFinder_t_h diff --git a/RecoTracker/PixelVertexFinding/test/cpuVertexFinder_t.cpp b/RecoVertex/PixelVertexFinding/test/cpuVertexFinder_t.cpp similarity index 100% rename from RecoTracker/PixelVertexFinding/test/cpuVertexFinder_t.cpp rename to RecoVertex/PixelVertexFinding/test/cpuVertexFinder_t.cpp diff --git a/RecoTracker/PixelVertexFinding/test/gpuVertexFinder_t.cu b/RecoVertex/PixelVertexFinding/test/gpuVertexFinder_t.cu similarity index 100% rename from RecoTracker/PixelVertexFinding/test/gpuVertexFinder_t.cu rename to RecoVertex/PixelVertexFinding/test/gpuVertexFinder_t.cu diff --git a/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py b/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py index 7ea7b7d990b40..73d8db4a4a8ac 100644 --- a/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py +++ b/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py @@ -36,7 +36,7 @@ process.load('RecoTracker.TkSeedGenerator.trackerClusterCheck_cfi') process.load('RecoTracker.MeasurementDet.MeasurementTrackerEventProducer_cfi') process.load("RecoTracker.TrackProducer.TrackRefitters_cff") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") +process.load("RecoVertex.Configuration.RecoPixelVertexing_cff") process.load('Validation.TrackerRecHits.test.StripClusterMCanalysis_cfi') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10) ) From 243a0405cbcd6c8a0da45119fd9785a118bb362d Mon Sep 17 00:00:00 2001 From: mmusich Date: Sat, 31 Aug 2024 10:12:21 +0200 Subject: [PATCH 2/2] rename PixelVertexes_cf* to PixelVertices_cf* and propagate --- RecoVertex/Configuration/python/RecoPixelVertexing_cff.py | 2 +- RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py | 3 --- RecoVertex/PixelVertexFinding/python/PixelVertices_cff.py | 3 +++ .../python/{PixelVertexes_cfi.py => PixelVertices_cfi.py} | 0 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py create mode 100644 RecoVertex/PixelVertexFinding/python/PixelVertices_cff.py rename RecoVertex/PixelVertexFinding/python/{PixelVertexes_cfi.py => PixelVertices_cfi.py} (100%) diff --git a/RecoVertex/Configuration/python/RecoPixelVertexing_cff.py b/RecoVertex/Configuration/python/RecoPixelVertexing_cff.py index 98da9a07c7dc1..eb953cc702502 100644 --- a/RecoVertex/Configuration/python/RecoPixelVertexing_cff.py +++ b/RecoVertex/Configuration/python/RecoPixelVertexing_cff.py @@ -3,7 +3,7 @@ from HeterogeneousCore.CUDACore.SwitchProducerCUDA import SwitchProducerCUDA from RecoTracker.PixelTrackFitting.PixelTracks_cff import * -from RecoVertex.PixelVertexFinding.PixelVertexes_cff import * +from RecoVertex.PixelVertexFinding.PixelVertices_cff import * # legacy pixel vertex reconsruction using the divisive vertex finder pixelVerticesTask = cms.Task( diff --git a/RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py b/RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py deleted file mode 100644 index 12e4f90bc0b9b..0000000000000 --- a/RecoVertex/PixelVertexFinding/python/PixelVertexes_cff.py +++ /dev/null @@ -1,3 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from RecoVertex.PixelVertexFinding.PixelVertexes_cfi import * diff --git a/RecoVertex/PixelVertexFinding/python/PixelVertices_cff.py b/RecoVertex/PixelVertexFinding/python/PixelVertices_cff.py new file mode 100644 index 0000000000000..7f66a685690ec --- /dev/null +++ b/RecoVertex/PixelVertexFinding/python/PixelVertices_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +from RecoVertex.PixelVertexFinding.PixelVertices_cfi import * diff --git a/RecoVertex/PixelVertexFinding/python/PixelVertexes_cfi.py b/RecoVertex/PixelVertexFinding/python/PixelVertices_cfi.py similarity index 100% rename from RecoVertex/PixelVertexFinding/python/PixelVertexes_cfi.py rename to RecoVertex/PixelVertexFinding/python/PixelVertices_cfi.py