diff --git a/RecoTracker/LST/interface/LSTOutput.h b/RecoTracker/LST/interface/LSTOutput.h index a337f107e35ba..5be4f645d3416 100644 --- a/RecoTracker/LST/interface/LSTOutput.h +++ b/RecoTracker/LST/interface/LSTOutput.h @@ -7,17 +7,14 @@ class LSTOutput { public: LSTOutput() = default; - LSTOutput(std::vector> const& hitIdx, - std::vector const& len, - std::vector const& seedIdx, - std::vector const& trackCandidateType) { - hitIdx_ = std::move(hitIdx); - len_ = std::move(len); - seedIdx_ = std::move(seedIdx); - trackCandidateType_ = std::move(trackCandidateType); - } - - ~LSTOutput() = default; + LSTOutput(std::vector> const hitIdx, + std::vector const len, + std::vector const seedIdx, + std::vector const trackCandidateType) + : hitIdx_(std::move(hitIdx)), + len_(std::move(len)), + seedIdx_(std::move(seedIdx)), + trackCandidateType_(std::move(trackCandidateType)) {} enum LSTTCType { T5 = 4, pT3 = 5, pT5 = 7, pLS = 8 }; diff --git a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h index 40b265db3edb7..00fd77846c4c3 100644 --- a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h +++ b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h @@ -9,19 +9,12 @@ class LSTPhase2OTHitsInput { public: LSTPhase2OTHitsInput() = default; - LSTPhase2OTHitsInput(std::vector const& detId, - std::vector const& x, - std::vector const& y, - std::vector const& z, - std::vector const& hits) { - detId_ = std::move(detId); - x_ = std::move(x); - y_ = std::move(y); - z_ = std::move(z); - hits_ = std::move(hits); - } - - ~LSTPhase2OTHitsInput() = default; + LSTPhase2OTHitsInput(std::vector const detId, + std::vector const x, + std::vector const y, + std::vector const z, + std::vector const hits) + : detId_(std::move(detId)), x_(std::move(x)), y_(std::move(y)), z_(std::move(z)), hits_(std::move(hits)) {} std::vector const& detId() const { return detId_; } std::vector const& x() const { return x_; } diff --git a/RecoTracker/LST/interface/LSTPixelSeedInput.h b/RecoTracker/LST/interface/LSTPixelSeedInput.h index 2fb6a244a5648..18d3768b2e0fc 100644 --- a/RecoTracker/LST/interface/LSTPixelSeedInput.h +++ b/RecoTracker/LST/interface/LSTPixelSeedInput.h @@ -7,39 +7,36 @@ class LSTPixelSeedInput { public: LSTPixelSeedInput() = default; - LSTPixelSeedInput(std::vector const& px, - std::vector const& py, - std::vector const& pz, - std::vector const& dxy, - std::vector const& dz, - std::vector const& ptErr, - std::vector const& etaErr, - std::vector const& stateTrajGlbX, - std::vector const& stateTrajGlbY, - std::vector const& stateTrajGlbZ, - std::vector const& stateTrajGlbPx, - std::vector const& stateTrajGlbPy, - std::vector const& stateTrajGlbPz, - std::vector const& q, - std::vector> const& hitIdx) { - px_ = std::move(px); - py_ = std::move(py); - pz_ = std::move(pz); - dxy_ = std::move(dxy); - dz_ = std::move(dz); - ptErr_ = std::move(ptErr); - etaErr_ = std::move(etaErr); - stateTrajGlbX_ = std::move(stateTrajGlbX); - stateTrajGlbY_ = std::move(stateTrajGlbY); - stateTrajGlbZ_ = std::move(stateTrajGlbZ); - stateTrajGlbPx_ = std::move(stateTrajGlbPx); - stateTrajGlbPy_ = std::move(stateTrajGlbPy); - stateTrajGlbPz_ = std::move(stateTrajGlbPz); - q_ = std::move(q); - hitIdx_ = std::move(hitIdx); - } - - ~LSTPixelSeedInput() = default; + LSTPixelSeedInput(std::vector const px, + std::vector const py, + std::vector const pz, + std::vector const dxy, + std::vector const dz, + std::vector const ptErr, + std::vector const etaErr, + std::vector const stateTrajGlbX, + std::vector const stateTrajGlbY, + std::vector const stateTrajGlbZ, + std::vector const stateTrajGlbPx, + std::vector const stateTrajGlbPy, + std::vector const stateTrajGlbPz, + std::vector const q, + std::vector> const hitIdx) + : px_(std::move(px)), + py_(std::move(py)), + pz_(std::move(pz)), + dxy_(std::move(dxy)), + dz_(std::move(dz)), + ptErr_(std::move(ptErr)), + etaErr_(std::move(etaErr)), + stateTrajGlbX_(std::move(stateTrajGlbX)), + stateTrajGlbY_(std::move(stateTrajGlbY)), + stateTrajGlbZ_(std::move(stateTrajGlbZ)), + stateTrajGlbPx_(std::move(stateTrajGlbPx)), + stateTrajGlbPy_(std::move(stateTrajGlbPy)), + stateTrajGlbPz_(std::move(stateTrajGlbPz)), + q_(std::move(q)), + hitIdx_(std::move(hitIdx)) {} std::vector const& px() const { return px_; } std::vector const& py() const { return py_; } diff --git a/RecoTracker/LSTCore/interface/EndcapGeometry.h b/RecoTracker/LSTCore/interface/EndcapGeometry.h index 555955d83941c..1a84d89abf90d 100644 --- a/RecoTracker/LSTCore/interface/EndcapGeometry.h +++ b/RecoTracker/LSTCore/interface/EndcapGeometry.h @@ -23,7 +23,6 @@ namespace lst { EndcapGeometry() = default; EndcapGeometry(std::string const& filename); - ~EndcapGeometry() = default; void load(std::string const&); void fillGeoMapArraysExplicit(); diff --git a/RecoTracker/LSTCore/interface/ModuleConnectionMap.h b/RecoTracker/LSTCore/interface/ModuleConnectionMap.h index b3a931345b3a5..1d4445d3b423e 100644 --- a/RecoTracker/LSTCore/interface/ModuleConnectionMap.h +++ b/RecoTracker/LSTCore/interface/ModuleConnectionMap.h @@ -16,7 +16,6 @@ namespace lst { public: ModuleConnectionMap(); ModuleConnectionMap(std::string const& filename); - ~ModuleConnectionMap(); void load(std::string const&); void add(std::string const&); diff --git a/RecoTracker/LSTCore/interface/TiltedGeometry.h b/RecoTracker/LSTCore/interface/TiltedGeometry.h index b70a1d95a357b..420000dd38aa0 100644 --- a/RecoTracker/LSTCore/interface/TiltedGeometry.h +++ b/RecoTracker/LSTCore/interface/TiltedGeometry.h @@ -18,7 +18,6 @@ namespace lst { public: TiltedGeometry() = default; TiltedGeometry(std::string const& filename); - ~TiltedGeometry() = default; void load(std::string const&); diff --git a/RecoTracker/LSTCore/src/ModuleConnectionMap.cc b/RecoTracker/LSTCore/src/ModuleConnectionMap.cc index fe0826bbd80e6..d1b68b7f485bb 100644 --- a/RecoTracker/LSTCore/src/ModuleConnectionMap.cc +++ b/RecoTracker/LSTCore/src/ModuleConnectionMap.cc @@ -4,8 +4,6 @@ lst::ModuleConnectionMap::ModuleConnectionMap() {} lst::ModuleConnectionMap::ModuleConnectionMap(std::string const& filename) { load(filename); } -lst::ModuleConnectionMap::~ModuleConnectionMap() {} - void lst::ModuleConnectionMap::load(std::string const& filename) { moduleConnections_.clear(); diff --git a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc index 97c4300456c8c..1526acd8e676d 100644 --- a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc +++ b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc @@ -196,7 +196,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::addHitToEvent(std::vector alpaka::exec(queue, hit_loop_workdiv, - ::lst::hitLoopKernel{}, + ::lst::HitLoopKernel{}, ::lst::Endcap, ::lst::TwoS, nModules_, @@ -213,7 +213,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::addHitToEvent(std::vector ::lst::createWorkDiv(blocksPerGrid2, threadsPerBlock2, ::lst::elementsPerThread); alpaka::exec( - queue, module_ranges_workdiv, ::lst::moduleRangesKernel{}, *modulesBuffers_.data(), *hitsInGPU, nLowerModules_); + queue, module_ranges_workdiv, ::lst::ModuleRangesKernel{}, *modulesBuffers_.data(), *hitsInGPU, nLowerModules_); } void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::addPixelSegmentToEvent(std::vector const& hitIndices0, @@ -262,7 +262,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::addPixelSegmentToEvent(std::vecto WorkDiv1D const createMDArrayRangesGPU_workDiv = ::lst::createWorkDiv({1}, {1024}, {1}); alpaka::exec( - queue, createMDArrayRangesGPU_workDiv, ::lst::createMDArrayRangesGPU{}, *modulesBuffers_.data(), *rangesInGPU); + queue, createMDArrayRangesGPU_workDiv, ::lst::CreateMDArrayRangesGPU{}, *modulesBuffers_.data(), *rangesInGPU); auto nTotalMDs_buf_h = cms::alpakatools::make_host_buffer(queue, (Idx)1u); alpaka::memcpy(queue, nTotalMDs_buf_h, rangesBuffers->device_nTotalMDs_buf); @@ -285,7 +285,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::addPixelSegmentToEvent(std::vecto alpaka::exec(queue, createSegmentArrayRanges_workDiv, - ::lst::createSegmentArrayRanges{}, + ::lst::CreateSegmentArrayRanges{}, *modulesBuffers_.data(), *rangesInGPU, *mdsInGPU); @@ -358,7 +358,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::addPixelSegmentToEvent(std::vecto alpaka::exec(queue, addPixelSegmentToEvent_workdiv, - ::lst::addPixelSegmentToEventKernel{}, + ::lst::AddPixelSegmentToEventKernel{}, *modulesBuffers_.data(), *rangesInGPU, *hitsInGPU, @@ -387,7 +387,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createMiniDoublets() { WorkDiv1D const createMDArrayRangesGPU_workDiv = ::lst::createWorkDiv({1}, {1024}, {1}); alpaka::exec( - queue, createMDArrayRangesGPU_workDiv, ::lst::createMDArrayRangesGPU{}, *modulesBuffers_.data(), *rangesInGPU); + queue, createMDArrayRangesGPU_workDiv, ::lst::CreateMDArrayRangesGPU{}, *modulesBuffers_.data(), *rangesInGPU); auto nTotalMDs_buf_h = cms::alpakatools::make_host_buffer(queue, (Idx)1u); alpaka::memcpy(queue, nTotalMDs_buf_h, rangesBuffers->device_nTotalMDs_buf); @@ -409,7 +409,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createMiniDoublets() { alpaka::exec(queue, createMiniDoubletsInGPUv2_workDiv, - ::lst::createMiniDoubletsInGPUv2{}, + ::lst::CreateMiniDoubletsInGPUv2{}, *modulesBuffers_.data(), *hitsInGPU, *mdsInGPU, @@ -419,7 +419,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createMiniDoublets() { alpaka::exec(queue, addMiniDoubletRangesToEventExplicit_workDiv, - ::lst::addMiniDoubletRangesToEventExplicit{}, + ::lst::AddMiniDoubletRangesToEventExplicit{}, *modulesBuffers_.data(), *mdsInGPU, *rangesInGPU, @@ -445,7 +445,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createSegmentsWithModuleMap() { alpaka::exec(queue, createSegmentsInGPUv2_workDiv, - ::lst::createSegmentsInGPUv2{}, + ::lst::CreateSegmentsInGPUv2{}, *modulesBuffers_.data(), *mdsInGPU, *segmentsInGPU, @@ -455,7 +455,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createSegmentsWithModuleMap() { alpaka::exec(queue, addSegmentRangesToEventExplicit_workDiv, - ::lst::addSegmentRangesToEventExplicit{}, + ::lst::AddSegmentRangesToEventExplicit{}, *modulesBuffers_.data(), *segmentsInGPU, *rangesInGPU); @@ -471,7 +471,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTriplets() { alpaka::exec(queue, createTripletArrayRanges_workDiv, - ::lst::createTripletArrayRanges{}, + ::lst::CreateTripletArrayRanges{}, *modulesBuffers_.data(), *rangesInGPU, *segmentsInGPU); @@ -531,7 +531,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTriplets() { alpaka::exec(queue, createTripletsInGPUv2_workDiv, - ::lst::createTripletsInGPUv2{}, + ::lst::CreateTripletsInGPUv2{}, *modulesBuffers_.data(), *mdsInGPU, *segmentsInGPU, @@ -544,7 +544,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTriplets() { alpaka::exec(queue, addTripletRangesToEventExplicit_workDiv, - ::lst::addTripletRangesToEventExplicit{}, + ::lst::AddTripletRangesToEventExplicit{}, *modulesBuffers_.data(), *tripletsInGPU, *rangesInGPU); @@ -569,7 +569,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls alpaka::exec(queue, crossCleanpT3_workDiv, - ::lst::crossCleanpT3{}, + ::lst::CrossCleanpT3{}, *modulesBuffers_.data(), *rangesInGPU, *pixelTripletsInGPU, @@ -580,7 +580,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls alpaka::exec(queue, addpT3asTrackCandidatesInGPU_workDiv, - ::lst::addpT3asTrackCandidatesInGPU{}, + ::lst::AddpT3asTrackCandidatesInGPU{}, nLowerModules_, *pixelTripletsInGPU, *trackCandidatesInGPU, @@ -600,7 +600,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls alpaka::exec(queue, removeDupQuintupletsInGPUBeforeTC_workDiv, - ::lst::removeDupQuintupletsInGPUBeforeTC{}, + ::lst::RemoveDupQuintupletsInGPUBeforeTC{}, *quintupletsInGPU, *rangesInGPU); @@ -611,7 +611,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls alpaka::exec(queue, crossCleanT5_workDiv, - ::lst::crossCleanT5{}, + ::lst::CrossCleanT5{}, *modulesBuffers_.data(), *quintupletsInGPU, *pixelQuintupletsInGPU, @@ -625,7 +625,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls alpaka::exec(queue, addT5asTrackCandidateInGPU_workDiv, - ::lst::addT5asTrackCandidateInGPU{}, + ::lst::AddT5asTrackCandidateInGPU{}, nLowerModules_, *quintupletsInGPU, *trackCandidatesInGPU, @@ -638,7 +638,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls ::lst::createWorkDiv(blocksPerGridCheckHitspLS, threadsPerBlockCheckHitspLS, ::lst::elementsPerThread); alpaka::exec( - queue, checkHitspLS_workDiv, ::lst::checkHitspLS{}, *modulesBuffers_.data(), *segmentsInGPU, true); + queue, checkHitspLS_workDiv, ::lst::CheckHitspLS{}, *modulesBuffers_.data(), *segmentsInGPU, true); } Vec3D const threadsPerBlock_crossCleanpLS{1, 16, 32}; @@ -648,7 +648,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls alpaka::exec(queue, crossCleanpLS_workDiv, - ::lst::crossCleanpLS{}, + ::lst::CrossCleanpLS{}, *modulesBuffers_.data(), *rangesInGPU, *pixelTripletsInGPU, @@ -665,7 +665,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createTrackCandidates(bool no_pls alpaka::exec(queue, addpLSasTrackCandidateInGPU_workDiv, - ::lst::addpLSasTrackCandidateInGPU{}, + ::lst::AddpLSasTrackCandidateInGPU{}, nLowerModules_, *trackCandidatesInGPU, *segmentsInGPU, @@ -776,7 +776,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createPixelTriplets() { alpaka::exec(queue, createPixelTripletsInGPUFromMapv2_workDiv, - ::lst::createPixelTripletsInGPUFromMapv2{}, + ::lst::CreatePixelTripletsInGPUFromMapv2{}, *modulesBuffers_.data(), *rangesInGPU, *mdsInGPU, @@ -805,7 +805,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createPixelTriplets() { alpaka::exec(queue, removeDupPixelTripletsInGPUFromMap_workDiv, - ::lst::removeDupPixelTripletsInGPUFromMap{}, + ::lst::RemoveDupPixelTripletsInGPUFromMap{}, *pixelTripletsInGPU); } @@ -814,7 +814,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createQuintuplets() { alpaka::exec(queue, createEligibleModulesListForQuintupletsGPU_workDiv, - ::lst::createEligibleModulesListForQuintupletsGPU{}, + ::lst::CreateEligibleModulesListForQuintupletsGPU{}, *modulesBuffers_.data(), *tripletsInGPU, *rangesInGPU); @@ -844,7 +844,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createQuintuplets() { alpaka::exec(queue, createQuintupletsInGPUv2_workDiv, - ::lst::createQuintupletsInGPUv2{}, + ::lst::CreateQuintupletsInGPUv2{}, *modulesBuffers_.data(), *mdsInGPU, *segmentsInGPU, @@ -860,7 +860,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createQuintuplets() { alpaka::exec(queue, removeDupQuintupletsInGPUAfterBuild_workDiv, - ::lst::removeDupQuintupletsInGPUAfterBuild{}, + ::lst::RemoveDupQuintupletsInGPUAfterBuild{}, *modulesBuffers_.data(), *quintupletsInGPU, *rangesInGPU); @@ -869,7 +869,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createQuintuplets() { alpaka::exec(queue, addQuintupletRangesToEventExplicit_workDiv, - ::lst::addQuintupletRangesToEventExplicit{}, + ::lst::AddQuintupletRangesToEventExplicit{}, *modulesBuffers_.data(), *quintupletsInGPU, *rangesInGPU); @@ -887,7 +887,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::pixelLineSegmentCleaning(bool no_ ::lst::createWorkDiv(blocksPerGridCheckHitspLS, threadsPerBlockCheckHitspLS, ::lst::elementsPerThread); alpaka::exec( - queue, checkHitspLS_workDiv, ::lst::checkHitspLS{}, *modulesBuffers_.data(), *segmentsInGPU, false); + queue, checkHitspLS_workDiv, ::lst::CheckHitspLS{}, *modulesBuffers_.data(), *segmentsInGPU, false); } } @@ -970,7 +970,7 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createPixelQuintuplets() { alpaka::exec(queue, createPixelQuintupletsInGPUFromMapv2_workDiv, - ::lst::createPixelQuintupletsInGPUFromMapv2{}, + ::lst::CreatePixelQuintupletsInGPUFromMapv2{}, *modulesBuffers_.data(), *mdsInGPU, *segmentsInGPU, @@ -989,14 +989,14 @@ void ALPAKA_ACCELERATOR_NAMESPACE::lst::Event::createPixelQuintuplets() { alpaka::exec(queue, removeDupPixelQuintupletsInGPUFromMap_workDiv, - ::lst::removeDupPixelQuintupletsInGPUFromMap{}, + ::lst::RemoveDupPixelQuintupletsInGPUFromMap{}, *pixelQuintupletsInGPU); WorkDiv1D const addpT5asTrackCandidateInGPU_workDiv = ::lst::createWorkDiv({1}, {256}, {1}); alpaka::exec(queue, addpT5asTrackCandidateInGPU_workDiv, - ::lst::addpT5asTrackCandidateInGPU{}, + ::lst::AddpT5asTrackCandidateInGPU{}, nLowerModules_, *pixelQuintupletsInGPU, *trackCandidatesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/Hit.h b/RecoTracker/LSTCore/src/alpaka/Hit.h index 3d43c94c62d40..cb95aa14538f3 100644 --- a/RecoTracker/LSTCore/src/alpaka/Hit.h +++ b/RecoTracker/LSTCore/src/alpaka/Hit.h @@ -176,7 +176,7 @@ namespace lst { return -1; } - struct moduleRangesKernel { + struct ModuleRangesKernel { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -199,7 +199,7 @@ namespace lst { } }; - struct hitLoopKernel { + struct HitLoopKernel { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t Endcap, // Integer corresponding to endcap in module subdets diff --git a/RecoTracker/LSTCore/src/alpaka/Kernels.h b/RecoTracker/LSTCore/src/alpaka/Kernels.h index 496a3f2ce0fb2..31f057017a766 100644 --- a/RecoTracker/LSTCore/src/alpaka/Kernels.h +++ b/RecoTracker/LSTCore/src/alpaka/Kernels.h @@ -142,7 +142,7 @@ namespace lst { matched[1] = nMatched; } - struct removeDupQuintupletsInGPUAfterBuild { + struct RemoveDupQuintupletsInGPUAfterBuild { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -192,7 +192,7 @@ namespace lst { } }; - struct removeDupQuintupletsInGPUBeforeTC { + struct RemoveDupQuintupletsInGPUBeforeTC { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Quintuplets quintupletsInGPU, @@ -267,7 +267,7 @@ namespace lst { } }; - struct removeDupPixelTripletsInGPUFromMap { + struct RemoveDupPixelTripletsInGPUFromMap { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::PixelTriplets pixelTripletsInGPU) const { auto const globalThreadIdx = alpaka::getIdx(acc); @@ -304,7 +304,7 @@ namespace lst { } }; - struct removeDupPixelQuintupletsInGPUFromMap { + struct RemoveDupPixelQuintupletsInGPUFromMap { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::PixelQuintuplets pixelQuintupletsInGPU) const { auto const globalThreadIdx = alpaka::getIdx(acc); @@ -331,7 +331,7 @@ namespace lst { } }; - struct checkHitspLS { + struct CheckHitspLS { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h index 47b46d1b749dc..469c79233f9e0 100644 --- a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h +++ b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h @@ -281,7 +281,7 @@ namespace lst { return false; } - ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize(struct lst::Modules const& modulesInGPU, uint16_t moduleIndex) { + ALPAKA_FN_ACC ALPAKA_FN_INLINE float moduleGapSize(lst::Modules const& modulesInGPU, uint16_t moduleIndex) { float miniDeltaTilted[3] = {0.26f, 0.26f, 0.26f}; float miniDeltaFlat[6] = {0.26f, 0.16f, 0.16f, 0.18f, 0.18f, 0.18f}; float miniDeltaLooseTilted[3] = {0.4f, 0.4f, 0.4f}; @@ -867,13 +867,13 @@ namespace lst { return alpaka::math::abs(acc, dPhiChange) < miniCut; } - struct createMiniDoubletsInGPUv2 { + struct CreateMiniDoubletsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, - struct lst::Modules modulesInGPU, - struct lst::Hits hitsInGPU, - struct lst::MiniDoublets mdsInGPU, - struct lst::ObjectRanges rangesInGPU) const { + lst::Modules modulesInGPU, + lst::Hits hitsInGPU, + lst::MiniDoublets mdsInGPU, + lst::ObjectRanges rangesInGPU) const { auto const globalThreadIdx = alpaka::getIdx(acc); auto const gridThreadExtent = alpaka::getWorkDiv(acc); @@ -964,11 +964,9 @@ namespace lst { } }; - struct createMDArrayRangesGPU { + struct CreateMDArrayRangesGPU { template - ALPAKA_FN_ACC void operator()(TAcc const& acc, - struct lst::Modules modulesInGPU, - struct lst::ObjectRanges rangesInGPU) const { + ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, lst::ObjectRanges rangesInGPU) const { // implementation is 1D with a single block static_assert(std::is_same_v, "Should be Acc1D"); ALPAKA_ASSERT_ACC((alpaka::getWorkDiv(acc)[0] == 1)); @@ -1060,13 +1058,13 @@ namespace lst { } }; - struct addMiniDoubletRangesToEventExplicit { + struct AddMiniDoubletRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, - struct lst::Modules modulesInGPU, - struct lst::MiniDoublets mdsInGPU, - struct lst::ObjectRanges rangesInGPU, - struct lst::Hits hitsInGPU) const { + lst::Modules modulesInGPU, + lst::MiniDoublets mdsInGPU, + lst::ObjectRanges rangesInGPU, + lst::Hits hitsInGPU) const { // implementation is 1D with a single block static_assert(std::is_same_v, "Should be Acc1D"); ALPAKA_ASSERT_ACC((alpaka::getWorkDiv(acc)[0] == 1)); diff --git a/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h b/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h index 06ba169c88bea..12161acc08de0 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelQuintuplet.h @@ -832,7 +832,7 @@ namespace lst { return RMSE; } - struct createPixelQuintupletsInGPUFromMapv2 { + struct CreatePixelQuintupletsInGPUFromMapv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h index 5cc5cf1d31a7a..0c78efcafc87f 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h @@ -925,7 +925,7 @@ namespace lst { return true; }; - struct createPixelTripletsInGPUFromMapv2 { + struct CreatePixelTripletsInGPUFromMapv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h index 09290d7ba025f..6b602a426a889 100644 --- a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h @@ -2185,10 +2185,10 @@ namespace lst { template ALPAKA_FN_ACC ALPAKA_FN_INLINE bool runQuintupletDefaultAlgo(TAcc const& acc, - struct lst::Modules& modulesInGPU, - struct lst::MiniDoublets& mdsInGPU, - struct lst::Segments& segmentsInGPU, - struct lst::Triplets& tripletsInGPU, + lst::Modules& modulesInGPU, + lst::MiniDoublets& mdsInGPU, + lst::Segments& segmentsInGPU, + lst::Triplets& tripletsInGPU, uint16_t lowerModuleIndex1, uint16_t lowerModuleIndex2, uint16_t lowerModuleIndex3, @@ -2534,7 +2534,7 @@ namespace lst { return true; } - struct createQuintupletsInGPUv2 { + struct CreateQuintupletsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -2663,7 +2663,7 @@ namespace lst { } }; - struct createEligibleModulesListForQuintupletsGPU { + struct CreateEligibleModulesListForQuintupletsGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -2767,7 +2767,7 @@ namespace lst { } }; - struct addQuintupletRangesToEventExplicit { + struct AddQuintupletRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/Segment.h b/RecoTracker/LSTCore/src/alpaka/Segment.h index 7f47ff5d9a87b..2c9634fd34373 100644 --- a/RecoTracker/LSTCore/src/alpaka/Segment.h +++ b/RecoTracker/LSTCore/src/alpaka/Segment.h @@ -701,7 +701,7 @@ namespace lst { } } - struct createSegmentsInGPUv2 { + struct CreateSegmentsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -795,7 +795,7 @@ namespace lst { } }; - struct createSegmentArrayRanges { + struct CreateSegmentArrayRanges { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -899,7 +899,7 @@ namespace lst { } }; - struct addSegmentRangesToEventExplicit { + struct AddSegmentRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -924,7 +924,7 @@ namespace lst { } }; - struct addPixelSegmentToEventKernel { + struct AddPixelSegmentToEventKernel { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, diff --git a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h index 99faae02c286e..2a35542afc5fc 100644 --- a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h +++ b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h @@ -204,7 +204,7 @@ namespace lst { return npMatched; } - struct crossCleanpT3 { + struct CrossCleanpT3 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -245,7 +245,7 @@ namespace lst { } }; - struct crossCleanT5 { + struct CrossCleanT5 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -300,7 +300,7 @@ namespace lst { } }; - struct crossCleanpLS { + struct CrossCleanpLS { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -381,7 +381,7 @@ namespace lst { } }; - struct addpT3asTrackCandidatesInGPU { + struct AddpT3asTrackCandidatesInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, @@ -437,7 +437,7 @@ namespace lst { } }; - struct addT5asTrackCandidateInGPU { + struct AddT5asTrackCandidateInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, @@ -491,7 +491,7 @@ namespace lst { } }; - struct addpLSasTrackCandidateInGPU { + struct AddpLSasTrackCandidateInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, @@ -530,7 +530,7 @@ namespace lst { } }; - struct addpT5asTrackCandidateInGPU { + struct AddpT5asTrackCandidateInGPU { template ALPAKA_FN_ACC void operator()(TAcc const& acc, uint16_t nLowerModules, diff --git a/RecoTracker/LSTCore/src/alpaka/Triplet.h b/RecoTracker/LSTCore/src/alpaka/Triplet.h index b20cf2ebea660..1f909bdc02d77 100644 --- a/RecoTracker/LSTCore/src/alpaka/Triplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Triplet.h @@ -808,7 +808,7 @@ namespace lst { return true; } - struct createTripletsInGPUv2 { + struct CreateTripletsInGPUv2 { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -925,7 +925,7 @@ namespace lst { } }; - struct createTripletArrayRanges { + struct CreateTripletArrayRanges { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU, @@ -1028,7 +1028,7 @@ namespace lst { } }; - struct addTripletRangesToEventExplicit { + struct AddTripletRangesToEventExplicit { template ALPAKA_FN_ACC void operator()(TAcc const& acc, lst::Modules modulesInGPU,