Update to detray version 66

Author: niermann999

core/include/traccc/finding/finding_config.hpp

@@ -41,7 +41,7 @@ struct finding_config {
     scalar_t chi2_max = 30.f;
 
     /// Propagation configuration
-    detray::propagation::config<scalar_t> propagation{};
+    detray::propagation::config propagation{};
 
     /****************************
      *  GPU-specfic parameters

core/include/traccc/fitting/fitting_config.hpp

@@ -14,13 +14,12 @@
 namespace traccc {
 
 /// Configuration struct for track fitting
-template <typename scalar_t>
 struct fitting_config {
 
     std::size_t n_iterations = 1;
 
     /// Propagation configuration
-    detray::propagation::config<scalar_t> propagation{};
+    detray::propagation::config propagation{};
 };
 
 }  // namespace traccc

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

@@ -53,7 +53,7 @@ class kalman_fitter {
     using intersection_type = typename navigator_t::intersection_type;
 
     /// Configuration type
-    using config_type = fitting_config<scalar_type>;
+    using config_type = fitting_config;
 
     // Field type
     using bfield_type = typename stepper_t::magnetic_field_type;

examples/options/include/traccc/options/track_propagation.hpp

@@ -24,7 +24,7 @@ class track_propagation : public interface {
     /// @{
 
     /// Propagation configuration object
-    detray::propagation::config<float> config;
+    detray::propagation::config config;
 
     /// @}
 
@@ -41,12 +41,7 @@ class track_propagation : public interface {
     ///
     /// @param cfg The configuration object to fill
     ///
-    void setup(detray::propagation::config<float>& cfg) const;
-    /// Set up a configuration object based on the command line options
-    ///
-    /// @param cfg The configuration object to fill
-    ///
-    void setup(detray::propagation::config<double>& cfg) const;
+    void setup(detray::propagation::config& cfg) const;
 
     private:
     /// Print the specific options of this class

examples/options/src/track_propagation.cpp

@@ -57,35 +57,12 @@ void track_propagation::read(const po::variables_map&) {
     config.navigation.search_window = m_search_window;
 }
 
-void track_propagation::setup(detray::propagation::config<float>& cfg) const {
+void track_propagation::setup(detray::propagation::config& cfg) const {
 
     cfg = config;
     return;
 }
 
-void track_propagation::setup(detray::propagation::config<double>& cfg) const {
-
-    cfg.stepping.min_stepsize = config.stepping.min_stepsize;
-    cfg.stepping.rk_error_tol = config.stepping.rk_error_tol;
-    cfg.stepping.step_constraint = config.stepping.step_constraint;
-    cfg.stepping.path_limit = config.stepping.path_limit;
-    cfg.stepping.max_rk_updates = config.stepping.max_rk_updates;
-    cfg.stepping.use_mean_loss = config.stepping.use_mean_loss;
-    cfg.stepping.use_eloss_gradient = config.stepping.use_eloss_gradient;
-    cfg.stepping.use_field_gradient = config.stepping.use_field_gradient;
-    cfg.stepping.do_covariance_transport =
-        config.stepping.do_covariance_transport;
-
-    cfg.navigation.min_mask_tolerance = config.navigation.min_mask_tolerance;
-    cfg.navigation.max_mask_tolerance = config.navigation.max_mask_tolerance;
-    cfg.navigation.on_surface_tolerance =
-        config.navigation.on_surface_tolerance;
-    cfg.navigation.overstep_tolerance = config.navigation.overstep_tolerance;
-    cfg.navigation.search_window[0] = config.navigation.search_window[0];
-    cfg.navigation.search_window[1] = config.navigation.search_window[1];
-    return;
-}
-
 std::ostream& track_propagation::print_impl(std::ostream& out) const {
 
     out << "  Constraint step size  : "

examples/simulation/simulate_toy_detector.cpp

@@ -56,7 +56,7 @@ int simulate(const traccc::opts::generation& generation_opts,
     auto field = detray::bfield::create_const_field(B);
 
     // Create the toy geometry
-    detray::toy_det_config<scalar> toy_cfg{};
+    detray::toy_det_config toy_cfg{};
     toy_cfg.n_brl_layers(4u).n_edc_layers(7u);
     // @TODO: Increase the material budget again
     toy_cfg.module_mat_thickness(0.11 * detray::unit<scalar>::mm);

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.65.1.tar.gz;URL_MD5;fbf57a881565fa6019d79d13409b588f"
+"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.66.0.tar.gz;URL_MD5;a4ed82b025b4e508a200925e3fb5af70"
    CACHE STRING "Source for Detray, when built as part of this project" )
 
 mark_as_advanced( TRACCC_DETRAY_SOURCE )

simulation/include/traccc/simulation/simulator.hpp

@@ -33,7 +33,7 @@ struct simulator {
     using scalar_type = typename detector_t::scalar_type;
 
     struct config {
-        detray::propagation::config<scalar_type> propagation;
+        detray::propagation::config propagation;
     };
 
     using algebra_type = typename detector_t::algebra_type;

tests/common/tests/kalman_fitting_telescope_test.hpp

@@ -83,6 +83,7 @@ class KalmanFittingTelescopeTests : public KalmanFittingTests {
         auto writer_cfg = detray::io::detector_writer_config{}
                               .format(detray::io::format::json)
                               .replace_files(true)
+                              .write_material(true)
                               .path(std::get<0>(GetParam()));
         detray::io::write_detector(det, name_map, writer_cfg);
     }

tests/common/tests/kalman_fitting_toy_detector_test.hpp

@@ -56,7 +56,7 @@ class KalmanFittingToyDetectorTests : public KalmanFittingTests {
     virtual void SetUp() override {
         vecmem::host_memory_resource host_mr;
 
-        detray::toy_det_config<scalar> toy_cfg{};
+        detray::toy_det_config toy_cfg{};
         toy_cfg.n_brl_layers(n_barrels).n_edc_layers(n_endcaps).do_check(false);
 
         // Create the toy geometry
@@ -66,6 +66,8 @@ class KalmanFittingToyDetectorTests : public KalmanFittingTests {
         auto writer_cfg = detray::io::detector_writer_config{}
                               .format(detray::io::format::json)
                               .replace_files(true)
+                              .write_grids(true)
+                              .write_material(true)
                               .path(std::get<0>(GetParam()));
         detray::io::write_detector(det, name_map, writer_cfg);
     }

tests/common/tests/kalman_fitting_wire_chamber_test.hpp

@@ -82,6 +82,8 @@ class KalmanFittingWireChamberTests : public KalmanFittingTests {
         auto writer_cfg = detray::io::detector_writer_config{}
                               .format(detray::io::format::json)
                               .replace_files(true)
+                              .write_grids(true)
+                              .write_material(true)
                               .path(std::get<0>(GetParam()));
         detray::io::write_detector(det, name_map, writer_cfg);
     }

tests/cpu/test_simulation.cpp

@@ -77,7 +77,7 @@ GTEST_TEST(traccc_simulation, toy_detector_simulation) {
     auto field = detray::bfield::create_const_field(B);
 
     // Create geometry
-    detray::toy_det_config<scalar> toy_cfg{};
+    detray::toy_det_config toy_cfg{};
     const auto [detector, names] = detray::build_toy_detector(host_mr, toy_cfg);
 
     using geo_cxt_t = typename decltype(detector)::geometry_context;