Merge branch 'main' into main-regchecks

Author: niermann999

CMakeLists.txt

@@ -225,21 +225,6 @@ if(DETRAY_SETUP_NLOHMANN)
     endif()
 endif()
 
-# Set up dfelibs.
-option(DETRAY_SETUP_DFELIBS "Set up the dfelibs target(s) explicitly" TRUE)
-option(
-    DETRAY_USE_SYSTEM_DFELIBS
-    "Pick up an existing installation of dfelibs from the build environment"
-    ${DETRAY_USE_SYSTEM_LIBS}
-)
-if(DETRAY_SETUP_DFELIBS)
-    if(DETRAY_USE_SYSTEM_DFELIBS)
-        find_package(dfelibs REQUIRED)
-    else()
-        add_subdirectory(extern/dfelibs)
-    endif()
-endif()
-
 # Set up GoogleTest.
 option(
     DETRAY_SETUP_GOOGLETEST

CMakePresets.json

@@ -36,7 +36,6 @@
             "DETRAY_SETUP_ACTSVG": "TRUE",
             "DETRAY_SETUP_BENCHMARK": "TRUE",
             "DETRAY_SETUP_COVFIE": "TRUE",
-            "DETRAY_SETUP_DFELIBS": "TRUE",
             "DETRAY_SETUP_NLOHMANN": "TRUE",
             "ALGEBRA_PLUGINS_INCLUDE_EIGEN": "TRUE",
             "ALGEBRA_PLUGINS_SETUP_EIGEN3": "TRUE",

cmake/detray-config.cmake.in

@@ -26,7 +26,6 @@ include( CMakeFindDependencyMacro )
 find_dependency( algebra-plugins )
 find_dependency( covfie )
 find_dependency( vecmem )
-find_dependency( dfelibs )
 find_dependency( nlohmann_json )
 if( DETRAY_DISPLAY )
    find_dependency( actsvg )

core/include/detray/navigation/navigation_config.hpp

@@ -39,7 +39,7 @@ struct config {
     /// Maximal absolute path distance for a track to be considered 'on surface'
     float path_tolerance{1.f * unit<float>::um};
     /// How far behind the track position to look for candidates
-    float overstep_tolerance{-300.f * unit<float>::um};
+    float overstep_tolerance{-1000.f * unit<float>::um};
     /// Search window size for grid based acceleration structures
     /// (0, 0): only look at current bin
     darray<dindex, 2> search_window = {0u, 0u};

core/include/detray/navigation/navigator.hpp

@@ -640,9 +640,10 @@ class navigator {
     /// @param state the current navigation state
     /// @param cfg the navigation configuration
     template <typename track_t>
-    DETRAY_HOST_DEVICE inline void init(const track_t &track, state &navigation,
-                                        const navigation::config &cfg,
-                                        const context_type &ctx) const {
+    DETRAY_HOST_DEVICE inline void init(
+        const track_t &track, state &navigation, const navigation::config &cfg,
+        const context_type &ctx,
+        const bool use_path_tolerance_as_overstep_tolerance = true) const {
         const auto &det = navigation.detector();
         const auto volume = tracking_volume{det, navigation.volume()};
 
@@ -651,12 +652,16 @@ class navigator {
         navigation.m_heartbeat = true;
 
         // Search for neighboring surfaces and fill candidates into cache
+        const scalar_type overstep_tol =
+            use_path_tolerance_as_overstep_tolerance ? -cfg.path_tolerance
+                                                     : cfg.overstep_tolerance;
+
         volume.template visit_neighborhood<candidate_search>(
             track, cfg, ctx, det, ctx, track, navigation,
             darray<scalar_type, 2u>{cfg.min_mask_tolerance,
                                     cfg.max_mask_tolerance},
             static_cast<scalar_type>(cfg.mask_tolerance_scalor),
-            static_cast<scalar_type>(cfg.overstep_tolerance));
+            static_cast<scalar_type>(overstep_tol));
 
         // Determine overall state of the navigation after updating the cache
         update_navigation_state(navigation, cfg);
@@ -729,7 +734,11 @@ class navigator {
         // If no trust could be restored for the current state, (local)
         // navigation might be exhausted: re-initialize volume
         else {
-            init(track, navigation, cfg, ctx);
+            // Use overstep tolerance instead of path tolerance
+            const bool use_path_tolerance_as_overstep_tolerance = false;
+
+            init(track, navigation, cfg, ctx,
+                 use_path_tolerance_as_overstep_tolerance);
             is_init = true;
 
             // Sanity check: Should never be the case after complete update call
@@ -743,7 +752,8 @@ class navigator {
                     math::min(100.f * cfg.overstep_tolerance,
                               -10.f * cfg.max_mask_tolerance);
 
-                init(track, navigation, loose_cfg, ctx);
+                init(track, navigation, loose_cfg, ctx,
+                     use_path_tolerance_as_overstep_tolerance);
 
                 // Unrecoverable
                 if (navigation.trust_level() !=
@@ -849,7 +859,11 @@ class navigator {
         // Actor flagged cache as broken (other cases of 'no trust' are
         // handeled after volume switch was checked in 'update()')
         if (navigation.trust_level() == navigation::trust_level::e_no_trust) {
-            init(track, navigation, cfg, ctx);
+            // Use overstep tolerance instead of path tolerance
+            const bool use_path_tolerance_as_overstep_tolerance = false;
+
+            init(track, navigation, cfg, ctx,
+                 use_path_tolerance_as_overstep_tolerance);
             return true;
         }
 

extern/dfelibs/CMakeLists.txt

@@ -83,7 +83,7 @@ file(
 detray_add_library( detray_csv_io csv_io
    ${_detray_csv_io_public_headers}
 )
-target_link_libraries(detray_csv_io INTERFACE dfelibs::dfelibs detray::io_utils)
+target_link_libraries(detray_csv_io INTERFACE detray::io_utils)
 
 # Test the public headers of the detray I/O libraries.
 if(BUILD_TESTING AND DETRAY_BUILD_TESTING)