Merge branch 'main' into ci/update-exatrkx-images-v43

acts-project · Oct 19, 2023 · 45e6a7d · 45e6a7d
2 parents 2e54b45 + 35ec532
commit 45e6a7d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.cpp b/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.cpp
@@ -143,6 +143,11 @@ ActsExamples::ProcessCode ActsExamples::CKFPerformanceWriter::writeT(
   const auto& particles = m_inputParticles(ctx);
   const auto& hitParticlesMap = m_inputMeasurementParticlesMap(ctx);
 
+  std::map<ActsFatras::Barcode, std::size_t> particleTruthHitCount;
+  for (const auto& [_, pid] : hitParticlesMap) {
+    particleTruthHitCount[pid]++;
+  }
+
   // Counter of truth-matched reco tracks
   std::map<ActsFatras::Barcode, std::vector<RecoTrackInfo>> matched;
   // Counter of truth-unmatched reco tracks
@@ -183,7 +188,7 @@ ActsExamples::ProcessCode ActsExamples::CKFPerformanceWriter::writeT(
       identifyContributingParticles(hitParticlesMap, traj, trackTip,
                                     particleHitCounts);
       if (particleHitCounts.empty()) {
-        ACTS_WARNING(
+        ACTS_DEBUG(
             "No truth particle associated with this trajectory with entry "
             "index = "
             << trackTip);
@@ -198,15 +203,26 @@ ActsExamples::ProcessCode ActsExamples::CKFPerformanceWriter::writeT(
 
       // Check if the trajectory is matched with truth.
       // If not, it will be classified as 'fake'
+      const bool recoMatched =
+          static_cast<float>(nMajorityHits) / trajState.nMeasurements >=
+          m_cfg.truthMatchProbMin;
+      const bool truthMatched =
+          static_cast<float>(nMajorityHits) /
+              particleTruthHitCount.at(majorityParticleId) >=
+          m_cfg.truthMatchProbMin;
+
       bool isFake = false;
-      if (nMajorityHits * 1. / trajState.nMeasurements >=
-          m_cfg.truthMatchProbMin) {
+      if (not m_cfg.doubleMatching and recoMatched) {
+        matched[majorityParticleId].push_back(
+            {nMajorityHits, fittedParameters});
+      } else if (m_cfg.doubleMatching and recoMatched and truthMatched) {
         matched[majorityParticleId].push_back(
             {nMajorityHits, fittedParameters});
       } else {
         isFake = true;
         unmatched[majorityParticleId]++;
       }
+
       // Fill fake rate plots
       m_fakeRatePlotTool.fill(m_fakeRatePlotCache, fittedParameters, isFake);
 

diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.hpp b/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.hpp
@@ -66,6 +66,9 @@ class CKFPerformanceWriter final : public WriterT<TrajectoriesContainer> {
     DuplicationPlotTool::Config duplicationPlotToolConfig;
     TrackSummaryPlotTool::Config trackSummaryPlotToolConfig;
 
+    /// Whether to do double matching or not
+    bool doubleMatching = false;
+
     /// Min reco-truth matching probability
     double truthMatchProbMin = 0.5;