From 7e42d9ade0d0eccd3ff42587e7b6f5785419a5e0 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Tue, 22 Oct 2024 17:21:55 +0200 Subject: [PATCH] blueprint: Update after nav API change --- Core/src/Geometry/BlueprintNode.cpp | 5 ++--- Examples/Python/src/Blueprint.cpp | 8 +++----- Tests/UnitTests/Core/Geometry/BlueprintNodeTests.cpp | 7 +++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Core/src/Geometry/BlueprintNode.cpp b/Core/src/Geometry/BlueprintNode.cpp index c747b614171d..f11f6ec60a0f 100644 --- a/Core/src/Geometry/BlueprintNode.cpp +++ b/Core/src/Geometry/BlueprintNode.cpp @@ -13,7 +13,7 @@ #include "Acts/Geometry/MaterialDesignatorBlueprintNode.hpp" #include "Acts/Geometry/StaticBlueprintNode.hpp" #include "Acts/Navigation/INavigationPolicy.hpp" -#include "Acts/Navigation/TryAllNavigationPolicies.hpp" +#include "Acts/Navigation/TryAllNavigationPolicy.hpp" #include @@ -58,8 +58,7 @@ void BlueprintNode::Options::validate() const { std::unique_ptr BlueprintNode::Options::makeDefaultNavigationPolicyFactory() { return NavigationPolicyFactory::make() - .add() - .add() + .add() .asUniquePtr(); } diff --git a/Examples/Python/src/Blueprint.cpp b/Examples/Python/src/Blueprint.cpp index 89a13ac4c42f..cc3b545576ba 100644 --- a/Examples/Python/src/Blueprint.cpp +++ b/Examples/Python/src/Blueprint.cpp @@ -106,11 +106,9 @@ void pseudoNavigation(const TrackingGeometry& trackingGeometry, for (std::size_t i = 0; i < 100; i++) { assert(currentVolume != nullptr); main = NavigationStream{}; - - currentVolume->updateNavigationState({.main = main, - .position = position, - .direction = direction, - .logger = logger()}); + AppendOnlyNavigationStream stream{main}; + currentVolume->initializeNavigationCandidates( + {.position = position, .direction = direction}, stream, logger()); ACTS_VERBOSE(main.candidates().size() << " candidates"); diff --git a/Tests/UnitTests/Core/Geometry/BlueprintNodeTests.cpp b/Tests/UnitTests/Core/Geometry/BlueprintNodeTests.cpp index 00d68df5a5f5..b87bbf2130d7 100644 --- a/Tests/UnitTests/Core/Geometry/BlueprintNodeTests.cpp +++ b/Tests/UnitTests/Core/Geometry/BlueprintNodeTests.cpp @@ -207,11 +207,10 @@ void pseudoNavigation(const TrackingGeometry& trackingGeometry, for (std::size_t i = 0; i < 100; i++) { main = NavigationStream{}; + AppendOnlyNavigationStream stream{main}; - currentVolume->updateNavigationState({.main = main, - .position = position, - .direction = direction, - .logger = logger}); + currentVolume->initializeNavigationCandidates( + {.position = position, .direction = direction}, stream, logger); ACTS_VERBOSE(main.candidates().size() << " candidates");