Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump detray version to v0.67.0 #617

Merged
merged 1 commit into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/simulation/simulate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<scalar, std::uniform_real_distribution<scalar>>;
detray::detail::random_numbers<scalar,
std::uniform_real_distribution<scalar>>;
using generator_type =
detray::random_track_generator<traccc::free_track_parameters,
uniform_gen_t>;
Expand Down
3 changes: 2 additions & 1 deletion examples/simulation/simulate_telescope.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<scalar, std::uniform_real_distribution<scalar>>;
detray::detail::random_numbers<scalar,
std::uniform_real_distribution<scalar>>;

// Memory resource
vecmem::host_memory_resource host_mr;
Expand Down
3 changes: 2 additions & 1 deletion examples/simulation/simulate_toy_detector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<scalar, std::uniform_real_distribution<scalar>>;
detray::detail::random_numbers<scalar,
std::uniform_real_distribution<scalar>>;

// Memory resource
vecmem::host_memory_resource host_mr;
Expand Down
3 changes: 2 additions & 1 deletion examples/simulation/simulate_wire_chamber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<scalar, std::uniform_real_distribution<scalar>>;
detray::detail::random_numbers<scalar,
std::uniform_real_distribution<scalar>>;

// Memory resource
vecmem::host_memory_resource host_mr;
Expand Down
2 changes: 1 addition & 1 deletion extern/detray/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
3 changes: 2 additions & 1 deletion tests/common/tests/kalman_fitting_test.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class KalmanFittingTests

// Use deterministic random number generator for testing
using uniform_gen_t =
detray::random_numbers<scalar, std::uniform_real_distribution<scalar>>;
detray::detail::random_numbers<scalar,
std::uniform_real_distribution<scalar>>;

/// Verify that pull distribtions follow the normal distribution
///
Expand Down
3 changes: 2 additions & 1 deletion tests/cpu/test_simulation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ GTEST_TEST(traccc_simulation, toy_detector_simulation) {

// Create track generator
using uniform_gen_t =
detray::random_numbers<scalar, std::uniform_real_distribution<scalar>>;
detray::detail::random_numbers<scalar,
std::uniform_real_distribution<scalar>>;
using generator_type =
detray::random_track_generator<traccc::free_track_parameters,
uniform_gen_t>;
Expand Down
Loading