Merge branch 'main' into remove-path-limit-from-navigation

acts-project · Nov 2, 2023 · fc3d52c · fc3d52c
2 parents 3ac4000 + 3fd6166
commit fc3d52c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 64 deletions.
diff --git a/Core/include/Acts/Propagator/DirectNavigator.hpp b/Core/include/Acts/Propagator/DirectNavigator.hpp
@@ -75,6 +75,20 @@ class DirectNavigator {
         // Initialize the surface sequence
         state.navigation.navSurfaces = navSurfaces;
         state.navigation.navSurfaceIter = state.navigation.navSurfaces.begin();
+
+        // In case the start surface is in the list of nav surfaces
+        // we need to correct the iterator to point to the next surface
+        // in the vector
+        if (state.navigation.startSurface) {
+          auto surfaceIter = std::find(state.navigation.navSurfaces.begin(),
+                                       state.navigation.navSurfaces.end(),
+                                       state.navigation.startSurface);
+          // if current surface in the list, point to the next surface
+          if (surfaceIter != state.navigation.navSurfaces.end()) {
+            state.navigation.navSurfaceIter = ++surfaceIter;
+          }
+        }
+
         r.initialized = true;
       }
     }

diff --git a/Core/include/Acts/Propagator/Navigator.hpp b/Core/include/Acts/Propagator/Navigator.hpp
@@ -675,7 +675,7 @@ class Navigator {
                    << " surfaces remain to try.");
       const auto& intersection = state.navigation.navSurface();
       // Take the surface
-      auto surface = intersection.object();
+      const auto* surface = intersection.object();
       // Screen output which surface you are on
       ACTS_VERBOSE(volInfo(state) << "Next surface candidate will be "
                                   << surface->geometryId());
@@ -845,7 +845,7 @@ class Navigator {
            state.navigation.navLayers.size()) {
       const auto& intersection = state.navigation.navLayer();
       // The layer surface
-      auto layerSurface = intersection.representation();
+      const auto* layerSurface = intersection.representation();
       // We are on the layer
       if (state.navigation.currentSurface == layerSurface) {
         ACTS_VERBOSE(volInfo(state) << "We are on a layer, resolve Surfaces.");
@@ -1000,7 +1000,7 @@ class Navigator {
            state.navigation.navBoundaries.size()) {
       const auto& intersection = state.navigation.navBoundary();
       // That is the current boundary surface
-      auto boundarySurface = intersection.representation();
+      const auto* boundarySurface = intersection.representation();
       // Step towards the boundary surfrace
       auto boundaryStatus = stepper.updateSurfaceStatus(
           state.stepping, *boundarySurface, intersection.index(),

diff --git a/Tests/UnitTests/Core/Utilities/FpeMonitorTests.cpp b/Tests/UnitTests/Core/Utilities/FpeMonitorTests.cpp
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,10 @@
 linkcheck_ignore = [
     r"https://doi.org/.*",
     r"https://cernvm.cern.ch/.*",
-    r"https://tavianator.com/.*",
     r"http://eigen.tuxfamily.org.*",
     r"https://pythia.org.*",
+    r"https://lcginfo.cern.ch/.*",
+    r"https://.*\.?intel.com/.*",
 ]
 
 # -- Options for HTML output --------------------------------------------------

diff --git a/docs/getting_started.md b/docs/getting_started.md
@@ -36,7 +36,7 @@ components:
 -   [Doxygen](http://doxygen.org) >= 1.8.15 for the documentation
 -   [Geant4](http://geant4.org/) for some examples
 -   [HepMC](https://gitlab.cern.ch/hepmc/HepMC3) >= 3.2.1 for some examples
--   [Intel Threading Building Blocks](https://01.org/tbb) >= 2020.1 for the examples
+-   [Intel Threading Building Blocks](https://github.com/oneapi-src/oneTBB) >= 2020.1 for the examples
 -   [ONNX Runtime](https://onnxruntime.ai/) >= 1.12.0 for the ONNX plugin, the Exa.TrkX plugin and some examples
 -   [Pythia8](https://pythia.org) for some examples
 -   [ROOT](https://root.cern.ch) >= 6.20 for the TGeo plugin and the examples