ref: Update to detray version 0.69.1

core/include/traccc/finding/finding_algorithm.ipp

@@ -10,7 +10,7 @@
 
 // detray include(s).
 #include "detray/geometry/barcode.hpp"
-#include "detray/geometry/surface.hpp"
+#include "detray/geometry/tracking_surface.hpp"
 
 // System include
 #include <algorithm>
@@ -125,7 +125,7 @@ finding_algorithm<stepper_t, navigator_t>::operator()(
              *************************/
 
             // Get intersection at surface
-            const detray::surface sf{det, in_param.surface_link()};
+            const detray::tracking_surface sf{det, in_param.surface_link()};
 
             const cxt_t ctx{};
 

core/include/traccc/fitting/kalman_filter/kalman_fitter.hpp

@@ -218,8 +218,7 @@ class kalman_fitter {
              it != track_states.rend(); ++it) {
 
             // Run kalman smoother
-            const detray::surface<detector_type> sf{m_detector,
-                                                    it->surface_link()};
+            const detray::tracking_surface sf{m_detector, it->surface_link()};
             sf.template visit_mask<gain_matrix_smoother<algebra_type>>(
                 *it, *(it - 1));
         }
@@ -235,8 +234,8 @@ class kalman_fitter {
 
         for (const auto& trk_state : track_states) {
 
-            const detray::surface<detector_type> sf{m_detector,
-                                                    trk_state.surface_link()};
+            const detray::tracking_surface sf{m_detector,
+                                              trk_state.surface_link()};
             sf.template visit_mask<statistics_updater<algebra_type>>(fit_res,
                                                                      trk_state);
         }

core/include/traccc/seeding/experimental/spacepoint_formation.ipp

@@ -6,7 +6,7 @@
  */
 
 // Detray include(s).
-#include "detray/geometry/surface.hpp"
+#include "detray/geometry/tracking_surface.hpp"
 
 namespace traccc::experimental {
 
@@ -29,7 +29,7 @@ spacepoint_collection_types::host spacepoint_formation<detector_t>::operator()(
         // Access the measurements of the current module.
         const measurement& ms = measurements.at(i);
 
-        const detray::surface<detector_t> sf{det, ms.surface_link};
+        const detray::tracking_surface sf{det, ms.surface_link};
 
         // This local to global transformation only works for 2D planar
         // measurement

core/include/traccc/utils/seed_generator.hpp

@@ -12,7 +12,7 @@
 
 // detray include(s).
 #include "detray/geometry/barcode.hpp"
-#include "detray/geometry/surface.hpp"
+#include "detray/geometry/tracking_surface.hpp"
 #include "detray/propagator/actor_chain.hpp"
 #include "detray/propagator/actors/aborters.hpp"
 #include "detray/propagator/actors/parameter_resetter.hpp"
@@ -52,7 +52,7 @@ struct seed_generator {
         const free_track_parameters& free_param) {
 
         // Get bound parameter
-        const detray::surface sf{m_detector, surface_link};
+        const detray::tracking_surface sf{m_detector, surface_link};
 
         const cxt_t ctx{};
         auto bound_vec = sf.free_to_bound_vector(ctx, free_param.vector());

device/common/include/traccc/finding/device/impl/apply_interaction.ipp

@@ -11,7 +11,7 @@
 #include "traccc/definitions/math.hpp"
 
 // Detray include(s).
-#include "detray/geometry/surface.hpp"
+#include "detray/geometry/tracking_surface.hpp"
 
 namespace traccc::device {
 
@@ -38,7 +38,7 @@ TRACCC_DEVICE inline void apply_interaction(
     auto& bound_param = params.at(globalIndex);
 
     // Get intersection at surface
-    const detray::surface sf{det, bound_param.surface_link()};
+    const detray::tracking_surface sf{det, bound_param.surface_link()};
     const typename detector_t::geometry_context ctx{};
 
     // Apply interactor

device/common/include/traccc/finding/device/impl/find_tracks.ipp

@@ -99,7 +99,7 @@ TRACCC_DEVICE inline void find_tracks(
 
         const auto& meas = measurements.at(meas_idx);
         track_state<typename detector_t::algebra_type> trk_state(meas);
-        const detray::surface<detector_t> sf{det, bcd};
+        const detray::tracking_surface sf{det, bcd};
 
         // Run the Kalman update
         sf.template visit_mask<

device/common/include/traccc/seeding/device/experimental/impl/form_spacepoints.ipp

@@ -6,7 +6,7 @@
  */
 
 // Detray include(s).
-#include "detray/geometry/surface.hpp"
+#include "detray/geometry/tracking_surface.hpp"
 
 namespace traccc::device::experimental {
 
@@ -35,7 +35,7 @@ TRACCC_HOST_DEVICE inline void form_spacepoints(
     // Access the measurements of the current module.
     const measurement& ms = measurements.at(globalIndex);
 
-    const detray::surface<detector_t> sf{det, ms.surface_link};
+    const detray::tracking_surface sf{det, ms.surface_link};
 
     // This local to global transformation only works for 2D planar measurement
     // (e.g. barrel pixel and endcap pixel detector)

extern/detray/CMakeLists.txt

@@ -18,7 +18,7 @@ message( STATUS "Building Detray as part of the TRACCC project" )
 
 # Declare where to get Detray from.
 set( TRACCC_DETRAY_SOURCE
-"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.67.0.tar.gz;URL_MD5;e874ea4299bdfa55b74df1ad71fae066"
+"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.69.1.tar.gz;URL_MD5;38a0f8e786ac6a61fabcd3a28d7bb2d6"
    CACHE STRING "Source for Detray, when built as part of this project" )
 
 mark_as_advanced( TRACCC_DETRAY_SOURCE )

io/include/traccc/io/read_geometry.hpp

@@ -15,7 +15,7 @@
 
 // Detray include(s).
 #include <detray/geometry/barcode.hpp>
-#include <detray/geometry/surface.hpp>
+#include <detray/geometry/tracking_surface.hpp>
 
 // System include(s).
 #include <cstdint>
@@ -45,7 +45,7 @@ geometry alt_read_geometry(const detector_t& det) {
     const cxt_t ctx0{};
 
     for (const auto& sf_desc : det.surfaces()) {
-        const detray::surface<detector_t> sf{det, sf_desc.barcode()};
+        const detray::tracking_surface sf{det, sf_desc.barcode()};
 
         maps.insert({sf.barcode().value(), sf.transform(ctx0)});
     }

io/src/obj/write_track_candidates.cpp

@@ -46,8 +46,7 @@ void write_track_candidates(
         for (const measurement& m : track.items) {
 
             // Find the detector surface that this measurement sits on.
-            const detray::surface<detray::detector<> > surface{detector,
-                                                               m.surface_link};
+            const detray::tracking_surface surface{detector, m.surface_link};
 
             // Calculate a position for this measurement in global 3D space.
             const auto global = surface.bound_to_global({}, m.local, {});

performance/include/traccc/resolution/fitting_performance_writer.hpp

@@ -75,7 +75,7 @@ class fitting_performance_writer {
         const auto global_pos = evt_map.meas_xp_map[meas].first;
         const auto global_mom = evt_map.meas_xp_map[meas].second;
 
-        const detray::surface<detector_t> sf{det, meas.surface_link};
+        const detray::tracking_surface sf{det, meas.surface_link};
         using cxt_t = typename detector_t::geometry_context;
         const cxt_t ctx{};
         const auto truth_local =

simulation/include/traccc/simulation/smearing_writer.hpp

@@ -16,7 +16,7 @@
 #include "traccc/simulation/measurement_smearer.hpp"
 
 // Detray core include(s).
-#include "detray/geometry/surface.hpp"
+#include "detray/geometry/tracking_surface.hpp"
 #include "detray/propagator/base_actor.hpp"
 #include "detray/tracks/bound_track_parameters.hpp"
 #include "detray/tracks/free_track_parameters.hpp"

tests/cpu/test_simulation.cpp

@@ -20,7 +20,7 @@
 #include "detray/geometry/mask.hpp"
 #include "detray/geometry/shapes/line.hpp"
 #include "detray/geometry/shapes/rectangle2D.hpp"
-#include "detray/geometry/surface.hpp"
+#include "detray/geometry/tracking_surface.hpp"
 #include "detray/simulation/event_generator/track_generators.hpp"
 #include "detray/tracks/bound_track_parameters.hpp"
 #include "detray/utils/statistics.hpp"
@@ -172,8 +172,8 @@ GTEST_TEST(traccc_simulation, toy_detector_simulation) {
             const point3 pos{hits[i].tx, hits[i].ty, hits[i].tz};
             const vector3 mom{hits[i].tpx, hits[i].tpy, hits[i].tpz};
             const auto truth_local =
-                detray::surface{detector,
-                                detray::geometry::barcode(hits[i].geometry_id)}
+                detray::tracking_surface{
+                    detector, detray::geometry::barcode(hits[i].geometry_id)}
                     .global_to_local(ctx, pos, vector::normalize(mom));
 
             local0_diff.push_back(truth_local[0] - measurements[i].local0);