Merge branch 'main' into fix_enum_inner_tube_cover_surface_test

Core/include/Acts/Geometry/SurfaceArrayCreator.hpp

@@ -65,7 +65,7 @@ class SurfaceArrayCreator {
       if (binEdges.empty()) {
         // equidistant
         AxisScalar w = (max - min) / nBins;
-        return std::floor((x - min) / w);
+        return static_cast<size_t>(std::floor((x - min) / w));
       } else {
         // variable
         const auto it =

Core/include/Acts/Material/MaterialComposition.hpp

@@ -106,7 +106,7 @@ class MaterialComposition {
     // compute scale factor into the [0, 256) range
     float scale = float(UINT8_MAX) / float(total);
     for (auto& element : m_elements) {
-      element.m_fraction *= scale;
+      element.m_fraction = static_cast<uint8_t>(element.m_fraction * scale);
     }
   }
 

Core/include/Acts/Material/MaterialGridHelper.hpp

@@ -35,6 +35,8 @@ using MaterialGrid2D =
 using MaterialGrid3D =
     Acts::detail::Grid<Acts::Material::ParametersVector, EAxis, EAxis, EAxis>;
 
+using MaterialGridAxisData = std::tuple<double, double, size_t>;
+
 /// @brief Helper method that creates the cache grid for the mapping. This
 /// grid allows the collection of material at a the anchor points.
 ///
@@ -44,8 +46,8 @@ using MaterialGrid3D =
 /// maximum value, number of bins}
 ///
 /// @return The grid
-Grid2D createGrid(std::array<double, 3> gridAxis1,
-                  std::array<double, 3> gridAxis2);
+Grid2D createGrid(MaterialGridAxisData gridAxis1,
+                  MaterialGridAxisData gridAxis2);
 
 /// @brief Helper method that creates the cache grid for the mapping. This
 /// grid allows the collection of material at a the anchor points.
@@ -57,9 +59,9 @@ Grid2D createGrid(std::array<double, 3> gridAxis1,
 /// maximum value, number of bins}
 ///
 /// @return The grid
-Grid3D createGrid(std::array<double, 3> gridAxis1,
-                  std::array<double, 3> gridAxis2,
-                  std::array<double, 3> gridAxis3);
+Grid3D createGrid(MaterialGridAxisData gridAxis1,
+                  MaterialGridAxisData gridAxis2,
+                  MaterialGridAxisData gridAxis3);
 
 /// @brief return a function that return the coordinate corresponding to type of
 /// bin

Core/include/Acts/Propagator/Navigator.hpp

@@ -159,6 +159,10 @@ class Navigator {
 
     /// The tolerance used to defined "reached"
     double tolerance = s_onSurfaceTolerance;
+
+    /// Wether to perform boundary checks for layer resolving (improves
+    /// navigation for bended tracks)
+    BoundaryCheck boundaryCheckLayerResolving = true;
   };
 
   /// Nested State struct
@@ -1193,8 +1197,9 @@ class Navigator {
     // Create the navigation options
     // - and get the compatible layers, start layer will be excluded
     NavigationOptions<Layer> navOpts(
-        state.stepping.navDir, true, m_cfg.resolveSensitive,
-        m_cfg.resolveMaterial, m_cfg.resolvePassive, startLayer, nullptr);
+        state.stepping.navDir, m_cfg.boundaryCheckLayerResolving,
+        m_cfg.resolveSensitive, m_cfg.resolveMaterial, m_cfg.resolvePassive,
+        startLayer, nullptr);
     // Set also the target surface
     navOpts.targetSurface = state.navigation.targetSurface;
     navOpts.pathLimit =

Core/include/Acts/Seeding/BinnedSPGroup.ipp

@@ -41,7 +41,8 @@ Acts::BinnedSPGroup<external_spacepoint_t>::BinnedSPGroup(
   // create number of bins equal to number of millimeters rMax
   // (worst case minR: configured minR + 1mm)
   // binSizeR allows to increase or reduce numRBins if needed
-  size_t numRBins = (config.rMax + options.beamPos.norm()) / config.binSizeR;
+  size_t numRBins = static_cast<size_t>((config.rMax + options.beamPos.norm()) /
+                                        config.binSizeR);
   std::vector<
       std::vector<std::unique_ptr<InternalSpacePoint<external_spacepoint_t>>>>
       rBins(numRBins);
@@ -72,7 +73,7 @@ Acts::BinnedSPGroup<external_spacepoint_t>::BinnedSPGroup(
         sp, spPosition, options.beamPos, variance);
     // calculate r-Bin index and protect against overflow (underflow not
     // possible)
-    size_t rIndex = isp->radius() / config.binSizeR;
+    size_t rIndex = static_cast<size_t>(isp->radius() / config.binSizeR);
     // if index out of bounds, the SP is outside the region of interest
     if (rIndex >= numRBins) {
       continue;

Core/include/Acts/Seeding/SpacePointGrid.ipp

@@ -87,7 +87,7 @@ Acts::SpacePointGridCreator::createGrid(
 
     // divide 2pi by angle delta to get number of phi-bins
     // size is always 2pi even for regions of interest
-    phiBins = std::ceil(2 * M_PI / deltaPhi);
+    phiBins = static_cast<int>(std::ceil(2 * M_PI / deltaPhi));
     // need to scale the number of phi bins accordingly to the number of
     // consecutive phi bins in the seed making step.
     // Each individual bin should be approximately a fraction (depending on this

Core/include/Acts/Surfaces/detail/FacesHelper.hpp

@@ -67,7 +67,7 @@ struct FacesHelper {
       const std::vector<Vector3>& vertices, bool fullTwoPi = true) {
     FaceVector faces;
     FaceVector triangularMesh;
-    size_t nqfaces = 0.5 * vertices.size();
+    size_t nqfaces = static_cast<size_t>(0.5 * vertices.size());
     size_t reduce = (not fullTwoPi) ? 1 : 0;
     for (size_t iface = 0; iface < nqfaces - reduce; ++iface) {
       size_t p2 = (iface + 1 == nqfaces) ? 0 : iface + 1;
@@ -84,4 +84,4 @@ struct FacesHelper {
 
 }  // namespace detail
 
-}  // namespace Acts
+}  // namespace Acts

Core/include/Acts/Surfaces/detail/VerticesHelper.hpp

@@ -53,7 +53,8 @@ void createSegment(std::vector<vertex_t>& vertices,
                    const vertex_t& offset = vertex_t::Zero(),
                    const transform_t& transform = transform_t::Identity()) {
   // Calculate the number of segments - 1 is the minimum
-  unsigned int segs = std::abs(phi2 - phi1) / (2 * M_PI) * lseg;
+  unsigned int segs =
+      static_cast<unsigned int>(std::abs(phi2 - phi1) / (2 * M_PI) * lseg);
   segs = segs > 0 ? segs : 1;
   ActsScalar phistep = (phi2 - phi1) / segs;
   // Create the segments

Core/include/Acts/TrackFitting/detail/KLMixtureReduction.hpp

@@ -129,10 +129,6 @@ class SymmetricKLDistanceMatrix {
     setAssociated(n, m_mask, [&](std::size_t, std::size_t) { return false; });
   }
 
-  void setAssociatedDistances(std::size_t n, ActsScalar value) {
-    setAssociated(n, m_mask, [&](std::size_t, std::size_t) { return value; });
-  }
-
   auto minDistancePair() const {
     ActsScalar min = std::numeric_limits<ActsScalar>::max();
     std::size_t idx = 0;

Core/include/Acts/Utilities/BinningData.hpp

@@ -490,7 +490,7 @@ class BinningData {
                                               const BinningData& bData) {
     // vanilla
 
-    int bin = ((value - bData.min) / bData.step);
+    int bin = static_cast<int>((value - bData.min) / bData.step);
     // special treatment of the 0 bin for closed
     if (bData.option == closed) {
       if (value < bData.min) {

Core/include/Acts/Utilities/Helpers.hpp

@@ -478,7 +478,7 @@ auto matrixToBitset(const Eigen::PlainObjectBase<Derived>& m) {
 
   auto* p = m.data();
   for (size_t i = 0; i < rows * cols; i++) {
-    res[rows * cols - 1 - i] = p[i];
+    res[rows * cols - 1 - i] = static_cast<bool>(p[i]);
   }
 
   return res;