feat!: Updating the cuts in ScoreBased Solver to eta based cuts.

Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp

@@ -38,6 +38,7 @@ namespace Acts {
 /// enough hits
 /// 5) Remove tracks that are not good enough based on cuts Contains method for
 /// data preparations
+
 class ScoreBasedAmbiguityResolution {
  public:
   /// @brief Detector configuration struct : contains the configuration for each detector
@@ -50,11 +51,23 @@ class ScoreBasedAmbiguityResolution {
     int outliersScoreWeight = 0;
     int otherScoreWeight = 0;
 
-    std::size_t minHits = 0;
+    // the eta bins for the detector
+    std::vector<double> etaBins = {-5, 5};
+
+    // the minimum number of hits for each detector for each eta bin
+    std::vector<std::size_t> minHitsPerEta = {0};
+
+    // the maximum number of holes for each detector for each eta bin
+    std::vector<std::size_t> maxHolesPerEta = {0};
+
+    // the maximum number of outliers for each detector for each eta bin
+    std::vector<std::size_t> maxOutliersPerEta = {0};
+
+    // the maximum number of shared hits for each detector for each eta bin
+    std::vector<std::size_t> maxSharedHitsPerEta = {0};
+
     std::size_t maxHits = 0;
     std::size_t maxHoles = 0;
-    std::size_t maxOutliers = 0;
-    std::size_t maxSharedHits = 0;
 
     /// if true, the shared hits are considered as bad hits for this detector
     bool sharedHitsFlag = false;
@@ -107,15 +120,8 @@ class ScoreBasedAmbiguityResolution {
     std::size_t maxSharedTracksPerMeasurement = 10;
     /// maximum number of shared hit per track
     std::size_t maxShared = 5;
-
-    double pTMin = 0 * UnitConstants::GeV;
-    double pTMax = 1e5 * UnitConstants::GeV;
-
-    double phiMin = -std::numbers::pi * UnitConstants::rad;
-    double phiMax = std::numbers::pi * UnitConstants::rad;
-
-    double etaMin = -5;
-    double etaMax = 5;
+    /// minimum number of unshared hits per track
+    std::size_t minUnshared = 5;
 
     // if true, the ambiguity score is computed based on a different function.
     bool useAmbiguityFunction = false;
@@ -185,6 +191,16 @@ class ScoreBasedAmbiguityResolution {
       const OptionalCuts<typename track_container_t::ConstTrackProxy>&
           optionalCuts = {}) const;
 
+  /// Rejects Tracks based on eta dependent cuts.
+  ///
+  /// @param detector is the detector configuration object
+  /// @param trackFeatures is the trackFeatures object for a specific detector
+  /// @param eta is the eta of the track
+  /// @return true if the track is rejected, false otherwise
+  bool etaBasedCuts(const DetectorConfig& detector,
+                    const TrackFeatures& trackFeatures,
+                    const double& eta) const;
+
   /// Remove hits that are not good enough for each track and removes tracks
   /// that have a score below a certain threshold or not enough hits.
   ///

Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.ipp

@@ -89,40 +89,7 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::simpleScore(
     // get the trackFeatures map for the track
     const auto& trackFeaturesVector = trackFeaturesVectors[iTrack];
     double score = 1;
-    auto pT = Acts::VectorHelpers::perp(track.momentum());
     auto eta = Acts::VectorHelpers::eta(track.momentum());
-    auto phi = Acts::VectorHelpers::phi(track.momentum());
-    // cuts on pT
-    if (pT < m_cfg.pTMin || pT > m_cfg.pTMax) {
-      score = 0;
-      iTrack++;
-      trackScore.push_back(score);
-      ACTS_DEBUG("Track: " << iTrack
-                           << " has score = 0, due to pT cuts --- pT = " << pT);
-      continue;
-    }
-
-    // cuts on phi
-    if (phi > m_cfg.phiMax || phi < m_cfg.phiMin) {
-      score = 0;
-      iTrack++;
-      trackScore.push_back(score);
-      ACTS_DEBUG("Track: " << iTrack
-                           << " has score = 0, due to phi cuts --- phi =  "
-                           << phi);
-      continue;
-    }
-
-    // cuts on eta
-    if (eta > m_cfg.etaMax || eta < m_cfg.etaMin) {
-      score = 0;
-      iTrack++;
-      trackScore.push_back(score);
-      ACTS_DEBUG("Track: " << iTrack
-                           << " has score = 0, due to eta cuts --- eta =  "
-                           << eta);
-      continue;
-    }
 
     // cuts on optional cuts
     for (const auto& cutFunction : optionalCuts.cuts) {
@@ -140,22 +107,22 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::simpleScore(
       ACTS_DEBUG("Track: " << iTrack << " score : " << score);
       continue;
     }
+
     // Reject tracks which didn't pass the detector cuts.
     for (std::size_t detectorId = 0; detectorId < m_cfg.detectorConfigs.size();
          detectorId++) {
       const auto& detector = m_cfg.detectorConfigs.at(detectorId);
 
       const auto& trackFeatures = trackFeaturesVector[detectorId];
 
-      ACTS_DEBUG("---> Found summary information");
-      ACTS_DEBUG("---> Detector ID: " << detectorId);
-      ACTS_DEBUG("---> Number of hits: " << trackFeatures.nHits);
-      ACTS_DEBUG("---> Number of holes: " << trackFeatures.nHoles);
-      ACTS_DEBUG("---> Number of outliers: " << trackFeatures.nOutliers);
+      ACTS_VERBOSE("---> Found summary information");
+      ACTS_VERBOSE("---> Detector ID: " << detectorId);
+      ACTS_VERBOSE("---> Number of hits: " << trackFeatures.nHits);
+      ACTS_VERBOSE("---> Number of holes: " << trackFeatures.nHoles);
+      ACTS_VERBOSE("---> Number of outliers: " << trackFeatures.nOutliers);
 
-      if ((trackFeatures.nHits < detector.minHits) ||
-          (trackFeatures.nHoles > detector.maxHoles) ||
-          (trackFeatures.nOutliers > detector.maxOutliers)) {
+      // eta based cuts
+      if (etaBasedCuts(detector, trackFeatures, eta)) {
         score = 0;
         ACTS_DEBUG("Track: " << iTrack
                              << " has score = 0, due to detector cuts");
@@ -170,9 +137,7 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::simpleScore(
       continue;
     }
 
-    // real scoring starts here
-    // if the ambiguity scoring function is used, the score is processed with a
-    // different algorithm than the simple score.
+    // All cuts passed, now start scoring the track
 
     ACTS_VERBOSE("Using Simple Scoring function");
 
@@ -241,38 +206,6 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::ambiguityScore(
     double score = 1;
     auto pT = Acts::VectorHelpers::perp(track.momentum());
     auto eta = Acts::VectorHelpers::eta(track.momentum());
-    auto phi = Acts::VectorHelpers::phi(track.momentum());
-    // cuts on pT
-    if (pT < m_cfg.pTMin || pT > m_cfg.pTMax) {
-      score = 0;
-      iTrack++;
-      trackScore.push_back(score);
-      ACTS_DEBUG("Track: " << iTrack
-                           << " has score = 0, due to pT cuts --- pT = " << pT);
-      continue;
-    }
-
-    // cuts on phi
-    if (phi > m_cfg.phiMax || phi < m_cfg.phiMin) {
-      score = 0;
-      iTrack++;
-      trackScore.push_back(score);
-      ACTS_DEBUG("Track: " << iTrack
-                           << " has score = 0, due to phi cuts --- phi =  "
-                           << phi);
-      continue;
-    }
-
-    // cuts on eta
-    if (eta > m_cfg.etaMax || eta < m_cfg.etaMin) {
-      score = 0;
-      iTrack++;
-      trackScore.push_back(score);
-      ACTS_DEBUG("Track: " << iTrack
-                           << " has score = 0, due to eta cuts --- eta =  "
-                           << eta);
-      continue;
-    }
 
     // cuts on optional cuts
     for (const auto& cutFunction : optionalCuts.cuts) {
@@ -290,22 +223,22 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::ambiguityScore(
       ACTS_DEBUG("Track: " << iTrack << " score : " << score);
       continue;
     }
+
     // Reject tracks which didn't pass the detector cuts.
     for (std::size_t detectorId = 0; detectorId < m_cfg.detectorConfigs.size();
          detectorId++) {
       const auto& detector = m_cfg.detectorConfigs.at(detectorId);
 
       const auto& trackFeatures = trackFeaturesVector[detectorId];
 
-      ACTS_DEBUG("---> Found summary information");
-      ACTS_DEBUG("---> Detector ID: " << detectorId);
-      ACTS_DEBUG("---> Number of hits: " << trackFeatures.nHits);
-      ACTS_DEBUG("---> Number of holes: " << trackFeatures.nHoles);
-      ACTS_DEBUG("---> Number of outliers: " << trackFeatures.nOutliers);
+      ACTS_VERBOSE("---> Found summary information");
+      ACTS_VERBOSE("---> Detector ID: " << detectorId);
+      ACTS_VERBOSE("---> Number of hits: " << trackFeatures.nHits);
+      ACTS_VERBOSE("---> Number of holes: " << trackFeatures.nHoles);
+      ACTS_VERBOSE("---> Number of outliers: " << trackFeatures.nOutliers);
 
-      if ((trackFeatures.nHits < detector.minHits) ||
-          (trackFeatures.nHoles > detector.maxHoles) ||
-          (trackFeatures.nOutliers > detector.maxOutliers)) {
+      // eta based cuts
+      if (etaBasedCuts(detector, trackFeatures, eta)) {
         score = 0;
         ACTS_DEBUG("Track: " << iTrack
                              << " has score = 0, due to detector cuts");
@@ -320,6 +253,8 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::ambiguityScore(
       continue;
     }
 
+    // All cuts passed, now start scoring the track
+
     // start with larger score for tracks with higher pT.
     score = std::log10(pT / UnitConstants::MeV) - 1.;
     // pT in GeV, hence 100 MeV is minimum and gets score = 1
@@ -370,6 +305,7 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::ambiguityScore(
                                         << " is : " << fac
                                         << "  New score now: " << score);
     }
+
     iTrack++;
 
     // Add the score to the vector
@@ -451,11 +387,19 @@ std::vector<int> Acts::ScoreBasedAmbiguityResolution::solveAmbiguity(
     // Check if the track has too many shared hits to be accepted.
     auto trackFeaturesVector = trackFeaturesVectors.at(iTrack);
     bool trkCouldBeAccepted = true;
+    double eta = Acts::VectorHelpers::eta(track.momentum());
+
     for (std::size_t detectorId = 0; detectorId < m_cfg.detectorConfigs.size();
          detectorId++) {
       auto detector = m_cfg.detectorConfigs.at(detectorId);
+
+      std::vector<double> etaBins = detector.etaBins;
+
+      auto it = std::upper_bound(etaBins.begin(), etaBins.end(), eta);
+      std::size_t etaBin = std::distance(etaBins.begin(), it) - 1;
+
       if (trackFeaturesVector[detectorId].nSharedHits >
-          detector.maxSharedHits) {
+          detector.maxSharedHitsPerEta[etaBin]) {
         trkCouldBeAccepted = false;
         break;
       }
@@ -470,7 +414,7 @@ std::vector<int> Acts::ScoreBasedAmbiguityResolution::solveAmbiguity(
         nTracksPerMeasurement, optionalHitSelections);
     if (trkCouldBeAccepted) {
       cleanTrackIndex++;
-      if (trackScore[iTrack] >= m_cfg.minScore) {
+      if (trackScore[iTrack] > m_cfg.minScore) {
         goodTracks.push_back(track.index());
       }
     }
@@ -541,6 +485,18 @@ bool Acts::ScoreBasedAmbiguityResolution::getCleanedOutTracks(
         ACTS_DEBUG("Track state has no reference surface");
         continue;
       }
+
+      std::size_t ivolume = ts.referenceSurface().geometryId().volume();
+      auto volume_it = m_cfg.volumeMap.find(ivolume);
+      if (volume_it == m_cfg.volumeMap.end()) {
+        ACTS_ERROR("Volume " << ivolume << "not found in the volume map");
+        continue;
+      }
+
+      std::size_t detectorID = volume_it->second;
+
+      const auto& detector = m_cfg.detectorConfigs.at(detectorID);
+
       measurement = measurementsPerTrack[index];
 
       auto it = nTracksPerMeasurement.find(measurement);
@@ -573,7 +529,8 @@ bool Acts::ScoreBasedAmbiguityResolution::getCleanedOutTracks(
       else {
         ACTS_DEBUG("Try to recover shared hit ");
         if (nTracksShared <= m_cfg.maxSharedTracksPerMeasurement &&
-            trackScore > m_cfg.minScoreSharedTracks) {
+            trackScore > m_cfg.minScoreSharedTracks &&
+            !detector.sharedHitsFlag) {
           ACTS_DEBUG("Accepted hit shared with " << nTracksShared << " tracks");
           newMeasurementsPerTrack.push_back(measurement);
           nshared++;
@@ -585,7 +542,7 @@ bool Acts::ScoreBasedAmbiguityResolution::getCleanedOutTracks(
     }
   }
   // Check if the track has enough hits to be accepted.
-  if (newMeasurementsPerTrack.size() < 3) {
+  if (newMeasurementsPerTrack.size() < m_cfg.minUnshared) {
     return false;
   } else {
     return true;

Core/src/AmbiguityResolution/ScoreBasedAmbiguityResolution.cpp

@@ -7,3 +7,18 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp"
+
+bool Acts::ScoreBasedAmbiguityResolution::etaBasedCuts(
+    const DetectorConfig& detector, const TrackFeatures& trackFeatures,
+    const double& eta) const {
+  std::vector<double> etaBins = detector.etaBins;
+
+  auto it = std::upper_bound(etaBins.begin(), etaBins.end(), eta);
+  if (it == etaBins.begin() || it == etaBins.end()) {
+    return false;  // eta out of range
+  }
+  std::size_t etaBin = std::distance(etaBins.begin(), it) - 1;
+  return (trackFeatures.nHits < detector.minHitsPerEta[etaBin] ||
+          trackFeatures.nHoles > detector.maxHolesPerEta[etaBin] ||
+          trackFeatures.nOutliers > detector.maxOutliersPerEta[etaBin]);
+}

Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/ScoreBasedAmbiguityResolutionAlgorithm.hpp

@@ -54,14 +54,8 @@ class ScoreBasedAmbiguityResolutionAlgorithm final : public IAlgorithm {
     // maximum number of shared hit per track
     std::size_t maxShared = 5;
 
-    double pTMin = 0 * Acts::UnitConstants::GeV;
-    double pTMax = 1e5 * Acts::UnitConstants::GeV;
-
-    double phiMin = -std::numbers::pi * Acts::UnitConstants::rad;
-    double phiMax = std::numbers::pi * Acts::UnitConstants::rad;
-
-    double etaMin = -5;
-    double etaMax = 5;
+    // minimum number of unshared hits per track
+    std::size_t minUnshared = 5;
 
     bool useAmbiguityFunction = false;
   };

Examples/Algorithms/AmbiguityResolution/src/ScoreBasedAmbiguityResolutionAlgorithm.cpp

@@ -44,12 +44,7 @@ Acts::ScoreBasedAmbiguityResolution::Config transformConfig(
   result.minScoreSharedTracks = cfg.minScoreSharedTracks;
   result.maxSharedTracksPerMeasurement = cfg.maxSharedTracksPerMeasurement;
   result.maxShared = cfg.maxShared;
-  result.pTMin = cfg.pTMin;
-  result.pTMax = cfg.pTMax;
-  result.phiMin = cfg.phiMin;
-  result.phiMax = cfg.phiMax;
-  result.etaMin = cfg.etaMin;
-  result.etaMax = cfg.etaMax;
+  result.minUnshared = cfg.minUnshared;
   result.useAmbiguityFunction = cfg.useAmbiguityFunction;
   return result;
 }

Examples/Python/python/acts/examples/reconstruction.py

@@ -216,16 +216,11 @@ def trackSelectorDefaultKWArgs(c):
         "minScore",
         "minScoreSharedTracks",
         "maxShared",
+        "minUnshared",
         "maxSharedTracksPerMeasurement",
-        "pTMax",
-        "pTMin",
-        "phiMax",
-        "phiMin",
-        "etaMax",
-        "etaMin",
         "useAmbiguityFunction",
     ],
-    defaults=[None] * 11,
+    defaults=[None] * 6,
 )
 
 AmbiguityResolutionMLConfig = namedtuple(
@@ -1922,11 +1917,8 @@ def addScoreBasedAmbiguityResolution(
             minScore=config.minScore,
             minScoreSharedTracks=config.minScoreSharedTracks,
             maxShared=config.maxShared,
+            minUnshared=config.minUnshared,
             maxSharedTracksPerMeasurement=config.maxSharedTracksPerMeasurement,
-            phiMax=config.phiMax,
-            phiMin=config.phiMin,
-            etaMax=config.etaMax,
-            etaMin=config.etaMin,
             useAmbiguityFunction=config.useAmbiguityFunction,
         ),
     )