Skip to content

Commit

Permalink
allow layer search in original volume after fast initialization (#995)
Browse files Browse the repository at this point in the history
  • Loading branch information
asalzburger committed Sep 17, 2021
1 parent 4443cae commit e11d1c4
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Core/include/Acts/Propagator/Navigator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,12 @@ class Navigator {
// this was the last surface, check if we have layers
if (!state.navigation.navLayers.empty()) {
++state.navigation.navLayerIter;
} else if (state.navigation.startLayer != nullptr and
state.navigation.currentSurface->associatedLayer() ==
state.navigation.startLayer) {
// this was the start layer, switch to layer target next
state.navigation.navigationStage = Stage::layerTarget;
return;
} else {
// no layers, go to boundary
state.navigation.navigationStage = Stage::boundaryTarget;
Expand Down Expand Up @@ -423,7 +429,6 @@ class Navigator {
// Find out about the target as much as you can
initializeTarget(state, stepper);
}

// Try targeting the surfaces - then layers - then boundaries
if (state.navigation.navigationStage <= Stage::surfaceTarget and
targetSurfaces(state, stepper)) {
Expand Down Expand Up @@ -603,7 +608,6 @@ class Navigator {
if (state.navigation.navigationBreak) {
return false;
}

// Make sure resolve Surfaces is called on the start layer
if (state.navigation.startLayer and
not state.navigation.startLayerResolved) {
Expand Down Expand Up @@ -716,6 +720,7 @@ class Navigator {
template <typename propagator_state_t, typename stepper_t>
bool targetLayers(propagator_state_t& state, const stepper_t& stepper) const {
using namespace UnitLiterals;

const auto& logger = state.options.logger;

if (state.navigation.navigationBreak ||
Expand Down

0 comments on commit e11d1c4

Please sign in to comment.