Skip to content

Commit 080b8e8

Browse files
f3schf3sch
committed
fix1
Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>
1 parent 51ed914 commit 080b8e8

3 files changed

Lines changed: 18 additions & 8 deletions

File tree

‎Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TrackingKernels.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ class ExternalAllocator;
4040
template <int NLayers>
4141
void countTrackletsInROFsHandler(const IndexTableUtils<NLayers>* utils,
4242
const typename ROFMaskTable<NLayers>::View& rofMask,
43-
const int layer,
43+
const int transitionId,
44+
const int fromLayer,
45+
const int toLayer,
4446
const typename ROFOverlapTable<NLayers>::View& rofOverlaps,
4547
const typename ROFVertexLookupTable<NLayers>::View& vertexLUT,
4648
const int vertexId,
@@ -69,7 +71,9 @@ void countTrackletsInROFsHandler(const IndexTableUtils<NLayers>* utils,
6971
template <int NLayers>
7072
void computeTrackletsInROFsHandler(const IndexTableUtils<NLayers>* utils,
7173
const typename ROFMaskTable<NLayers>::View& rofMask,
72-
const int layer,
74+
const int transitionId,
75+
const int fromLayer,
76+
const int toLayer,
7377
const typename ROFOverlapTable<NLayers>::View& rofOverlaps,
7478
const typename ROFVertexLookupTable<NLayers>::View& vertexLUT,
7579
const int vertexId,

‎Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackerTraitsGPU.cxx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ void TrackerTraitsGPU<NLayers>::computeLayerTracklets(const int iteration, int i
8484
countTrackletsInROFsHandler<NLayers>(mTimeFrameGPU->getDeviceIndexTableUtils(),
8585
mTimeFrameGPU->getDeviceROFMaskTableView(),
8686
transitionId,
87+
transition.fromLayer,
88+
transition.toLayer,
8789
mTimeFrameGPU->getDeviceROFOverlapTableView(),
8890
mTimeFrameGPU->getDeviceROFVertexLookupTableView(),
8991
iVertex,
@@ -116,6 +118,8 @@ void TrackerTraitsGPU<NLayers>::computeLayerTracklets(const int iteration, int i
116118
computeTrackletsInROFsHandler<NLayers>(mTimeFrameGPU->getDeviceIndexTableUtils(),
117119
mTimeFrameGPU->getDeviceROFMaskTableView(),
118120
transitionId,
121+
transition.fromLayer,
122+
transition.toLayer,
119123
mTimeFrameGPU->getDeviceROFOverlapTableView(),
120124
mTimeFrameGPU->getDeviceROFVertexLookupTableView(),
121125
iVertex,

‎Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackingKernels.cu‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,8 @@ template <int NLayers>
591591
void countTrackletsInROFsHandler(const IndexTableUtils<NLayers>* utils,
592592
const typename ROFMaskTable<NLayers>::View& rofMask,
593593
const int transitionId,
594+
const int fromLayer,
595+
const int toLayer,
594596
const typename ROFOverlapTable<NLayers>::View& rofOverlaps,
595597
const typename ROFVertexLookupTable<NLayers>::View& vertexLUT,
596598
const int vertexId,
@@ -616,9 +618,6 @@ void countTrackletsInROFsHandler(const IndexTableUtils<NLayers>* utils,
616618
o2::its::ExternalAllocator* alloc,
617619
gpu::Streams& streams)
618620
{
619-
const auto transition = topology.getTransition(transitionId);
620-
const int fromLayer = transition.fromLayer;
621-
const int toLayer = transition.toLayer;
622621
gpu::computeLayerTrackletsMultiROFKernel<true><<<60, 256, 0, streams[transitionId].get()>>>(
623622
utils,
624623
rofMask,
@@ -652,6 +651,8 @@ template <int NLayers>
652651
void computeTrackletsInROFsHandler(const IndexTableUtils<NLayers>* utils,
653652
const typename ROFMaskTable<NLayers>::View& rofMask,
654653
const int transitionId,
654+
const int fromLayer,
655+
const int toLayer,
655656
const typename ROFOverlapTable<NLayers>::View& rofOverlaps,
656657
const typename ROFVertexLookupTable<NLayers>::View& vertexLUT,
657658
const int vertexId,
@@ -680,9 +681,6 @@ void computeTrackletsInROFsHandler(const IndexTableUtils<NLayers>* utils,
680681
o2::its::ExternalAllocator* alloc,
681682
gpu::Streams& streams)
682683
{
683-
const auto transition = topology.getTransition(transitionId);
684-
const int fromLayer = transition.fromLayer;
685-
const int toLayer = transition.toLayer;
686684
gpu::computeLayerTrackletsMultiROFKernel<false><<<60, 256, 0, streams[transitionId].get()>>>(
687685
utils,
688686
rofMask,
@@ -1153,6 +1151,8 @@ void computeTrackSeedHandler(TrackSeed<NLayers>* trackSeeds,
11531151
template void countTrackletsInROFsHandler<7>(const IndexTableUtils<7>* utils,
11541152
const ROFMaskTable<7>::View& rofMask,
11551153
const int transitionId,
1154+
const int fromLayer,
1155+
const int toLayer,
11561156
const ROFOverlapTable<7>::View& rofOverlaps,
11571157
const ROFVertexLookupTable<7>::View& vertexLUT,
11581158
const int vertexId,
@@ -1181,6 +1181,8 @@ template void countTrackletsInROFsHandler<7>(const IndexTableUtils<7>* utils,
11811181
template void computeTrackletsInROFsHandler<7>(const IndexTableUtils<7>* utils,
11821182
const ROFMaskTable<7>::View& rofMask,
11831183
const int transitionId,
1184+
const int fromLayer,
1185+
const int toLayer,
11841186
const ROFOverlapTable<7>::View& rofOverlaps,
11851187
const ROFVertexLookupTable<7>::View& vertexLUT,
11861188
const int vertexId,

0 commit comments

Comments
 (0)