test: Check if we end up in the expected volume in Gen1 Navigator

CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py

@@ -9,6 +9,7 @@
     addPythia8,
     addFatras,
     addDigitization,
+    ParticleSelectorConfig,
 )
 from acts.examples.reconstruction import (
     addSeeding,
@@ -63,6 +64,13 @@
         setup.trackingGeometry,
         setup.field,
         rnd=rnd,
+        preSelectParticles=ParticleSelectorConfig(
+            rho=(0.0, 24 * u.mm),
+            absZ=(0.0, 1.0 * u.m),
+            eta=(-3.0, 3.0),
+            pt=(150 * u.MeV, None),
+            removeNeutral=True,
+        ),
     )
 
     addDigitization(

Core/include/Acts/Propagator/Navigator.hpp

@@ -276,24 +276,6 @@ class Navigator {
           m_cfg.trackingGeometry->highestTrackingVolume();
     }
 
-    // We set the current surface to the start surface
-    // for eventual post-update action, e.g. material integration
-    // or collection when leaving a surface at the start of
-    // an extrapolation process
-    state.navigation.currentSurface = state.navigation.startSurface;
-    if (state.navigation.currentSurface != nullptr) {
-      ACTS_VERBOSE(volInfo(state)
-                   << "Current surface set to start surface "
-                   << state.navigation.currentSurface->geometryId());
-
-      assert(state.navigation.currentSurface->isOnSurface(
-                 state.geoContext, stepper.position(state.stepping),
-                 stepper.direction(state.stepping),
-                 BoundaryTolerance::Infinite(),
-                 state.options.surfaceTolerance) &&
-             "Stepper not on surface");
-    }
-
     // Fast Navigation initialization for start condition:
     // - short-cut through object association, saves navigation in the
     // - geometry and volume tree search for the lowest volume
@@ -302,18 +284,26 @@ class Navigator {
       ACTS_VERBOSE(
           volInfo(state)
           << "Fast start initialization through association from Surface.");
+
       // assign the current layer and volume by association
       state.navigation.startLayer =
           state.navigation.startSurface->associatedLayer();
+      state.navigation.currentLayer = state.navigation.startLayer;
+
       state.navigation.startVolume =
           state.navigation.startLayer->trackingVolume();
+      state.navigation.currentVolume = state.navigation.startVolume;
     } else if (state.navigation.startVolume != nullptr) {
       ACTS_VERBOSE(
           volInfo(state)
           << "Fast start initialization through association from Volume.");
+
+      state.navigation.currentVolume = state.navigation.startVolume;
+
       state.navigation.startLayer =
           state.navigation.startVolume->associatedLayer(
               state.geoContext, stepper.position(state.stepping));
+      state.navigation.currentLayer = state.navigation.startLayer;
     } else {
       ACTS_VERBOSE(volInfo(state)
                    << "Slow start initialization through search.");
@@ -323,15 +313,17 @@ class Navigator {
                    << toString(stepper.position(state.stepping))
                    << " and direction "
                    << toString(stepper.direction(state.stepping)));
+
       state.navigation.startVolume =
           m_cfg.trackingGeometry->lowestTrackingVolume(
               state.geoContext, stepper.position(state.stepping));
-      state.navigation.startLayer =
-          state.navigation.startVolume != nullptr
-              ? state.navigation.startVolume->associatedLayer(
-                    state.geoContext, stepper.position(state.stepping))
-              : nullptr;
+      state.navigation.currentVolume = state.navigation.startVolume;
+
       if (state.navigation.startVolume != nullptr) {
+        state.navigation.startLayer =
+            state.navigation.startVolume->associatedLayer(
+                state.geoContext, stepper.position(state.stepping));
+        state.navigation.currentLayer = state.navigation.startLayer;
         ACTS_VERBOSE(volInfo(state) << "Start volume resolved.");
       } else {
         ACTS_VERBOSE(volInfo(state)
@@ -341,15 +333,41 @@ class Navigator {
       }
     }
 
+    if (state.navigation.startVolume != nullptr) {
+      ACTS_VERBOSE(volInfo(state) << "Start volume resolved.");
+      assert(state.navigation.startVolume->inside(
+                 stepper.position(state.stepping),
+                 state.options.surfaceTolerance) &&
+             "We did not end up inside the volume.");
+    }
+
+    if (state.navigation.startLayer != nullptr) {
+      ACTS_VERBOSE(volInfo(state) << "Start layer resolved "
+                                  << state.navigation.startLayer->geometryId());
+      // We provide the layer to the resolve surface method in this case
+      resolveSurfaces(state, stepper);
+    }
+
     // Set the start volume as current volume
     state.navigation.currentVolume = state.navigation.startVolume;
     // Set the start layer as current layer
     state.navigation.currentLayer = state.navigation.startLayer;
 
-    if (state.navigation.startLayer != nullptr) {
-      ACTS_VERBOSE(volInfo(state) << "Start layer to be resolved.");
-      // We provide the layer to the resolve surface method in this case
-      resolveSurfaces(state, stepper);
+    // We set the current surface to the start surface for eventual post-update
+    // action, e.g. material integration or collection when leaving a surface at
+    // the start of an extrapolation process
+    state.navigation.currentSurface = state.navigation.startSurface;
+    if (state.navigation.currentSurface != nullptr) {
+      ACTS_VERBOSE(volInfo(state)
+                   << "Current surface set to start surface "
+                   << state.navigation.currentSurface->geometryId());
+
+      assert(state.navigation.currentSurface->isOnSurface(
+                 state.geoContext, stepper.position(state.stepping),
+                 stepper.direction(state.stepping),
+                 BoundaryTolerance::Infinite(),
+                 state.options.surfaceTolerance) &&
+             "Stepper not on surface");
     }
   }
 
@@ -551,6 +569,10 @@ class Navigator {
           return;
         } else {
           ACTS_VERBOSE(volInfo(state) << "Volume updated.");
+          assert(state.navigation.currentVolume->inside(
+                     stepper.position(state.stepping),
+                     state.options.surfaceTolerance) &&
+                 "We did not end up inside the volume.");
           // Forget the boundary information
           state.navigation.navBoundaries.clear();
           state.navigation.navBoundaryIndex =