Clenaup configuration and track parameter handling

Author: mpuccio

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/Configuration.h

@@ -114,9 +114,6 @@ struct IterationParameters {
   {
     return getMinSeedingClusters() - ClustersPerCell + 1;
   }
-  int NeighboursPerRoad() const noexcept { return getNSeedingLayers() - 3; }
-  int CellsPerRoad() const noexcept { return getNSeedingLayers() - 2; }
-  int TrackletsPerRoad() const noexcept { return getNSeedingLayers() - 1; }
   IterationSteps PassFlags{IterationStep::FirstPass, IterationStep::RebuildClusterLUT};
   int NLayers = tracking::ITSNLayers;
   bool UseDiamond = false;
@@ -147,11 +144,6 @@ struct IterationParameters {
   bool PerPrimaryVertexProcessing = false;
   bool DoUPCIteration = false;
   bool CreateArtefactLabels{false};
-  // Reserved compatibility storage; top/bottom followers are unused by the common tracker.
-  float TrackFollowerNSigmaCutZ = 1.f;
-  float TrackFollowerNSigmaCutPhi = 1.f;
-  int TrackFollowerMaxHypotheses = 1;
-
   // Track-sharing selections.
   bool AllowSharingFirstCluster = false;
   float SharedClusterMaxDeltaPhi = 0.05f; // Maximum delta phi at a shared cluster.
@@ -274,45 +266,6 @@ TrackingPlan getTrackingPlan(o2::detectors::DetID::ID detId, Type mode);
 
 } // namespace TrackingMode
 
-struct VertexingParameters {
-  std::string asString() const;
-
-  IterationSteps PassFlags{IterationStep::FirstPass, IterationStep::ResetVertices};
-  std::vector<float> LayerZ = {16.333f + 1, 16.333f + 1, 16.333f + 1, 42.140f + 1, 42.140f + 1, 73.745f + 1, 73.745f + 1};
-  std::vector<float> LayerRadii = {2.33959f, 3.14076f, 3.91924f, 19.6213f, 24.5597f, 34.388f, 39.3329f};
-  int vertPerRofThreshold = 0; // Vertices per ROF that trigger a second round.
-  int ColBins = 1;
-  int RowBins = 128;
-  float zCut = -1.f;
-  float phiCut = -1.f;
-  float pairCut = -1.f;
-  float clusterCut = -1.f;
-  float coarseZWindow = -1.f;
-  float seedDedupZCut = -1.f;
-  float refitDedupZCut = -1.f;
-  float duplicateZCut = -1.f;
-  float finalSelectionZCut = -1.f;
-  float duplicateDistance2Cut = -1.f;
-  float tanLambdaCut = -1.f;
-  float NSigmaCut = -1;
-  float maxZPositionAllowed = -1.f;
-  int clusterContributorsCut = -1;
-  int suppressLowMultDebris = -1;
-  int seedMemberRadiusTime = -1;
-  int seedMemberRadiusZ = -1;
-  int maxTrackletsPerCluster = -1;
-  int phiSpan = -1;
-  int zSpan = -1;
-  bool SaveTimeBenchmarks = false;
-
-  bool useTruthSeeding = false; // Replace found vertices with MC events.
-
-  int nThreads = 1;
-  bool PrintMemory = false; // Print allocator usage in the epilog report.
-  size_t MaxMemory = std::numeric_limits<size_t>::max();
-  bool DropTFUponFailure = false;
-};
-
 } // namespace o2::itsmft
 
 namespace o2::itsmft::tracking

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/GenericTrack.h

@@ -65,9 +65,6 @@ struct GenericTrack {
 struct TrackingCandidate {
   TrackSeed seed;
   GenericTrack track{};
-  float phi{0.f};
-  float eta{0.f};
-  double charge{0.};
 
   int getNumberOfClusters() const noexcept { return seed.getActiveLayerCount(); }
   int getClusterIndex(int position) const noexcept { return seed.getCluster(position); }

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/IOUtils.h

@@ -131,14 +131,6 @@ struct ClusterSourceInput {
   RuntimeROFViews rofViews{};
 };
 
-/// Clear and fill a configured frame. On failure, the caller must reset the
-/// frame before reuse; partially loaded data must not be published.
-void loadSources(TimeFrame&, const SurfaceCatalogView&,
-                 gsl::span<const ClusterSourceInput>,
-                 const o2::InteractionRecord&,
-                 std::vector<std::vector<uint32_t>>* externalIndicesBySurface = nullptr,
-                 std::vector<std::vector<uint32_t>>* clusterSizesBySurface = nullptr);
-
 /// Reset, decode, and normalize all sources into a configured TimeFrame.
 /// Invalid input throws. On failure, the caller must reset the frame before
 /// reuse; partially loaded data must not be published.
@@ -150,12 +142,11 @@ void loadTimeFrameSources(TimeFrame&, gsl::span<const ClusterSourceInput>,
 namespace detail
 {
 void prepareSources(TimeFrame&, const SurfaceCatalogView&, gsl::span<const ClusterSourceInput>,
-                    std::vector<std::vector<uint32_t>>*, std::vector<std::vector<uint32_t>>*);
+                    std::vector<std::vector<uint32_t>>*, std::vector<std::vector<uint32_t>>*, bool requireCompleteMapping = false);
 void validateSource(const ClusterSourceInput&, const o2::InteractionRecord&);
 void appendCluster(TimeFrame&, const SurfaceCatalogView&, const ClusterSourceInput&, const DecodedCluster&,
                    uint32_t, uint32_t, std::vector<std::vector<uint32_t>>&, std::vector<std::vector<uint32_t>>&);
-void finishTimeFrameLoading(TimeFrame&, const SurfaceCatalogView&, gsl::span<const ClusterSourceInput>,
-                            const std::vector<std::vector<uint32_t>>&);
+void bindSourceROFNavigation(TimeFrame&, const ClusterSourceInput&, const std::vector<std::vector<int>>&);
 
 // Internal loading loop; geometry decoding and synthetic fixtures share the
 // same stream consumption, diagnostics and measurement insertion.
@@ -164,6 +155,7 @@ void loadDecodedSource(TimeFrame& frame, const SurfaceCatalogView& catalog, cons
                        const Decode& decode, std::vector<std::vector<uint32_t>>& externalIndices,
                        std::vector<std::vector<uint32_t>>& clusterSizes)
 {
+  std::vector<std::vector<int>> boundaries(src.layerToSurface.size(), std::vector<int>(src.rofs.size() + 1, 0));
   auto patterns = src.patterns.begin();
   for (uint32_t r = 0; r < src.rofs.size(); ++r) {
     const auto& rof = src.rofs[r];
@@ -181,10 +173,14 @@ void loadDecodedSource(TimeFrame& frame, const SurfaceCatalogView& catalog, cons
       }
       appendCluster(frame, catalog, src, decoded, r, externalIndex, externalIndices, clusterSizes);
     }
+    for (size_t layer = 0; layer < src.layerToSurface.size(); ++layer) {
+      boundaries[layer][r + 1] = static_cast<int>(externalIndices[src.layerToSurface[layer].value()].size());
+    }
   }
   if (patterns != src.patterns.end()) {
     throw std::runtime_error(std::format("Trailing cluster pattern data source={} rof={} clusterIndex={}", src.id.value(), static_cast<uint32_t>(src.rofs.size()), static_cast<uint32_t>(src.clusters.size())));
   }
+  bindSourceROFNavigation(frame, src, boundaries);
 }
 } // namespace detail
 

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/Propagator.h

@@ -37,11 +37,6 @@ class Propagator
                                 material::MaterialTraversalDirection direction,
                                 bool chi2GateEnabled, float maxChi2, float& chi2) noexcept;
 
-  // Compatibility chi2 for two states in the same surface convention. The
-  // coordinate convention is selected from the states, never by the caller.
-  static bool stateChi2(const SurfaceTrackState& reference, const SurfaceTrackState& candidate,
-                        float& chi2) noexcept;
-
   // Propagate in the state’s current surface convention to its target
   // reference coordinate. Disk transport uses helix propagation for
   // |bz| > 0.01f and linear transport otherwise. Both objects are unchanged

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/TrackerTraits.h

@@ -92,16 +92,14 @@ class TrackerTraits
   bool buildTrackSeed(IterationContext& context, int cellPathId,
                       const CellSeed& cell, TrackSeed& output) const;
 
+  struct RoadSeedEmission;
+
   // Neighbour processing helper; it does not encode a detector layer count.
   template <typename InputSeed>
   void processNeighbours(IterationContext& context, int iteration, CellPathId startingPath,
                          int defaultCellPathId, int startLevel, int currentLevel,
                          const bounded_vector<InputSeed>& currentCellSeed,
-                         const bounded_vector<int>& currentCellId,
-                         const bounded_vector<int>& currentCellPathId,
-                         bounded_vector<TrackSeed>& updatedCellSeed,
-                         bounded_vector<int>& updatedCellId,
-                         bounded_vector<int>& updatedCellPathIds,
+                         bounded_vector<RoadSeedEmission>& updatedCells,
                          const TrackingKernelParameters& params);
 
   std::shared_ptr<tbb::task_arena> mTaskArena;

Detectors/ITSMFT/common/tracking/include/ITSMFTTracking/detail/SurfaceStateOperations.h

@@ -26,7 +26,6 @@ bool rotate(SurfaceTrackState& state, float targetAlpha) noexcept;
 bool propagate(SurfaceTrackState& state, float targetX, float bz) noexcept;
 bool predictedChi2(const SurfaceTrackState& state, const SurfaceMeasurement& measurement, float& chi2) noexcept;
 bool update(SurfaceTrackState& state, const SurfaceMeasurement& measurement, float& chi2) noexcept;
-bool stateChi2(const SurfaceTrackState& reference, const SurfaceTrackState& candidate, float& chi2) noexcept;
 
 #ifndef GPUCA_GPUCODE
 bool rotate(SurfaceTrackState& state, SurfaceTrackParameters& linRef, float targetAlpha, float bz) noexcept;
@@ -42,7 +41,6 @@ bool propagate(SurfaceTrackState& state, SurfaceTrackParameters& linRef,
                float targetZ, float bz) noexcept;
 bool predictedChi2(const SurfaceTrackState& state, const SurfaceMeasurement& measurement, float& chi2) noexcept;
 bool update(SurfaceTrackState& state, const SurfaceMeasurement& measurement, float& chi2) noexcept;
-bool stateChi2(const SurfaceTrackState& reference, const SurfaceTrackState& candidate, float& chi2) noexcept;
 
 #ifndef GPUCA_GPUCODE
 bool shiftReferenceToMeasurement(SurfaceTrackParameters& linRef, const SurfaceMeasurement& measurement) noexcept;

Detectors/ITSMFT/common/tracking/src/Configuration.cxx

@@ -87,16 +87,6 @@ std::string TrackingParameters::asString() const
   return str;
 }
 
-std::string VertexingParameters::asString() const
-{
-  std::string str = std::format("NColB:{} NRowB:{} MinVtxCont:{} SupLowMultDebris:{} MaxTrkltCls:{} ZCut:{} PhCut:{} PairCut:{} ClCut:{} SeedRad:{}x{}",
-                                ColBins, RowBins, clusterContributorsCut, suppressLowMultDebris, maxTrackletsPerCluster, zCut, phiCut, pairCut, clusterCut, seedMemberRadiusTime, seedMemberRadiusZ);
-  if (std::numeric_limits<size_t>::max() != MaxMemory) {
-    str += std::format(" MemLimit {:.2f} GB", double(MaxMemory) / (1024.f * 1024.f * 1024.f));
-  }
-  return str;
-}
-
 void resetDetectorDefaults(TrackingParameters& p, detectors::DetID::ID detId)
 {
   if (detId == detectors::DetID::ITS) {