Backup

io/CMakeLists.txt

@@ -53,6 +53,7 @@ traccc_add_library( traccc_io io TYPE SHARED
   "src/read_binary.hpp"
   "src/write_binary.hpp"
   "src/details/read_surfaces.cpp"
+  "src/csv/cell.cpp"
   "src/csv/make_surface_reader.cpp"
   "src/csv/read_surfaces.hpp"
   "src/csv/read_surfaces.cpp"

io/include/traccc/io/csv/cell.hpp

@@ -25,11 +25,12 @@ struct cell {
     float timestamp = 0.;
     float value = 0.;
 
-    auto operator<=>(const cell& other) const = default;
-
     // geometry_id,measurement_id,channel0,channel1,timestamp,value
     DFE_NAMEDTUPLE(cell, geometry_id, measurement_id, channel0, channel1,
                    timestamp, value);
 };
 
+bool operator<(const cell& lhs, const cell& rhs);
+bool operator==(const cell& lhs, const cell& rhs);
+
 }  // namespace traccc::io::csv

io/include/traccc/io/csv/make_measurement_edm.hpp

@@ -23,6 +23,6 @@ namespace traccc::io::csv {
 ///
 traccc::measurement make_measurement_edm(
     const traccc::io::csv::measurement& csv_meas,
-    std::map<geometry_id, geometry_id>* acts_to_detray_id);
+    const std::map<geometry_id, geometry_id>* acts_to_detray_id);
 
 }  // namespace traccc::io::csv

io/src/csv/make_measurement_edm.cpp

@@ -15,7 +15,7 @@ namespace traccc::io::csv {
 
 traccc::measurement make_measurement_edm(
     const traccc::io::csv::measurement& csv_meas,
-    std::map<geometry_id, geometry_id>* acts_to_detray_id) {
+    const std::map<geometry_id, geometry_id>* acts_to_detray_id) {
 
     // Construct the measurement object.
     traccc::measurement meas;

performance/CMakeLists.txt

@@ -31,10 +31,12 @@ traccc_add_library( traccc_performance performance TYPE SHARED
    "src/resolution/stat_plot_tool.hpp"
    "src/resolution/stat_plot_tool.cpp"
    # Utils
+   "include/traccc/utils/event_data.hpp"
+   "src/utils/event_data.cpp"
    "include/traccc/utils/ranges.hpp"
    "include/traccc/utils/helpers.hpp"
    "src/utils/helpers.hpp"
-   "src/utils/helpers.cpp"
+   "src/utils/helpers.cpp"  
    # Value/object comparison code.
    "include/traccc/performance/details/is_same_angle.hpp"
    "src/performance/details/is_same_angle.cpp"
@@ -64,7 +66,7 @@ traccc_add_library( traccc_performance performance TYPE SHARED
    "include/traccc/performance/throughput.hpp"
    "src/performance/throughput.cpp" )
 target_link_libraries( traccc_performance
-   PUBLIC traccc::core traccc::io covfie::core detray::test_utils )
+   PUBLIC traccc::core traccc::io covfie::core detray::test_utils dfelibs::dfelibs)
 
 # Use ROOT in traccc::performance, if requested.
 if( TRACCC_USE_ROOT )

performance/include/traccc/efficiency/finding_performance_writer.hpp

@@ -13,7 +13,7 @@
 // Project include(s).
 #include "traccc/edm/track_candidate.hpp"
 #include "traccc/edm/track_state.hpp"
-#include "traccc/io/event_data.hpp"
+#include "traccc/utils/event_data.hpp"
 
 // System include(s).
 #include <map>

performance/include/traccc/efficiency/nseed_performance_writer.hpp

@@ -17,7 +17,7 @@
 #include <traccc/edm/spacepoint.hpp>
 #include <traccc/efficiency/track_filter.hpp>
 #include <traccc/efficiency/track_matcher.hpp>
-#include <traccc/io/event_data.hpp>
+#include <traccc/utils/event_data.hpp>
 
 namespace traccc {
 class nseed_performance_writer {

performance/include/traccc/efficiency/seeding_performance_writer.hpp

@@ -13,7 +13,7 @@
 // Project include(s).
 #include "traccc/edm/seed.hpp"
 #include "traccc/edm/spacepoint.hpp"
-#include "traccc/io/event_data.hpp"
+#include "traccc/utils/event_data.hpp"
 
 // System include(s).
 #include <map>

performance/include/traccc/resolution/fitting_performance_writer.hpp

@@ -15,7 +15,7 @@
 #include "traccc/edm/particle.hpp"
 #include "traccc/edm/track_parameters.hpp"
 #include "traccc/edm/track_state.hpp"
-#include "traccc/io/event_data.hpp"
+#include "traccc/utils/event_data.hpp"
 
 // System include(s).
 #include <memory>

performance/src/utils/event_data.cpp

@@ -278,19 +278,6 @@ void event_data::fill_cca_result(
                 m_found_meas_to_ptc_map[ms][ptc]++;
                 meas_counts[ce.measurement_id]++;
             }
-
-            /*
-            // Cells from truth [cell, particle] map
-            for (auto const& [cell2, ptc] : m_cell_to_particle_map) {
-                // Increase the particle number if the cell is the same
-                if (cell1.geometry_id == cell2.geometry_id &&
-                    cell1.channel0 == cell2.channel0 &&
-                    cell1.channel1 == cell2.channel1) {
-                    m_found_meas_to_ptc_map[ms][ptc]++;
-                    meas_counts[cell2.measurement_id]++;
-                }
-            }
-            */
         }
 
         // Find most contributing measurement and its corresponding hit

tests/cuda/test_ckf_combinatorics_telescope.cpp

@@ -9,7 +9,7 @@
 #include "traccc/cuda/finding/finding_algorithm.hpp"
 #include "traccc/device/container_d2h_copy_alg.hpp"
 #include "traccc/device/container_h2d_copy_alg.hpp"
-#include "traccc/io/event_data.hpp"
+#include "traccc/utils/event_data.hpp"
 #include "traccc/io/read_measurements.hpp"
 #include "traccc/io/utils.hpp"
 #include "traccc/simulation/simulator.hpp"

tests/cuda/test_ckf_toy_detector.cpp

@@ -10,7 +10,7 @@
 #include "traccc/device/container_d2h_copy_alg.hpp"
 #include "traccc/device/container_h2d_copy_alg.hpp"
 #include "traccc/finding/finding_algorithm.hpp"
-#include "traccc/io/event_data.hpp"
+#include "traccc/utils/event_data.hpp"
 #include "traccc/io/read_measurements.hpp"
 #include "traccc/io/utils.hpp"
 #include "traccc/performance/container_comparator.hpp"

tests/io/CMakeLists.txt

@@ -10,7 +10,7 @@ traccc_add_test( io
    "test_csv.cpp" 
    "test_event_data.cpp"
    LINK_LIBRARIES GTest::gtest_main traccc_tests_common
-                  traccc::core traccc::io )
+                  traccc::core traccc::io traccc::performance )
 
 target_compile_definitions(
   traccc_test_io

tests/io/test_event_data.cpp

@@ -9,7 +9,7 @@
 #include "traccc/clusterization/measurement_creation_algorithm.hpp"
 #include "traccc/clusterization/sparse_ccl_algorithm.hpp"
 #include "traccc/io/data_format.hpp"
-#include "traccc/io/event_data.hpp"
+#include "traccc/utils/event_data.hpp"
 #include "traccc/io/read_cells.hpp"
 #include "traccc/io/read_detector_description.hpp"
 #include "traccc/io/read_digitization_config.hpp"