From d81f74a60990649509841c890dee5824e0122d42 Mon Sep 17 00:00:00 2001 From: Simone Balducci <93096843+sbaldu@users.noreply.github.com> Date: Fri, 8 Mar 2024 19:31:20 +0100 Subject: [PATCH] Change nearest higher found criteria (#28) * Add check on `rho_j` in calc of nearest higher * Fix typo --- CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h b/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h index 40c82271..c5d4bbf2 100644 --- a/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h +++ b/CLUEstering/alpaka/CLUE/CLUEAlpakaKernels.h @@ -150,7 +150,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { float rho_j{dev_points->rho[j]}; bool found_higher{(rho_j > rho_i)}; // in the rare case where rho is the same, use detid - found_higher = found_higher || ((rho_j == rho_i) && (j > point_id)); + found_higher = found_higher || ((rho_j == rho_i) && (rho_j > 0.f) && (j > point_id)); // Calculate the distance between the two points VecArray coords_j{dev_points->coords[j]}; @@ -200,8 +200,8 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { VecArray, Ndim> searchbox_extremes; for (int dim{}; dim != Ndim; ++dim) { VecArray dim_extremes; - dim_extremes.push_back_unsafe(coords_i[dim] - dc); - dim_extremes.push_back_unsafe(coords_i[dim] + dc); + dim_extremes.push_back_unsafe(coords_i[dim] - dm); + dim_extremes.push_back_unsafe(coords_i[dim] + dm); searchbox_extremes.push_back_unsafe(dim_extremes); }