From ccd29f4e497ce905a2b99a385d67c8146e561684 Mon Sep 17 00:00:00 2001 From: Andres Rios Tascon Date: Wed, 17 Jul 2024 11:17:35 -0700 Subject: [PATCH] Format and cleanup --- RecoTracker/LSTCore/interface/Constants.h | 9 +- .../LSTCore/interface/alpaka/Constants.h | 7 +- RecoTracker/LSTCore/src/LSTESData.cc | 4 +- RecoTracker/LSTCore/src/ModuleMethods.h | 4 +- RecoTracker/LSTCore/src/alpaka/Event.dev.cc | 357 +++++++++--------- RecoTracker/LSTCore/src/alpaka/Event.h | 4 +- RecoTracker/LSTCore/src/alpaka/Hit.h | 4 +- RecoTracker/LSTCore/src/alpaka/Kernels.h | 4 +- RecoTracker/LSTCore/src/alpaka/LST.dev.cc | 90 ++--- RecoTracker/LSTCore/src/alpaka/MiniDoublet.h | 4 +- .../LSTCore/src/alpaka/NeuralNetwork.h | 4 +- .../LSTCore/src/alpaka/NeuralNetworkWeights.h | 4 +- RecoTracker/LSTCore/src/alpaka/PixelTriplet.h | 8 +- RecoTracker/LSTCore/src/alpaka/Quintuplet.h | 4 +- RecoTracker/LSTCore/src/alpaka/Segment.h | 4 +- .../LSTCore/src/alpaka/TrackCandidate.h | 4 +- RecoTracker/LSTCore/src/alpaka/Triplet.h | 4 +- RecoTracker/LSTCore/standalone/bin/sdl.cc | 3 +- .../standalone/code/core/AccessHelper.cc | 32 +- .../standalone/code/core/AccessHelper.h | 27 +- .../LSTCore/standalone/code/core/trkCore.h | 4 +- .../standalone/code/core/write_sdl_ntuple.cc | 4 +- .../standalone/code/core/write_sdl_ntuple.h | 4 +- 23 files changed, 305 insertions(+), 288 deletions(-) diff --git a/RecoTracker/LSTCore/interface/Constants.h b/RecoTracker/LSTCore/interface/Constants.h index 3632297c3f9c2..8a26c3a2a6471 100644 --- a/RecoTracker/LSTCore/interface/Constants.h +++ b/RecoTracker/LSTCore/interface/Constants.h @@ -19,16 +19,19 @@ namespace SDL { TSize nElements, TQueue queue) { #ifdef CACHE_ALLOC - return cms::alpakatools::allocCachedBuf(devAccIn, queue, alpaka_common::Vec1D(static_cast(nElements))); + return cms::alpakatools::allocCachedBuf( + devAccIn, queue, alpaka_common::Vec1D(static_cast(nElements))); #else - return alpaka::allocBuf(devAccIn, alpaka_common::Vec1D(static_cast(nElements))); + return alpaka::allocBuf(devAccIn, + alpaka_common::Vec1D(static_cast(nElements))); #endif } // Second allocation wrapper function when queue is not given. Reduces code boilerplate. template ALPAKA_FN_HOST ALPAKA_FN_INLINE Buf, T> allocBufWrapper(TAcc const& devAccIn, TSize nElements) { - return alpaka::allocBuf(devAccIn, alpaka_common::Vec1D(static_cast(nElements))); + return alpaka::allocBuf(devAccIn, + alpaka_common::Vec1D(static_cast(nElements))); } // If a compile time flag does not define PT_CUT, default to 0.8 (GeV) diff --git a/RecoTracker/LSTCore/interface/alpaka/Constants.h b/RecoTracker/LSTCore/interface/alpaka/Constants.h index e5189914d4c4d..b0a5d0e556760 100644 --- a/RecoTracker/LSTCore/interface/alpaka/Constants.h +++ b/RecoTracker/LSTCore/interface/alpaka/Constants.h @@ -34,14 +34,15 @@ namespace SDL { // Wrapper function to reduce code boilerplate for defining grid/block sizes. ALPAKA_FN_HOST ALPAKA_FN_INLINE alpaka_common::Vec3D createVec(int x, int y, int z) { - return alpaka_common::Vec3D(static_cast(x), static_cast(y), static_cast(z)); + return alpaka_common::Vec3D( + static_cast(x), static_cast(y), static_cast(z)); } // Adjust grid and block sizes based on backend configuration template ALPAKA_FN_HOST ALPAKA_FN_INLINE alpaka_common::WorkDiv3D createWorkDiv(const Vec& blocksPerGrid, - const Vec& threadsPerBlock, - const Vec& elementsPerThreadArg) { + const Vec& threadsPerBlock, + const Vec& elementsPerThreadArg) { Vec adjustedBlocks = blocksPerGrid; Vec adjustedThreads = threadsPerBlock; diff --git a/RecoTracker/LSTCore/src/LSTESData.cc b/RecoTracker/LSTCore/src/LSTESData.cc index 1950b43259a64..cb64bf928a5bc 100644 --- a/RecoTracker/LSTCore/src/LSTESData.cc +++ b/RecoTracker/LSTCore/src/LSTESData.cc @@ -89,8 +89,8 @@ std::unique_ptr> SDL::loadAndFillESHost() auto moduleConnectionMap = std::make_shared(); ::loadMapsHost(*pLStoLayer, endcapGeometry, tiltedGeometry, moduleConnectionMap); - auto endcapGeometryBuffers = - std::make_shared>(cms::alpakatools::host(), endcapGeometry->nEndCapMap); + auto endcapGeometryBuffers = std::make_shared>( + cms::alpakatools::host(), endcapGeometry->nEndCapMap); alpaka::QueueCpuBlocking queue(cms::alpakatools::host()); alpaka::memcpy( queue, endcapGeometryBuffers->geoMapDetId_buf, endcapGeometry->geoMapDetId_buf, endcapGeometry->nEndCapMap); diff --git a/RecoTracker/LSTCore/src/ModuleMethods.h b/RecoTracker/LSTCore/src/ModuleMethods.h index fe333e7598a8e..5d91f1bd59b7a 100644 --- a/RecoTracker/LSTCore/src/ModuleMethods.h +++ b/RecoTracker/LSTCore/src/ModuleMethods.h @@ -1,5 +1,5 @@ -#ifndef ModuleMethods_cuh -#define ModuleMethods_cuh +#ifndef RecoTracker_LSTCore_src_ModuleMethods_h +#define RecoTracker_LSTCore_src_ModuleMethods_h #include #include diff --git a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc index 462b7ea85f54e..37fb4ca02fc0a 100644 --- a/RecoTracker/LSTCore/src/alpaka/Event.dev.cc +++ b/RecoTracker/LSTCore/src/alpaka/Event.dev.cc @@ -151,10 +151,10 @@ void SDL::Event::resetEvent() { } void SDL::Event::addHitToEvent(std::vector x, - std::vector y, - std::vector z, - std::vector detId, - std::vector idxInNtuple) { + std::vector y, + std::vector z, + std::vector detId, + std::vector idxInNtuple) { // Use the actual number of hits instead of a max. unsigned int nHits = x.size(); @@ -188,17 +188,18 @@ void SDL::Event::addHitToEvent(std::vector x, WorkDiv3D const hit_loop_workdiv = createWorkDiv(blocksPerGrid1, threadsPerBlock1, elementsPerThread); hitLoopKernel hit_loop_kernel; - auto const hit_loop_task(alpaka::createTaskKernel(hit_loop_workdiv, - hit_loop_kernel, - Endcap, - TwoS, - nModules_, - nEndCapMap_, - alpaka::getPtrNative(endcapGeometryBuffers_->geoMapDetId_buf), - alpaka::getPtrNative(endcapGeometryBuffers_->geoMapPhi_buf), - *modulesBuffers_->data(), - *hitsInGPU, - nHits)); + auto const hit_loop_task( + alpaka::createTaskKernel(hit_loop_workdiv, + hit_loop_kernel, + Endcap, + TwoS, + nModules_, + nEndCapMap_, + alpaka::getPtrNative(endcapGeometryBuffers_->geoMapDetId_buf), + alpaka::getPtrNative(endcapGeometryBuffers_->geoMapPhi_buf), + *modulesBuffers_->data(), + *hitsInGPU, + nHits)); alpaka::enqueue(queue, hit_loop_task); @@ -217,23 +218,23 @@ void SDL::Event::addHitToEvent(std::vector x, } void SDL::Event::addPixelSegmentToEvent(std::vector hitIndices0, - std::vector hitIndices1, - std::vector hitIndices2, - std::vector hitIndices3, - std::vector dPhiChange, - std::vector ptIn, - std::vector ptErr, - std::vector px, - std::vector py, - std::vector pz, - std::vector eta, - std::vector etaErr, - std::vector phi, - std::vector charge, - std::vector seedIdx, - std::vector superbin, - std::vector pixelType, - std::vector isQuad) { + std::vector hitIndices1, + std::vector hitIndices2, + std::vector hitIndices3, + std::vector dPhiChange, + std::vector ptIn, + std::vector ptErr, + std::vector px, + std::vector py, + std::vector pz, + std::vector eta, + std::vector etaErr, + std::vector phi, + std::vector charge, + std::vector seedIdx, + std::vector superbin, + std::vector pixelType, + std::vector isQuad) { unsigned int size = ptIn.size(); if (size > N_MAX_PIXEL_SEGMENTS_PER_MODULE) { @@ -298,10 +299,10 @@ void SDL::Event::addPixelSegmentToEvent(std::vector hitInd SDL::createSegmentArrayRanges createSegmentArrayRanges_kernel; auto const createSegmentArrayRangesTask(alpaka::createTaskKernel(createSegmentArrayRanges_workDiv, - createSegmentArrayRanges_kernel, - *modulesBuffers_->data(), - *rangesInGPU, - *mdsInGPU)); + createSegmentArrayRanges_kernel, + *modulesBuffers_->data(), + *rangesInGPU, + *mdsInGPU)); alpaka::enqueue(queue, createSegmentArrayRangesTask); alpaka::wait(queue); @@ -374,19 +375,19 @@ void SDL::Event::addPixelSegmentToEvent(std::vector hitInd addPixelSegmentToEventKernel addPixelSegmentToEvent_kernel; auto const addPixelSegmentToEvent_task(alpaka::createTaskKernel(addPixelSegmentToEvent_workdiv, - addPixelSegmentToEvent_kernel, - *modulesBuffers_->data(), - *rangesInGPU, - *hitsInGPU, - *mdsInGPU, - *segmentsInGPU, - alpaka::getPtrNative(hitIndices0_dev), - alpaka::getPtrNative(hitIndices1_dev), - alpaka::getPtrNative(hitIndices2_dev), - alpaka::getPtrNative(hitIndices3_dev), - alpaka::getPtrNative(dPhiChange_dev), - pixelModuleIndex, - size)); + addPixelSegmentToEvent_kernel, + *modulesBuffers_->data(), + *rangesInGPU, + *hitsInGPU, + *mdsInGPU, + *segmentsInGPU, + alpaka::getPtrNative(hitIndices0_dev), + alpaka::getPtrNative(hitIndices1_dev), + alpaka::getPtrNative(hitIndices2_dev), + alpaka::getPtrNative(hitIndices3_dev), + alpaka::getPtrNative(dPhiChange_dev), + pixelModuleIndex, + size)); alpaka::enqueue(queue, addPixelSegmentToEvent_task); alpaka::wait(queue); @@ -438,11 +439,11 @@ void SDL::Event::createMiniDoublets() { SDL::createMiniDoubletsInGPUv2 createMiniDoubletsInGPUv2_kernel; auto const createMiniDoubletsInGPUv2Task(alpaka::createTaskKernel(createMiniDoubletsInGPUv2_workDiv, - createMiniDoubletsInGPUv2_kernel, - *modulesBuffers_->data(), - *hitsInGPU, - *mdsInGPU, - *rangesInGPU)); + createMiniDoubletsInGPUv2_kernel, + *modulesBuffers_->data(), + *hitsInGPU, + *mdsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, createMiniDoubletsInGPUv2Task); @@ -454,11 +455,11 @@ void SDL::Event::createMiniDoublets() { SDL::addMiniDoubletRangesToEventExplicit addMiniDoubletRangesToEventExplicit_kernel; auto const addMiniDoubletRangesToEventExplicitTask( alpaka::createTaskKernel(addMiniDoubletRangesToEventExplicit_workDiv, - addMiniDoubletRangesToEventExplicit_kernel, - *modulesBuffers_->data(), - *mdsInGPU, - *rangesInGPU, - *hitsInGPU)); + addMiniDoubletRangesToEventExplicit_kernel, + *modulesBuffers_->data(), + *mdsInGPU, + *rangesInGPU, + *hitsInGPU)); alpaka::enqueue(queue, addMiniDoubletRangesToEventExplicitTask); alpaka::wait(queue); @@ -483,11 +484,11 @@ void SDL::Event::createSegmentsWithModuleMap() { SDL::createSegmentsInGPUv2 createSegmentsInGPUv2_kernel; auto const createSegmentsInGPUv2Task(alpaka::createTaskKernel(createSegmentsInGPUv2_workDiv, - createSegmentsInGPUv2_kernel, - *modulesBuffers_->data(), - *mdsInGPU, - *segmentsInGPU, - *rangesInGPU)); + createSegmentsInGPUv2_kernel, + *modulesBuffers_->data(), + *mdsInGPU, + *segmentsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, createSegmentsInGPUv2Task); @@ -497,11 +498,12 @@ void SDL::Event::createSegmentsWithModuleMap() { createWorkDiv(blocksPerGridAddSeg, threadsPerBlockAddSeg, elementsPerThread); SDL::addSegmentRangesToEventExplicit addSegmentRangesToEventExplicit_kernel; - auto const addSegmentRangesToEventExplicitTask(alpaka::createTaskKernel(addSegmentRangesToEventExplicit_workDiv, - addSegmentRangesToEventExplicit_kernel, - *modulesBuffers_->data(), - *segmentsInGPU, - *rangesInGPU)); + auto const addSegmentRangesToEventExplicitTask( + alpaka::createTaskKernel(addSegmentRangesToEventExplicit_workDiv, + addSegmentRangesToEventExplicit_kernel, + *modulesBuffers_->data(), + *segmentsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, addSegmentRangesToEventExplicitTask); alpaka::wait(queue); @@ -520,10 +522,10 @@ void SDL::Event::createTriplets() { SDL::createTripletArrayRanges createTripletArrayRanges_kernel; auto const createTripletArrayRangesTask(alpaka::createTaskKernel(createTripletArrayRanges_workDiv, - createTripletArrayRanges_kernel, - *modulesBuffers_->data(), - *rangesInGPU, - *segmentsInGPU)); + createTripletArrayRanges_kernel, + *modulesBuffers_->data(), + *rangesInGPU, + *segmentsInGPU)); alpaka::enqueue(queue, createTripletArrayRangesTask); alpaka::wait(queue); @@ -588,14 +590,14 @@ void SDL::Event::createTriplets() { SDL::createTripletsInGPUv2 createTripletsInGPUv2_kernel; auto const createTripletsInGPUv2Task(alpaka::createTaskKernel(createTripletsInGPUv2_workDiv, - createTripletsInGPUv2_kernel, - *modulesBuffers_->data(), - *mdsInGPU, - *segmentsInGPU, - *tripletsInGPU, - *rangesInGPU, - alpaka::getPtrNative(index_gpu_buf), - nonZeroModules)); + createTripletsInGPUv2_kernel, + *modulesBuffers_->data(), + *mdsInGPU, + *segmentsInGPU, + *tripletsInGPU, + *rangesInGPU, + alpaka::getPtrNative(index_gpu_buf), + nonZeroModules)); alpaka::enqueue(queue, createTripletsInGPUv2Task); @@ -605,11 +607,12 @@ void SDL::Event::createTriplets() { createWorkDiv(blocksPerGridAddTrip, threadsPerBlockAddTrip, elementsPerThread); SDL::addTripletRangesToEventExplicit addTripletRangesToEventExplicit_kernel; - auto const addTripletRangesToEventExplicitTask(alpaka::createTaskKernel(addTripletRangesToEventExplicit_workDiv, - addTripletRangesToEventExplicit_kernel, - *modulesBuffers_->data(), - *tripletsInGPU, - *rangesInGPU)); + auto const addTripletRangesToEventExplicitTask( + alpaka::createTaskKernel(addTripletRangesToEventExplicit_workDiv, + addTripletRangesToEventExplicit_kernel, + *modulesBuffers_->data(), + *tripletsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, addTripletRangesToEventExplicitTask); alpaka::wait(queue); @@ -640,12 +643,12 @@ void SDL::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls SDL::crossCleanpT3 crossCleanpT3_kernel; auto const crossCleanpT3Task(alpaka::createTaskKernel(crossCleanpT3_workDiv, - crossCleanpT3_kernel, - *modulesBuffers_->data(), - *rangesInGPU, - *pixelTripletsInGPU, - *segmentsInGPU, - *pixelQuintupletsInGPU)); + crossCleanpT3_kernel, + *modulesBuffers_->data(), + *rangesInGPU, + *pixelTripletsInGPU, + *segmentsInGPU, + *pixelQuintupletsInGPU)); alpaka::enqueue(queue, crossCleanpT3Task); @@ -656,12 +659,12 @@ void SDL::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls SDL::addpT3asTrackCandidatesInGPU addpT3asTrackCandidatesInGPU_kernel; auto const addpT3asTrackCandidatesInGPUTask(alpaka::createTaskKernel(addpT3asTrackCandidatesInGPU_workDiv, - addpT3asTrackCandidatesInGPU_kernel, - nLowerModules_, - *pixelTripletsInGPU, - *trackCandidatesInGPU, - *segmentsInGPU, - *rangesInGPU)); + addpT3asTrackCandidatesInGPU_kernel, + nLowerModules_, + *pixelTripletsInGPU, + *trackCandidatesInGPU, + *segmentsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, addpT3asTrackCandidatesInGPUTask); @@ -674,9 +677,9 @@ void SDL::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls SDL::removeDupQuintupletsInGPUBeforeTC removeDupQuintupletsInGPUBeforeTC_kernel; auto const removeDupQuintupletsInGPUBeforeTCTask( alpaka::createTaskKernel(removeDupQuintupletsInGPUBeforeTC_workDiv, - removeDupQuintupletsInGPUBeforeTC_kernel, - *quintupletsInGPU, - *rangesInGPU)); + removeDupQuintupletsInGPUBeforeTC_kernel, + *quintupletsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, removeDupQuintupletsInGPUBeforeTCTask); @@ -687,12 +690,12 @@ void SDL::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls SDL::crossCleanT5 crossCleanT5_kernel; auto const crossCleanT5Task(alpaka::createTaskKernel(crossCleanT5_workDiv, - crossCleanT5_kernel, - *modulesBuffers_->data(), - *quintupletsInGPU, - *pixelQuintupletsInGPU, - *pixelTripletsInGPU, - *rangesInGPU)); + crossCleanT5_kernel, + *modulesBuffers_->data(), + *quintupletsInGPU, + *pixelQuintupletsInGPU, + *pixelTripletsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, crossCleanT5Task); @@ -703,11 +706,11 @@ void SDL::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls SDL::addT5asTrackCandidateInGPU addT5asTrackCandidateInGPU_kernel; auto const addT5asTrackCandidateInGPUTask(alpaka::createTaskKernel(addT5asTrackCandidateInGPU_workDiv, - addT5asTrackCandidateInGPU_kernel, - nLowerModules_, - *quintupletsInGPU, - *trackCandidatesInGPU, - *rangesInGPU)); + addT5asTrackCandidateInGPU_kernel, + nLowerModules_, + *quintupletsInGPU, + *trackCandidatesInGPU, + *rangesInGPU)); alpaka::enqueue(queue, addT5asTrackCandidateInGPUTask); @@ -731,15 +734,15 @@ void SDL::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls SDL::crossCleanpLS crossCleanpLS_kernel; auto const crossCleanpLSTask(alpaka::createTaskKernel(crossCleanpLS_workDiv, - crossCleanpLS_kernel, - *modulesBuffers_->data(), - *rangesInGPU, - *pixelTripletsInGPU, - *trackCandidatesInGPU, - *segmentsInGPU, - *mdsInGPU, - *hitsInGPU, - *quintupletsInGPU)); + crossCleanpLS_kernel, + *modulesBuffers_->data(), + *rangesInGPU, + *pixelTripletsInGPU, + *trackCandidatesInGPU, + *segmentsInGPU, + *mdsInGPU, + *hitsInGPU, + *quintupletsInGPU)); alpaka::enqueue(queue, crossCleanpLSTask); @@ -750,11 +753,11 @@ void SDL::Event::createTrackCandidates(bool no_pls_dupclean, bool tc_pls SDL::addpLSasTrackCandidateInGPU addpLSasTrackCandidateInGPU_kernel; auto const addpLSasTrackCandidateInGPUTask(alpaka::createTaskKernel(addpLSasTrackCandidateInGPU_workDiv, - addpLSasTrackCandidateInGPU_kernel, - nLowerModules_, - *trackCandidatesInGPU, - *segmentsInGPU, - tc_pls_triplets)); + addpLSasTrackCandidateInGPU_kernel, + nLowerModules_, + *trackCandidatesInGPU, + *segmentsInGPU, + tc_pls_triplets)); alpaka::enqueue(queue, addpLSasTrackCandidateInGPUTask); @@ -865,16 +868,16 @@ void SDL::Event::createPixelTriplets() { SDL::createPixelTripletsInGPUFromMapv2 createPixelTripletsInGPUFromMapv2_kernel; auto const createPixelTripletsInGPUFromMapv2Task( alpaka::createTaskKernel(createPixelTripletsInGPUFromMapv2_workDiv, - createPixelTripletsInGPUFromMapv2_kernel, - *modulesBuffers_->data(), - *rangesInGPU, - *mdsInGPU, - *segmentsInGPU, - *tripletsInGPU, - *pixelTripletsInGPU, - alpaka::getPtrNative(connectedPixelSize_dev_buf), - alpaka::getPtrNative(connectedPixelIndex_dev_buf), - nInnerSegments)); + createPixelTripletsInGPUFromMapv2_kernel, + *modulesBuffers_->data(), + *rangesInGPU, + *mdsInGPU, + *segmentsInGPU, + *tripletsInGPU, + *pixelTripletsInGPU, + alpaka::getPtrNative(connectedPixelSize_dev_buf), + alpaka::getPtrNative(connectedPixelIndex_dev_buf), + nInnerSegments)); alpaka::enqueue(queue, createPixelTripletsInGPUFromMapv2Task); alpaka::wait(queue); @@ -912,10 +915,10 @@ void SDL::Event::createQuintuplets() { SDL::createEligibleModulesListForQuintupletsGPU createEligibleModulesListForQuintupletsGPU_kernel; auto const createEligibleModulesListForQuintupletsGPUTask( alpaka::createTaskKernel(createEligibleModulesListForQuintupletsGPU_workDiv, - createEligibleModulesListForQuintupletsGPU_kernel, - *modulesBuffers_->data(), - *tripletsInGPU, - *rangesInGPU)); + createEligibleModulesListForQuintupletsGPU_kernel, + *modulesBuffers_->data(), + *tripletsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, createEligibleModulesListForQuintupletsGPUTask); alpaka::wait(queue); @@ -946,14 +949,14 @@ void SDL::Event::createQuintuplets() { SDL::createQuintupletsInGPUv2 createQuintupletsInGPUv2_kernel; auto const createQuintupletsInGPUv2Task(alpaka::createTaskKernel(createQuintupletsInGPUv2_workDiv, - createQuintupletsInGPUv2_kernel, - *modulesBuffers_->data(), - *mdsInGPU, - *segmentsInGPU, - *tripletsInGPU, - *quintupletsInGPU, - *rangesInGPU, - nEligibleT5Modules)); + createQuintupletsInGPUv2_kernel, + *modulesBuffers_->data(), + *mdsInGPU, + *segmentsInGPU, + *tripletsInGPU, + *quintupletsInGPU, + *rangesInGPU, + nEligibleT5Modules)); alpaka::enqueue(queue, createQuintupletsInGPUv2Task); @@ -965,10 +968,10 @@ void SDL::Event::createQuintuplets() { SDL::removeDupQuintupletsInGPUAfterBuild removeDupQuintupletsInGPUAfterBuild_kernel; auto const removeDupQuintupletsInGPUAfterBuildTask( alpaka::createTaskKernel(removeDupQuintupletsInGPUAfterBuild_workDiv, - removeDupQuintupletsInGPUAfterBuild_kernel, - *modulesBuffers_->data(), - *quintupletsInGPU, - *rangesInGPU)); + removeDupQuintupletsInGPUAfterBuild_kernel, + *modulesBuffers_->data(), + *quintupletsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, removeDupQuintupletsInGPUAfterBuildTask); @@ -980,10 +983,10 @@ void SDL::Event::createQuintuplets() { SDL::addQuintupletRangesToEventExplicit addQuintupletRangesToEventExplicit_kernel; auto const addQuintupletRangesToEventExplicitTask( alpaka::createTaskKernel(addQuintupletRangesToEventExplicit_workDiv, - addQuintupletRangesToEventExplicit_kernel, - *modulesBuffers_->data(), - *quintupletsInGPU, - *rangesInGPU)); + addQuintupletRangesToEventExplicit_kernel, + *modulesBuffers_->data(), + *quintupletsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, addQuintupletRangesToEventExplicitTask); alpaka::wait(queue); @@ -1094,17 +1097,17 @@ void SDL::Event::createPixelQuintuplets() { SDL::createPixelQuintupletsInGPUFromMapv2 createPixelQuintupletsInGPUFromMapv2_kernel; auto const createPixelQuintupletsInGPUFromMapv2Task( alpaka::createTaskKernel(createPixelQuintupletsInGPUFromMapv2_workDiv, - createPixelQuintupletsInGPUFromMapv2_kernel, - *modulesBuffers_->data(), - *mdsInGPU, - *segmentsInGPU, - *tripletsInGPU, - *quintupletsInGPU, - *pixelQuintupletsInGPU, - alpaka::getPtrNative(connectedPixelSize_dev_buf), - alpaka::getPtrNative(connectedPixelIndex_dev_buf), - nInnerSegments, - *rangesInGPU)); + createPixelQuintupletsInGPUFromMapv2_kernel, + *modulesBuffers_->data(), + *mdsInGPU, + *segmentsInGPU, + *tripletsInGPU, + *quintupletsInGPU, + *pixelQuintupletsInGPU, + alpaka::getPtrNative(connectedPixelSize_dev_buf), + alpaka::getPtrNative(connectedPixelIndex_dev_buf), + nInnerSegments, + *rangesInGPU)); alpaka::enqueue(queue, createPixelQuintupletsInGPUFromMapv2Task); @@ -1116,8 +1119,8 @@ void SDL::Event::createPixelQuintuplets() { SDL::removeDupPixelQuintupletsInGPUFromMap removeDupPixelQuintupletsInGPUFromMap_kernel; auto const removeDupPixelQuintupletsInGPUFromMapTask( alpaka::createTaskKernel(removeDupPixelQuintupletsInGPUFromMap_workDiv, - removeDupPixelQuintupletsInGPUFromMap_kernel, - *pixelQuintupletsInGPU)); + removeDupPixelQuintupletsInGPUFromMap_kernel, + *pixelQuintupletsInGPU)); alpaka::enqueue(queue, removeDupPixelQuintupletsInGPUFromMapTask); @@ -1128,12 +1131,12 @@ void SDL::Event::createPixelQuintuplets() { SDL::addpT5asTrackCandidateInGPU addpT5asTrackCandidateInGPU_kernel; auto const addpT5asTrackCandidateInGPUTask(alpaka::createTaskKernel(addpT5asTrackCandidateInGPU_workDiv, - addpT5asTrackCandidateInGPU_kernel, - nLowerModules_, - *pixelQuintupletsInGPU, - *trackCandidatesInGPU, - *segmentsInGPU, - *rangesInGPU)); + addpT5asTrackCandidateInGPU_kernel, + nLowerModules_, + *pixelQuintupletsInGPU, + *trackCandidatesInGPU, + *segmentsInGPU, + *rangesInGPU)); alpaka::enqueue(queue, addpT5asTrackCandidateInGPUTask); alpaka::wait(queue); @@ -1574,8 +1577,8 @@ SDL::segmentsBuffer* SDL::Event::getSegments() { alpaka::wait(queue); unsigned int nMemHost = *alpaka::getPtrNative(nMemHost_buf); - segmentsInCPU = new SDL::segmentsBuffer( - nMemHost, nLowerModules_, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devHost, queue); + segmentsInCPU = + new SDL::segmentsBuffer(nMemHost, nLowerModules_, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devHost, queue); segmentsInCPU->setData(*segmentsInCPU); *alpaka::getPtrNative(segmentsInCPU->nMemoryLocations_buf) = nMemHost; diff --git a/RecoTracker/LSTCore/src/alpaka/Event.h b/RecoTracker/LSTCore/src/alpaka/Event.h index cb81cabeed0c0..eeba434b503c0 100644 --- a/RecoTracker/LSTCore/src/alpaka/Event.h +++ b/RecoTracker/LSTCore/src/alpaka/Event.h @@ -1,5 +1,5 @@ -#ifndef RecoTracker_LSTCore_src_Event_h -#define RecoTracker_LSTCore_src_Event_h +#ifndef RecoTracker_LSTCore_src_alpaka_Event_h +#define RecoTracker_LSTCore_src_alpaka_Event_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Hit.h b/RecoTracker/LSTCore/src/alpaka/Hit.h index d524dd93d3e8d..70c0976cd7480 100644 --- a/RecoTracker/LSTCore/src/alpaka/Hit.h +++ b/RecoTracker/LSTCore/src/alpaka/Hit.h @@ -1,5 +1,5 @@ -#ifndef Hit_cuh -#define Hit_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_Hit_h +#define RecoTracker_LSTCore_src_alpaka_Hit_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Kernels.h b/RecoTracker/LSTCore/src/alpaka/Kernels.h index 96cc6ecf89a79..cd62fc5b8a268 100644 --- a/RecoTracker/LSTCore/src/alpaka/Kernels.h +++ b/RecoTracker/LSTCore/src/alpaka/Kernels.h @@ -1,5 +1,5 @@ -#ifndef Kernels_cuh -#define Kernels_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_Kernels_h +#define RecoTracker_LSTCore_src_alpaka_Kernels_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/LST.dev.cc b/RecoTracker/LSTCore/src/alpaka/LST.dev.cc index ef028e5a2bca0..27b0fb49e1cd9 100644 --- a/RecoTracker/LSTCore/src/alpaka/LST.dev.cc +++ b/RecoTracker/LSTCore/src/alpaka/LST.dev.cc @@ -21,24 +21,24 @@ namespace { template <> void SDL::LST::prepareInput(const std::vector see_px, - const std::vector see_py, - const std::vector see_pz, - const std::vector see_dxy, - const std::vector see_dz, - const std::vector see_ptErr, - const std::vector see_etaErr, - const std::vector see_stateTrajGlbX, - const std::vector see_stateTrajGlbY, - const std::vector see_stateTrajGlbZ, - const std::vector see_stateTrajGlbPx, - const std::vector see_stateTrajGlbPy, - const std::vector see_stateTrajGlbPz, - const std::vector see_q, - const std::vector> see_hitIdx, - const std::vector ph2_detId, - const std::vector ph2_x, - const std::vector ph2_y, - const std::vector ph2_z) { + const std::vector see_py, + const std::vector see_pz, + const std::vector see_dxy, + const std::vector see_dz, + const std::vector see_ptErr, + const std::vector see_etaErr, + const std::vector see_stateTrajGlbX, + const std::vector see_stateTrajGlbY, + const std::vector see_stateTrajGlbZ, + const std::vector see_stateTrajGlbPx, + const std::vector see_stateTrajGlbPy, + const std::vector see_stateTrajGlbPz, + const std::vector see_q, + const std::vector> see_hitIdx, + const std::vector ph2_detId, + const std::vector ph2_x, + const std::vector ph2_y, + const std::vector ph2_z) { unsigned int count = 0; auto n_see = see_stateTrajGlbPx.size(); std::vector px_vec; @@ -212,11 +212,11 @@ void SDL::LST::prepareInput(const std::vector see_px, in_isQuad_vec_ = isQuad_vec; } -template<> +template <> std::vector SDL::LST::getHitIdxs(const short trackCandidateType, - const unsigned int TCIdx, - const unsigned int* TCHitIndices, - const unsigned int* hitIndices) { + const unsigned int TCIdx, + const unsigned int* TCHitIndices, + const unsigned int* hitIndices) { std::vector hits; unsigned int maxNHits = 0; @@ -279,29 +279,29 @@ void SDL::LST::getOutput(SDL::Event& event) { template <> template <> void SDL::LST::run(Queue& queue, - bool verbose, - const LSTESData* deviceESData, - const std::vector see_px, - const std::vector see_py, - const std::vector see_pz, - const std::vector see_dxy, - const std::vector see_dz, - const std::vector see_ptErr, - const std::vector see_etaErr, - const std::vector see_stateTrajGlbX, - const std::vector see_stateTrajGlbY, - const std::vector see_stateTrajGlbZ, - const std::vector see_stateTrajGlbPx, - const std::vector see_stateTrajGlbPy, - const std::vector see_stateTrajGlbPz, - const std::vector see_q, - const std::vector> see_hitIdx, - const std::vector ph2_detId, - const std::vector ph2_x, - const std::vector ph2_y, - const std::vector ph2_z, - bool no_pls_dupclean, - bool tc_pls_triplets) { + bool verbose, + const LSTESData* deviceESData, + const std::vector see_px, + const std::vector see_py, + const std::vector see_pz, + const std::vector see_dxy, + const std::vector see_dz, + const std::vector see_ptErr, + const std::vector see_etaErr, + const std::vector see_stateTrajGlbX, + const std::vector see_stateTrajGlbY, + const std::vector see_stateTrajGlbZ, + const std::vector see_stateTrajGlbPx, + const std::vector see_stateTrajGlbPy, + const std::vector see_stateTrajGlbPz, + const std::vector see_q, + const std::vector> see_hitIdx, + const std::vector ph2_detId, + const std::vector ph2_x, + const std::vector ph2_y, + const std::vector ph2_z, + bool no_pls_dupclean, + bool tc_pls_triplets) { auto event = SDL::Event(verbose, queue, deviceESData); prepareInput(see_px, see_py, diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h index 1f65d69cd535f..a0f5998f643b6 100644 --- a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h +++ b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h @@ -1,5 +1,5 @@ -#ifndef MiniDoublet_cuh -#define MiniDoublet_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_MiniDoublet_h +#define RecoTracker_LSTCore_src_alpaka_MiniDoublet_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h b/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h index d04260ec2deb1..cc86d60b54af0 100644 --- a/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h +++ b/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h @@ -1,5 +1,5 @@ -#ifndef NeuralNetwork_cuh -#define NeuralNetwork_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_NeuralNetwork_h +#define RecoTracker_LSTCore_src_alpaka_NeuralNetwork_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/NeuralNetworkWeights.h b/RecoTracker/LSTCore/src/alpaka/NeuralNetworkWeights.h index 90fb6b21ac7d4..959ebb56e8b68 100644 --- a/RecoTracker/LSTCore/src/alpaka/NeuralNetworkWeights.h +++ b/RecoTracker/LSTCore/src/alpaka/NeuralNetworkWeights.h @@ -1,5 +1,5 @@ -#ifndef NeuralNetworkWeights_cuh -#define NeuralNetworkWeights_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_NeuralNetworkWeights_h +#define RecoTracker_LSTCore_src_alpaka_NeuralNetworkWeights_h #include diff --git a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h index 06b73403011ac..3f73fb53f717b 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h @@ -1,5 +1,5 @@ -#ifndef PixelTriplet_cuh -#define PixelTriplet_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_PixelTriplet_h +#define RecoTracker_LSTCore_src_alpaka_PixelTriplet_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" @@ -1824,8 +1824,8 @@ namespace SDL { } // namespace SDL #endif -#ifndef PixelQuintuplet_cuh -#define PixelQuintuplet_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_PixelQuintuplet_h +#define RecoTracker_LSTCore_src_alpaka_PixelQuintuplet_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h index f4368bac18d8f..b5b21a52c8ae7 100644 --- a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h @@ -1,5 +1,5 @@ -#ifndef Quintuplet_cuh -#define Quintuplet_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_Quintuplet_h +#define RecoTracker_LSTCore_src_alpaka_Quintuplet_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Segment.h b/RecoTracker/LSTCore/src/alpaka/Segment.h index 3216afa7092e3..114d29df698fa 100644 --- a/RecoTracker/LSTCore/src/alpaka/Segment.h +++ b/RecoTracker/LSTCore/src/alpaka/Segment.h @@ -1,5 +1,5 @@ -#ifndef Segment_cuh -#define Segment_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_Segment_h +#define RecoTracker_LSTCore_src_alpaka_Segment_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h index fbf97c97c3c17..080abee755f96 100644 --- a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h +++ b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h @@ -1,5 +1,5 @@ -#ifndef TrackCandidate_cuh -#define TrackCandidate_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_TrackCandidate_h +#define RecoTracker_LSTCore_src_alpaka_TrackCandidate_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Triplet.h b/RecoTracker/LSTCore/src/alpaka/Triplet.h index 793a3186174b1..4b1308dbc9067 100644 --- a/RecoTracker/LSTCore/src/alpaka/Triplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Triplet.h @@ -1,5 +1,5 @@ -#ifndef Triplet_cuh -#define Triplet_cuh +#ifndef RecoTracker_LSTCore_src_alpaka_Triplet_h +#define RecoTracker_LSTCore_src_alpaka_Triplet_h #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/Module.h" diff --git a/RecoTracker/LSTCore/standalone/bin/sdl.cc b/RecoTracker/LSTCore/standalone/bin/sdl.cc index 61639b73068d0..eab52b42645dd 100644 --- a/RecoTracker/LSTCore/standalone/bin/sdl.cc +++ b/RecoTracker/LSTCore/standalone/bin/sdl.cc @@ -308,8 +308,7 @@ void run_sdl() { TStopwatch full_timer; full_timer.Start(); auto hostESData = SDL::loadAndFillESHost(); - auto deviceESData = - cms::alpakatools::CopyToDevice>::copyAsync(queues[0], *hostESData.get()); + auto deviceESData = cms::alpakatools::CopyToDevice>::copyAsync(queues[0], *hostESData.get()); float timeForMapLoading = full_timer.RealTime() * 1000; if (ana.do_write_ntuple) { diff --git a/RecoTracker/LSTCore/standalone/code/core/AccessHelper.cc b/RecoTracker/LSTCore/standalone/code/core/AccessHelper.cc index 1429957d4626f..debebfb128859 100644 --- a/RecoTracker/LSTCore/standalone/code/core/AccessHelper.cc +++ b/RecoTracker/LSTCore/standalone/code/core/AccessHelper.cc @@ -63,8 +63,8 @@ std::vector getPixelHitTypesFrompLS(SDL::Event* event, uns } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFrompLS( - SDL::Event* event, unsigned pLS) { +std::tuple, std::vector> getHitIdxsAndHitTypesFrompLS(SDL::Event* event, + unsigned pLS) { return convertHitsToHitIdxsAndHitTypes(event, getPixelHitsFrompLS(event, pLS)); } @@ -81,8 +81,8 @@ std::vector getHitsFromMD(SDL::Event* event, unsigned int } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFromMD( - SDL::Event* event, unsigned MD) { +std::tuple, std::vector> getHitIdxsAndHitTypesFromMD(SDL::Event* event, + unsigned MD) { return convertHitsToHitIdxsAndHitTypes(event, getHitsFromMD(event, MD)); } @@ -107,8 +107,8 @@ std::vector getHitsFromLS(SDL::Event* event, unsigned int } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFromLS( - SDL::Event* event, unsigned LS) { +std::tuple, std::vector> getHitIdxsAndHitTypesFromLS(SDL::Event* event, + unsigned LS) { return convertHitsToHitIdxsAndHitTypes(event, getHitsFromLS(event, LS)); } @@ -142,8 +142,8 @@ std::vector getHitsFromT3(SDL::Event* event, unsigned int } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFromT3( - SDL::Event* event, unsigned T3) { +std::tuple, std::vector> getHitIdxsAndHitTypesFromT3(SDL::Event* event, + unsigned T3) { return convertHitsToHitIdxsAndHitTypes(event, getHitsFromT3(event, T3)); } @@ -214,8 +214,8 @@ std::vector getHitTypesFromT5(SDL::Event* event, unsigned } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFromT5( - SDL::Event* event, unsigned T5) { +std::tuple, std::vector> getHitIdxsAndHitTypesFromT5(SDL::Event* event, + unsigned T5) { return convertHitsToHitIdxsAndHitTypes(event, getHitsFromT5(event, T5)); } @@ -303,8 +303,8 @@ std::vector getHitTypesFrompT3(SDL::Event* event, unsigned } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFrompT3( - SDL::Event* event, unsigned pT3) { +std::tuple, std::vector> getHitIdxsAndHitTypesFrompT3(SDL::Event* event, + unsigned pT3) { return convertHitsToHitIdxsAndHitTypes(event, getHitsFrompT3(event, pT3)); } @@ -400,8 +400,8 @@ std::vector getHitTypesFrompT5(SDL::Event* event, unsigned } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFrompT5( - SDL::Event* event, unsigned pT5) { +std::tuple, std::vector> getHitIdxsAndHitTypesFrompT5(SDL::Event* event, + unsigned pT5) { return convertHitsToHitIdxsAndHitTypes(event, getHitsFrompT5(event, pT5)); } @@ -432,8 +432,8 @@ std::vector getLSsFromTC(SDL::Event* event, unsigned int T } //____________________________________________________________________________________________ -std::tuple, std::vector> getHitIdxsAndHitTypesFromTC( - SDL::Event* event, unsigned TC) { +std::tuple, std::vector> getHitIdxsAndHitTypesFromTC(SDL::Event* event, + unsigned TC) { // Get the type of the track candidate SDL::trackCandidatesBuffer& trackCandidatesInGPU = (*event->getTrackCandidates()); short type = trackCandidatesInGPU.trackCandidateType[TC]; diff --git a/RecoTracker/LSTCore/standalone/code/core/AccessHelper.h b/RecoTracker/LSTCore/standalone/code/core/AccessHelper.h index efe1cdb68f585..d72edd669fb51 100644 --- a/RecoTracker/LSTCore/standalone/code/core/AccessHelper.h +++ b/RecoTracker/LSTCore/standalone/code/core/AccessHelper.h @@ -12,9 +12,12 @@ std::tuple, std::vector> convertHitsToHi SDL::Event* event, std::vector hits); // ----* pLS *---- -std::vector getPixelHitsFrompLS(SDL::Event* event, unsigned int pLS); -std::vector getPixelHitIdxsFrompLS(SDL::Event* event, unsigned int pLS); -std::vector getPixelHitTypesFrompLS(SDL::Event* event, unsigned int pLS); +std::vector getPixelHitsFrompLS(SDL::Event* event, + unsigned int pLS); +std::vector getPixelHitIdxsFrompLS(SDL::Event* event, + unsigned int pLS); +std::vector getPixelHitTypesFrompLS(SDL::Event* event, + unsigned int pLS); std::tuple, std::vector> getHitIdxsAndHitTypesFrompLS( SDL::Event* event, unsigned pLS); @@ -52,12 +55,15 @@ unsigned int getPixelLSFrompT3(SDL::Event* unsigned int getT3FrompT3(SDL::Event* event, unsigned int pT3); std::vector getLSsFrompT3(SDL::Event* event, unsigned int pT3); std::vector getMDsFrompT3(SDL::Event* event, unsigned int pT3); -std::vector getOuterTrackerHitsFrompT3(SDL::Event* event, unsigned int pT3); -std::vector getPixelHitsFrompT3(SDL::Event* event, unsigned int pT3); +std::vector getOuterTrackerHitsFrompT3(SDL::Event* event, + unsigned int pT3); +std::vector getPixelHitsFrompT3(SDL::Event* event, + unsigned int pT3); std::vector getHitsFrompT3(SDL::Event* event, unsigned int pT3); std::vector getHitIdxsFrompT3(SDL::Event* event, unsigned int pT3); std::vector getHitTypesFrompT3(SDL::Event* event, unsigned int pT3); -std::vector getModuleIdxsFrompT3(SDL::Event* event, unsigned int pT3); +std::vector getModuleIdxsFrompT3(SDL::Event* event, + unsigned int pT3); std::tuple, std::vector> getHitIdxsAndHitTypesFrompT3( SDL::Event* event, unsigned pT3); @@ -67,12 +73,15 @@ unsigned int getT5FrompT5(SDL::Event* even std::vector getT3sFrompT5(SDL::Event* event, unsigned int pT5); std::vector getLSsFrompT5(SDL::Event* event, unsigned int pT5); std::vector getMDsFrompT5(SDL::Event* event, unsigned int pT5); -std::vector getOuterTrackerHitsFrompT5(SDL::Event* event, unsigned int pT5); -std::vector getPixelHitsFrompT5(SDL::Event* event, unsigned int pT5); +std::vector getOuterTrackerHitsFrompT5(SDL::Event* event, + unsigned int pT5); +std::vector getPixelHitsFrompT5(SDL::Event* event, + unsigned int pT5); std::vector getHitsFrompT5(SDL::Event* event, unsigned int pT5); std::vector getHitIdxsFrompT5(SDL::Event* event, unsigned int pT5); std::vector getHitTypesFrompT5(SDL::Event* event, unsigned int pT5); -std::vector getModuleIdxsFrompT5(SDL::Event* event, unsigned int pT5); +std::vector getModuleIdxsFrompT5(SDL::Event* event, + unsigned int pT5); std::tuple, std::vector> getHitIdxsAndHitTypesFrompT5( SDL::Event* event, unsigned pT5); diff --git a/RecoTracker/LSTCore/standalone/code/core/trkCore.h b/RecoTracker/LSTCore/standalone/code/core/trkCore.h index 237f7670da738..e32bc5153e04a 100644 --- a/RecoTracker/LSTCore/standalone/code/core/trkCore.h +++ b/RecoTracker/LSTCore/standalone/code/core/trkCore.h @@ -20,7 +20,9 @@ float runT4(SDL::Event *event); float runT4x(SDL::Event *event); float runpT4(SDL::Event *event); float runT3(SDL::Event *event); -float runTrackCandidate(SDL::Event *event, bool no_pls_dupclean, bool tc_pls_triplets); +float runTrackCandidate(SDL::Event *event, + bool no_pls_dupclean, + bool tc_pls_triplets); float runQuintuplet(SDL::Event *event); float runPixelQuintuplet(SDL::Event *event); float runPixelLineSegment(SDL::Event *event, bool no_pls_dupclean); diff --git a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc index 2529586907d08..d361cdd165705 100644 --- a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc +++ b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.cc @@ -891,8 +891,8 @@ std::tuple, std::vector, std::vector> parseT5( - SDL::Event* event, unsigned int idx) { +std::tuple, std::vector> parseT5(SDL::Event* event, + unsigned int idx) { SDL::trackCandidatesBuffer& trackCandidatesInGPU = (*event->getTrackCandidates()); SDL::quintupletsBuffer& quintupletsInGPU = (*event->getQuintuplets()); unsigned int T5 = trackCandidatesInGPU.directObjectIndices[idx]; diff --git a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h index e61250f196ae4..ec3afb2e1944c 100644 --- a/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h +++ b/RecoTracker/LSTCore/standalone/code/core/write_sdl_ntuple.h @@ -26,8 +26,8 @@ void setPixelTripletOutputBranches(SDL::Event* event); void setGnnNtupleMiniDoublet(SDL::Event* event, unsigned int MD); -std::tuple> parseTrackCandidate(SDL::Event* event, - unsigned int); +std::tuple> parseTrackCandidate( + SDL::Event* event, unsigned int); std::tuple, std::vector> parsepT5( SDL::Event* event, unsigned int); std::tuple, std::vector> parsepT3(