Merge pull request #1178 from krasznaa/TrackEDMUnification-main-20251104

Track EDM Unification, main branch (2025.11.04.)

Author: krasznaa

benchmarks/cpu/toy_detector_cpu.cpp

@@ -80,10 +80,10 @@ BENCHMARK_DEFINE_F(ToyDetectorBenchmark, CPU)(benchmark::State& state) {
                 vecmem::get_data(params));
 
             // Track fitting with KF
-            auto track_states =
-                host_fitting(det, field,
-                             {vecmem::get_data(track_candidates),
-                              vecmem::get_data(measurements_per_event)});
+            auto track_states = host_fitting(
+                det, field,
+                traccc::edm::track_container<
+                    traccc::default_algebra>::const_data(track_candidates));
         }
     }
 

benchmarks/cuda/toy_detector_cuda.cpp

@@ -117,16 +117,13 @@ BENCHMARK_DEFINE_F(ToyDetectorBenchmark, CUDA)(benchmark::State& state) {
                             seeds_cuda_buffer, B);
 
             // Run CKF track finding
-            traccc::edm::track_candidate_collection<
-                traccc::default_algebra>::buffer track_candidates_cuda_buffer =
+            auto track_candidates_cuda_buffer =
                 device_finding(det_buffer, field, measurements_cuda_buffer,
                                params_cuda_buffer);
 
             // Run track fitting
-            traccc::edm::track_fit_container<traccc::default_algebra>::buffer
-                track_states_cuda_buffer = device_fitting(
-                    det_buffer, field,
-                    {track_candidates_cuda_buffer, measurements_cuda_buffer});
+            auto track_states_cuda_buffer =
+                device_fitting(det_buffer, field, track_candidates_cuda_buffer);
 
             // Create a temporary buffer that will receive the device memory.
             /*auto size = track_states_cuda_buffer.headers.size();

core/CMakeLists.txt

@@ -33,15 +33,15 @@ traccc_add_library( traccc_core core TYPE SHARED
   "include/traccc/edm/impl/spacepoint_collection.ipp"
   "include/traccc/edm/seed_collection.hpp"
   "include/traccc/edm/impl/seed_collection.ipp"
-  "include/traccc/edm/track_candidate_collection.hpp"
-  "include/traccc/edm/impl/track_candidate_collection.ipp"
-  "include/traccc/edm/track_candidate_container.hpp"
   "include/traccc/edm/track_state_collection.hpp"
   "include/traccc/edm/impl/track_state_collection.ipp"
   "include/traccc/edm/track_state_helpers.hpp"
   "include/traccc/edm/impl/track_state_helpers.ipp"
   "include/traccc/edm/track_fit_outcome.hpp"
-  "include/traccc/edm/track_fit_collection.hpp"
+  "include/traccc/edm/track_constituent_link.hpp"
+  "include/traccc/edm/track_collection.hpp"
+  "include/traccc/edm/impl/track_collection.ipp"
+  "include/traccc/edm/track_container.hpp"
   # Magnetic field description.
   "include/traccc/bfield/magnetic_field_types.hpp"
   "include/traccc/bfield/magnetic_field.hpp"

core/include/traccc/ambiguity_resolution/greedy_ambiguity_resolution_algorithm.hpp

@@ -10,8 +10,7 @@
 // Project include(s).
 #include "traccc/ambiguity_resolution/ambiguity_resolution_config.hpp"
 #include "traccc/definitions/primitives.hpp"
-#include "traccc/edm/track_candidate_collection.hpp"
-#include "traccc/edm/track_candidate_container.hpp"
+#include "traccc/edm/track_container.hpp"
 #include "traccc/utils/algorithm.hpp"
 #include "traccc/utils/messaging.hpp"
 
@@ -27,8 +26,8 @@ namespace traccc::host {
 /// greedy approach in the sense that it will remove the track which looks "most
 /// duplicate/fake"
 class greedy_ambiguity_resolution_algorithm
-    : public algorithm<edm::track_candidate_collection<default_algebra>::host(
-          const edm::track_candidate_container<default_algebra>::const_view&)>,
+    : public algorithm<edm::track_container<default_algebra>::host(
+          const edm::track_container<default_algebra>::const_view&)>,
       public messaging {
 
     public:
@@ -44,11 +43,11 @@ class greedy_ambiguity_resolution_algorithm
 
     /// Run the algorithm
     ///
-    /// @param track_candidates the container of found patterns
+    /// @param tracks the container of found patterns
     /// @return the container without ambiguous tracks
     output_type operator()(
-        const edm::track_candidate_container<default_algebra>::const_view&
-            track_candidates) const override;
+        const edm::track_container<default_algebra>::const_view& tracks)
+        const override;
 
     /// Get configuration
     config_type& get_config() { return m_config; }

core/include/traccc/ambiguity_resolution/legacy/greedy_ambiguity_resolution_algorithm.hpp

@@ -23,8 +23,7 @@
 
 // Project include(s).
 #include "traccc/definitions/qualifiers.hpp"
-#include "traccc/edm/track_candidate_collection.hpp"
-#include "traccc/edm/track_candidate_container.hpp"
+#include "traccc/edm/track_container.hpp"
 #include "traccc/utils/algorithm.hpp"
 #include "traccc/utils/messaging.hpp"
 
@@ -46,8 +45,8 @@ namespace traccc::legacy {
 ///     shared hits / hits).
 ///  4) Back to square 1.
 class greedy_ambiguity_resolution_algorithm
-    : public algorithm<edm::track_candidate_collection<default_algebra>::host(
-          const edm::track_candidate_container<default_algebra>::host&)>,
+    : public algorithm<edm::track_container<default_algebra>::host(
+          const edm::track_container<default_algebra>::host&)>,
       public messaging {
 
     public:
@@ -108,9 +107,8 @@ class greedy_ambiguity_resolution_algorithm
     ///
     /// @param track_states the container of the fitted track parameters
     /// @return the container without ambiguous tracks
-    output_type operator()(
-        const edm::track_candidate_container<default_algebra>::host&
-            track_states) const override;
+    output_type operator()(const edm::track_container<default_algebra>::host&
+                               tracks) const override;
 
     /// Get configuration
     config_t& get_config() { return _config; }
@@ -120,13 +118,12 @@ class greedy_ambiguity_resolution_algorithm
     /// information that will later be used to accelerate the ambiguity
     /// resolution.
     ///
-    /// @param track_states The input track container (output of the fitting
-    /// algorithm).
+    /// @param tracks The input track container
     /// @param state An empty state object which is expected to be default
     /// constructed.
-    void compute_initial_state(const edm::track_candidate_container<
-                                   default_algebra>::host& track_states,
-                               state_t& state) const;
+    void compute_initial_state(
+        const edm::track_container<default_algebra>::host& tracks,
+        state_t& state) const;
 
     /// Updates the state iteratively by evicting one track after the other
     /// until the final state conditions are met.

core/include/traccc/edm/impl/track_candidate_collection.ipp

@@ -0,0 +1,32 @@
+/** TRACCC library, part of the ACTS project (R&D line)
+ *
+ * (c) 2022-2025 CERN for the benefit of the ACTS project
+ *
+ * Mozilla Public License Version 2.0
+ */
+
+#pragma once
+
+namespace traccc::edm {
+
+template <typename BASE>
+TRACCC_HOST_DEVICE void track<BASE>::reset_quality() {
+
+    ndf() = {};
+    chi2() = {};
+    pval() = {};
+    nholes() = {};
+}
+
+template <typename BASE>
+template <typename T>
+TRACCC_HOST_DEVICE bool track<BASE>::operator==(const track<T>& other) const {
+
+    return ((fit_outcome() == other.fit_outcome()) &&
+            (params() == other.params()) && (ndf() == other.ndf()) &&
+            (chi2() == other.chi2()) && (pval() == other.pval()) &&
+            (nholes() == other.nholes()) &&
+            (constituent_links() == other.constituent_links()));
+}
+
+}  // namespace traccc::edm