Skip to content

Commit f16e1a4

Browse files
authored
Update detray to v0.90.0 (#907)
1 parent 6fee5ca commit f16e1a4

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

Diff for: core/include/traccc/fitting/kalman_filter/kalman_fitter.hpp

+7-10
Original file line numberDiff line numberDiff line change
@@ -106,26 +106,23 @@ class kalman_fitter {
106106

107107
/// @return the actor chain state
108108
TRACCC_HOST_DEVICE
109-
typename actor_chain_type::state operator()() {
110-
return detray::tie(m_aborter_state, m_transporter_state,
111-
m_interactor_state, m_fit_actor_state,
112-
m_resetter_state, m_step_aborter_state);
109+
typename actor_chain_type::state_ref_tuple operator()() {
110+
return detray::tie(m_aborter_state, m_interactor_state,
111+
m_fit_actor_state, m_step_aborter_state);
113112
}
114113

115114
/// @return the actor chain state
116115
TRACCC_HOST_DEVICE
117-
typename backward_actor_chain_type::state backward_actor_state() {
118-
return detray::tie(m_aborter_state, m_transporter_state,
119-
m_fit_actor_state, m_interactor_state,
120-
m_resetter_state, m_step_aborter_state);
116+
typename backward_actor_chain_type::state_ref_tuple
117+
backward_actor_state() {
118+
return detray::tie(m_aborter_state, m_fit_actor_state,
119+
m_interactor_state, m_step_aborter_state);
121120
}
122121

123122
/// Individual actor states
124123
typename aborter::state m_aborter_state{};
125-
typename transporter::state m_transporter_state{};
126124
typename interactor::state m_interactor_state{};
127125
typename fit_actor::state m_fit_actor_state;
128-
typename resetter::state m_resetter_state{};
129126
kalman_step_aborter::state m_step_aborter_state{};
130127

131128
/// Fitting result per track

Diff for: device/common/include/traccc/finding/device/impl/propagate_to_next_surface.ipp

+7-9
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,15 @@ TRACCC_DEVICE inline void propagate_to_next_surface(
9090
// Actor state
9191
// @TODO: simplify the syntax here
9292
// @NOTE: Post material interaction might be required here
93-
using actor_list_type =
94-
typename propagator_t::actor_chain_type::actor_list_type;
95-
typename detray::detail::tuple_element<0, actor_list_type>::type::state
93+
using actor_tuple_type =
94+
typename propagator_t::actor_chain_type::actor_tuple;
95+
typename detray::detail::tuple_element<0, actor_tuple_type>::type::state
9696
s0{};
97-
typename detray::detail::tuple_element<1, actor_list_type>::type::state
98-
s1{};
99-
typename detray::detail::tuple_element<3, actor_list_type>::type::state
97+
typename detray::detail::tuple_element<3, actor_tuple_type>::type::state
10098
s3{};
101-
typename detray::detail::tuple_element<2, actor_list_type>::type::state s2{
99+
typename detray::detail::tuple_element<2, actor_tuple_type>::type::state s2{
102100
s3};
103-
typename detray::detail::tuple_element<4, actor_list_type>::type::state s4;
101+
typename detray::detail::tuple_element<4, actor_tuple_type>::type::state s4;
104102
s4.min_step_length = cfg.min_step_length_for_next_surface;
105103
s4.max_count = cfg.max_step_counts_for_next_surface;
106104

@@ -109,7 +107,7 @@ TRACCC_DEVICE inline void propagate_to_next_surface(
109107
propagation._navigation.set_volume(in_par.surface_link().volume());
110108

111109
// Propagate to the next surface
112-
propagator.propagate_sync(propagation, detray::tie(s0, s1, s2, s3, s4));
110+
propagator.propagate_sync(propagation, detray::tie(s0, s2, s3, s4));
113111

114112
// If a surface found, add the parameter for the next step
115113
if (s4.success) {

Diff for: extern/detray/CMakeLists.txt

+1-1
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.89.0.tar.gz;URL_MD5;98be1be806c52db1f6a17ccdc0495272"
16+
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.90.0.tar.gz;URL_MD5;330432ab2ad697cfa4a122c81c08cf5c"
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)