Skip to content

Commit d07fabc

Browse files
authored
Merge pull request #1148 from stephenswat/build/detray_0_103_0
Update detray to v0.103.0
2 parents ba4078e + 8d2a2bd commit d07fabc

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

core/include/traccc/finding/details/combinatorial_kalman_filter_types.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ namespace traccc::details {
3333
/// @tparam bfield_t The type of magnetic field to use
3434
///
3535
template <typename bfield_t>
36-
using ckf_stepper_t =
37-
detray::rk_stepper<bfield_t, traccc::default_algebra,
38-
detray::constrained_step<traccc::scalar>>;
36+
using ckf_stepper_t = detray::rk_stepper<
37+
bfield_t, traccc::default_algebra, detray::constrained_step<traccc::scalar>,
38+
detray::stepper_rk_policy<traccc::scalar>, detray::stepping::void_inspector,
39+
static_cast<std::uint32_t>(
40+
detray::rk_stepper_flags::e_allow_covariance_transport)>;
3941

4042
/// Interactor used in the Combinatorial Kalman Filter (CKF)
4143
using ckf_interactor_t =

core/include/traccc/fitting/details/kalman_fitting_types.hpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@ namespace traccc::details {
2727
///
2828
template <typename detector_t, typename bfield_t>
2929
using kalman_fitter_t = kalman_fitter<
30-
detray::rk_stepper<bfield_t, typename detector_t::algebra_type,
31-
detray::constrained_step<traccc::scalar>>,
30+
detray::rk_stepper<
31+
bfield_t, typename detector_t::algebra_type,
32+
detray::constrained_step<traccc::scalar>,
33+
detray::stepper_rk_policy<traccc::scalar>,
34+
detray::stepping::void_inspector,
35+
static_cast<std::uint32_t>(
36+
detray::rk_stepper_flags::e_allow_covariance_transport)>,
3237
detray::navigator<std::add_const_t<detector_t>>>;
3338

3439
} // namespace traccc::details

extern/detray/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ message( STATUS "Building Detray as part of the TRACCC project" )
1313

1414
# Declare where to get Detray from.
1515
set( TRACCC_DETRAY_SOURCE
16-
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.102.0.tar.gz;URL_MD5;69421d1a0d606be1d627bd1cce7ff0fb"
16+
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.103.0.tar.gz;URL_MD5;7df38072d676b63ee3f0f88bd84c0106"
1717
CACHE STRING "Source for Detray, when built as part of this project" )
1818
mark_as_advanced( TRACCC_DETRAY_SOURCE )
1919
FetchContent_Declare( Detray SYSTEM ${TRACCC_DETRAY_SOURCE} )

0 commit comments

Comments
 (0)