From aa3c00e3391468cd6d12c07c10583d3aa178f166 Mon Sep 17 00:00:00 2001 From: Stephen Nicholas Swatman Date: Tue, 18 Jun 2024 16:24:16 +0200 Subject: [PATCH] Bump detray version to v0.67.0 This commit bumps the detray version to v0.67.0, accounting for a small breaking change in how detray handles its random number generation. --- examples/simulation/simulate.cpp | 3 ++- examples/simulation/simulate_telescope.cpp | 3 ++- examples/simulation/simulate_toy_detector.cpp | 3 ++- examples/simulation/simulate_wire_chamber.cpp | 3 ++- extern/detray/CMakeLists.txt | 2 +- tests/common/tests/kalman_fitting_test.hpp | 3 ++- tests/cpu/test_simulation.cpp | 3 ++- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/simulation/simulate.cpp b/examples/simulation/simulate.cpp index 0181a998e8..27c28355e6 100644 --- a/examples/simulation/simulate.cpp +++ b/examples/simulation/simulate.cpp @@ -54,7 +54,8 @@ int main(int argc, char* argv[]) { /// Type declarations using host_detector_type = detray::detector<>; using uniform_gen_t = - detray::random_numbers>; + detray::detail::random_numbers>; using generator_type = detray::random_track_generator; diff --git a/examples/simulation/simulate_telescope.cpp b/examples/simulation/simulate_telescope.cpp index d5c902d237..3d12070899 100644 --- a/examples/simulation/simulate_telescope.cpp +++ b/examples/simulation/simulate_telescope.cpp @@ -43,7 +43,8 @@ int simulate(const traccc::opts::generation& generation_opts, // Use deterministic random number generator for testing using uniform_gen_t = - detray::random_numbers>; + detray::detail::random_numbers>; // Memory resource vecmem::host_memory_resource host_mr; diff --git a/examples/simulation/simulate_toy_detector.cpp b/examples/simulation/simulate_toy_detector.cpp index b08b7d1859..bc8c3266b4 100644 --- a/examples/simulation/simulate_toy_detector.cpp +++ b/examples/simulation/simulate_toy_detector.cpp @@ -37,7 +37,8 @@ int simulate(const traccc::opts::generation& generation_opts, // Use deterministic random number generator for testing using uniform_gen_t = - detray::random_numbers>; + detray::detail::random_numbers>; // Memory resource vecmem::host_memory_resource host_mr; diff --git a/examples/simulation/simulate_wire_chamber.cpp b/examples/simulation/simulate_wire_chamber.cpp index b64625a60c..bf78b72767 100644 --- a/examples/simulation/simulate_wire_chamber.cpp +++ b/examples/simulation/simulate_wire_chamber.cpp @@ -37,7 +37,8 @@ int simulate(const traccc::opts::generation& generation_opts, // Use deterministic random number generator for testing using uniform_gen_t = - detray::random_numbers>; + detray::detail::random_numbers>; // Memory resource vecmem::host_memory_resource host_mr; diff --git a/extern/detray/CMakeLists.txt b/extern/detray/CMakeLists.txt index fda310e97c..e96fbc8ca8 100644 --- a/extern/detray/CMakeLists.txt +++ b/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.66.1.tar.gz;URL_MD5;000a0a36f953f74466c9e889261dd166" +"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.67.0.tar.gz;URL_MD5;e874ea4299bdfa55b74df1ad71fae066" CACHE STRING "Source for Detray, when built as part of this project" ) mark_as_advanced( TRACCC_DETRAY_SOURCE ) diff --git a/tests/common/tests/kalman_fitting_test.hpp b/tests/common/tests/kalman_fitting_test.hpp index 7ad4e35d1a..f71c8e7265 100644 --- a/tests/common/tests/kalman_fitting_test.hpp +++ b/tests/common/tests/kalman_fitting_test.hpp @@ -69,7 +69,8 @@ class KalmanFittingTests // Use deterministic random number generator for testing using uniform_gen_t = - detray::random_numbers>; + detray::detail::random_numbers>; /// Verify that pull distribtions follow the normal distribution /// diff --git a/tests/cpu/test_simulation.cpp b/tests/cpu/test_simulation.cpp index 68d20de473..0d1aab3e28 100644 --- a/tests/cpu/test_simulation.cpp +++ b/tests/cpu/test_simulation.cpp @@ -85,7 +85,8 @@ GTEST_TEST(traccc_simulation, toy_detector_simulation) { // Create track generator using uniform_gen_t = - detray::random_numbers>; + detray::detail::random_numbers>; using generator_type = detray::random_track_generator;