new stuff

Author: niermann999

CMakeLists.txt

@@ -52,6 +52,10 @@ include( traccc-functions )
 set( TRACCC_CUSTOM_SCALARTYPE "float" CACHE STRING
    "Scalar type to use in the TRACCC code" )
 
+# Temporary setting for the traccc device log level, until it can be removed.
+set( TRACCC_DEVICE_LOG_LVL "NONE" CACHE STRING
+   "Log level for traccc and detray device code" )
+
 # Flags controlling which parts of traccc to build.
 option( TRACCC_BUILD_CUDA "Build the CUDA sources included in traccc" FALSE )
 option( TRACCC_BUILD_HIP "Build the HIP sources included in traccc" FALSE)

core/include/traccc/finding/actors/ckf_aborter.hpp

@@ -10,8 +10,10 @@
 // Project include(s)
 #include "traccc/definitions/primitives.hpp"
 #include "traccc/definitions/qualifiers.hpp"
+#include "traccc/utils/logging.hpp"
 
 // detray include(s)
+#include <detray/definitions/indexing.hpp>
 #include <detray/propagator/base_actor.hpp>
 
 // System include(s)
@@ -24,37 +26,55 @@ struct ckf_aborter : detray::actor {
     struct state {
         // minimal step length to prevent from staying on the same surface
         scalar min_step_length = 0.5f;
+
         /// Maximum step counts that track can make to reach the next surface
-        unsigned int max_count = 100;
+        unsigned int max_count = 100u;
+        unsigned int count = 0u;
 
-        bool success = false;
-        unsigned int count = 0;
+        /// Previous sensitive surface index
+        detray::dindex prev_surface_index{detray::dindex_invalid};
+        /// Current sensitive surface index
+        detray::dindex surface_index{detray::dindex_invalid};
 
-        scalar path_from_surface{0.f};
+        /// Whether a surface was found
+        bool success = false;
     };
 
     template <typename propagator_state_t>
     TRACCC_HOST_DEVICE void operator()(state &abrt_state,
                                        propagator_state_t &prop_state) const {
 
         auto &navigation = prop_state._navigation;
-        const auto &stepping = prop_state._stepping;
 
         abrt_state.count++;
-        abrt_state.path_from_surface += stepping.step_size();
 
-        // Stop at the next sensitive surface
-        if (navigation.is_on_sensitive() &&
-            abrt_state.path_from_surface > abrt_state.min_step_length) {
-            prop_state._heartbeat &= navigation.pause();
-            abrt_state.success = navigation.is_alive();
-        }
+        TRACCC_VERBOSE_HOST_DEVICE("Checking CKF aborter");
+        TRACCC_DEBUG_HOST_DEVICE("=> second last sensitive: %d",
+                                 abrt_state.prev_surface_index);
+        TRACCC_DEBUG_HOST_DEVICE("=> last sensitive: %d",
+                                 abrt_state.surface_index);
 
-        // Reset path from surface
-        if (navigation.is_on_sensitive()) {
-            abrt_state.path_from_surface = 0.f;
+        // Is this a valid sensitive surface to run the CKF on?
+        const detray::dindex sf_idx{navigation.barcode().index()};
+        if (!navigation.is_on_sensitive() ||
+            (abrt_state.surface_index == sf_idx) ||
+            (abrt_state.prev_surface_index == sf_idx)) {
+            return;
         }
 
+        // Update the visited sensitive surfaces and pause the propagation
+        abrt_state.prev_surface_index = abrt_state.surface_index;
+        abrt_state.surface_index = sf_idx;
+
+        TRACCC_VERBOSE_HOST_DEVICE("Found sensitive surface: %d",
+                                   abrt_state.surface_index);
+
+        prop_state._heartbeat &= navigation.pause();
+        abrt_state.success = true;
+
+        assert(abrt_state.surface_index <
+               navigation.detector().surfaces().size());
+
         if (abrt_state.count > abrt_state.max_count) {
             prop_state._heartbeat &= navigation.abort(
                 "CKF: Maximum number of steps to reach next sensitive surface "