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.

Sign up for GitHub

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

Jump to bottom

Update detray to v82 #776

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Update detray to v82 #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bac191
Update detray to v0.82.0
beomki-yeo Nov 19, 2024
c0e6d7a
Merge branch 'main' into update-to-v82
beomki-yeo Nov 21, 2024
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
11 changes: 10 additions & 1 deletion core/include/traccc/finding/actors/ckf_aborter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ struct ckf_aborter : detray::actor {

bool success = false;
unsigned int count = 0;

scalar path_from_surface{0.f};
};

template <typename propagator_state_t>
Expand All @@ -38,14 +40,21 @@ struct ckf_aborter : detray::actor {
auto &stepping = prop_state._stepping;

abrt_state.count++;
abrt_state.path_from_surface += stepping.step_size();

// Abort at the next sensitive surface
if (navigation.is_on_sensitive() &&
stepping.path_from_surface() > abrt_state.min_step_length) {
abrt_state.path_from_surface > abrt_state.min_step_length) {
prop_state._heartbeat &= navigation.abort();
abrt_state.success = true;
}

// Reset path from surface
if (navigation.is_on_sensitive() ||
navigation.encountered_sf_material()) {
abrt_state.path_from_surface = 0.f;
}

if (abrt_state.count > abrt_state.max_count) {
prop_state._heartbeat &= navigation.abort();
}
Expand Down
2 changes: 1 addition & 1 deletion extern/detray/CMakeLists.txt
View file
Open in desktop
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.81.0.tar.gz;URL_MD5;d66d7e95c4c00f9c82999331ab0a8d4c"
"URL;https://github.com/acts-project/detray/archive/refs/tags/v0.82.0.tar.gz;URL_MD5;09d777ce126c547f5c3d4ec509f9a0c0"
CACHE STRING "Source for Detray, when built as part of this project" )

mark_as_advanced( TRACCC_DETRAY_SOURCE )
Expand Down
Loading