chore: update to acts-21.1.0 (part 2)

JugTrack/src/components/TrackParamACTSSeeding.cpp

@@ -13,7 +13,10 @@
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "Acts/Seeding/EstimateTrackParamsFromSeed.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
-#if Acts_VERSION_MAJOR < 21
+#if Acts_VERSION_MAJOR >= 21
+#include "Acts/Seeding/SeedFinderConfig.hpp"
+#include "Acts/Seeding/SeedFinder.hpp"
+#else
 #include "Acts/Seeding/SeedfinderConfig.hpp"
 #include "Acts/Seeding/Seedfinder.hpp"
 namespace Acts {
@@ -22,9 +25,6 @@ namespace Acts {
   template<typename T>
   using SeedFinderConfig = SeedfinderConfig<T>;
 }
-#else
-#include "Acts/Seeding/SeedFinderConfig.hpp"
-#include "Acts/Seeding/SeedFinder.hpp"
 #endif
 
 // Gaudi
@@ -332,14 +332,20 @@ namespace Jug::Reco {
             m_outputInitialTrackParameters.createAndPut();
 
         static SeedContainer seeds;
+#if Acts_VERSION_MAJOR >= 21
+        static Acts::SeedFinder<SpacePoint>::SeedingState state;
+#else
         static Acts::SeedFinder<SpacePoint>::State state;
+#endif
 
         // Sadly, eic::TrackerHit and eic::TrackerHitData are
 	// non-polymorphic
         std::vector<SpacePoint> spacePoint;
         std::vector<const SpacePoint *> spacePointPtrs;
+#if Acts_VERSION_MAJOR < 21
         // extent used to store r range for middle spacepoint
         Acts::Extent rRangeSPExtent;
+#endif
 
         std::shared_ptr<const Acts::TrackingGeometry>
             trackingGeometry = m_geoSvc->trackingGeometry();
@@ -411,7 +417,7 @@ namespace Jug::Reco {
                         << ' ' << spacePointPtrs.back()->measurementIndex()
                         << ' ' << spacePointPtrs.back()->isOnSurface()
                         << endmsg;
-#if 1 // ACTS 19.9
+#if Acts_VERSION_MAJOR < 21
             rRangeSPExtent.extend({ spacePoint.back().x(),
                                     spacePoint.back().y(),
                                     spacePoint.back().z() });
@@ -435,6 +441,11 @@ namespace Jug::Reco {
             debug() << __FILE__ << ':' << __LINE__ << ": " << endmsg;
         }
 
+#if Acts_VERSION_MAJOR >= 21
+        // extent used to store r range for middle spacepoint
+        Acts::Extent rRangeSPExtent;
+#endif
+
         auto bottomBinFinder =
             std::make_shared<Acts::BinFinder<SpacePoint>>(
                 Acts::BinFinder<SpacePoint>(m_cfg.zBinNeighborsBottom,
@@ -482,7 +493,7 @@ namespace Jug::Reco {
                 spacePointPtrs.begin(), spacePointPtrs.end(),
                 extractGlobalQuantities, bottomBinFinder,
                 topBinFinder, std::move(grid),
-#if 0 // ACTS 20.x
+#if Acts_VERSION_MAJOR >= 21
                 rRangeSPExtent,
 #endif
                 m_finderCfg);
@@ -494,7 +505,7 @@ namespace Jug::Reco {
                     << spacePointsGrouping.size() << endmsg;
         }
 
-#if 0 // ACTS 20.x
+#if Acts_VERSION_MAJOR >= 21
         const Acts::Range1D<float> rMiddleSPRange(
             std::floor(rRangeSPExtent.min(Acts::binR) / 2) * 2 +
             m_cfg.deltaRMiddleMinSPRange,
@@ -511,7 +522,12 @@ namespace Jug::Reco {
             finder.createSeedsForGroup(
                 state, std::back_inserter(seeds),
                 group.bottom(), group.middle(), group.top(),
-                rRangeSPExtent);
+#if Acts_VERSION_MAJOR >= 21
+                rMiddleSPRange
+#else
+                rRangeSPExtent
+#endif
+            );
         }
 
         if (msgLevel(MSG::DEBUG)) {