From 5ee51aa0b8a7203de06eff2e3d727b0241a76051 Mon Sep 17 00:00:00 2001 From: Beomki Yeo Date: Thu, 17 Oct 2024 11:44:49 +0200 Subject: [PATCH] Only use detector input --- examples/io/create_binaries.cpp | 4 ++-- examples/run/alpaka/seeding_example_alpaka.cpp | 16 ++++++++-------- examples/run/cpu/seeding_example.cpp | 3 ++- examples/run/cpu/truth_finding_example.cpp | 3 ++- examples/run/cuda/seeding_example_cuda.cpp | 16 ++++++++-------- examples/run/cuda/truth_finding_example_cuda.cpp | 3 ++- examples/run/kokkos/seeding_example_kokkos.cpp | 8 ++++---- examples/run/sycl/seeding_example_sycl.sycl | 8 ++++---- io/include/traccc/io/read_measurements.hpp | 4 ---- io/include/traccc/io/read_particles.hpp | 4 ---- io/include/traccc/io/read_spacepoints.hpp | 4 ---- io/src/csv/read_measurements.cpp | 8 ++++---- io/src/csv/read_measurements.hpp | 2 -- io/src/csv/read_particles.cpp | 6 +++--- io/src/csv/read_particles.hpp | 3 +-- io/src/csv/read_spacepoints.cpp | 4 +--- io/src/csv/read_spacepoints.hpp | 2 -- io/src/read_measurements.cpp | 8 +++----- io/src/read_particles.cpp | 8 +++----- io/src/read_spacepoints.cpp | 6 ++---- tests/cpu/test_clusterization_resolution.cpp | 3 +-- tests/io/test_binary.cpp | 4 ++-- tests/io/test_csv.cpp | 4 ++-- 23 files changed, 54 insertions(+), 77 deletions(-) diff --git a/examples/io/create_binaries.cpp b/examples/io/create_binaries.cpp index 233b706caf..d907a8be52 100644 --- a/examples/io/create_binaries.cpp +++ b/examples/io/create_binaries.cpp @@ -52,7 +52,7 @@ int create_binaries(const traccc::opts::detector& detector_opts, // Read the hits from the relevant event file traccc::spacepoint_collection_types::host spacepoints{&host_mr}; traccc::io::read_spacepoints(spacepoints, event, input_opts.directory, - false, nullptr, input_opts.format); + nullptr, input_opts.format); // Write binary file traccc::io::write(event, output_opts.directory, @@ -62,7 +62,7 @@ int create_binaries(const traccc::opts::detector& detector_opts, // Read the measurements from the relevant event file traccc::measurement_collection_types::host measurements{&host_mr}; traccc::io::read_measurements(measurements, event, input_opts.directory, - false, nullptr, input_opts.format); + nullptr, input_opts.format); // Write binary file traccc::io::write(event, output_opts.directory, diff --git a/examples/run/alpaka/seeding_example_alpaka.cpp b/examples/run/alpaka/seeding_example_alpaka.cpp index 7d486a8243..b1e91ce6ba 100644 --- a/examples/run/alpaka/seeding_example_alpaka.cpp +++ b/examples/run/alpaka/seeding_example_alpaka.cpp @@ -172,16 +172,16 @@ int seq_run(const traccc::opts::track_seeding& seeding_opts, traccc::performance::timer t("Hit reading (cpu)", elapsedTimes); // Read the hits from the relevant event file - traccc::io::read_spacepoints(spacepoints_per_event, event, - input_opts.directory, - input_opts.use_acts_geom_source, - &host_det, input_opts.format); + traccc::io::read_spacepoints( + spacepoints_per_event, event, input_opts.directory, + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); // Read measurements - traccc::io::read_measurements(measurements_per_event, event, - input_opts.directory, - input_opts.use_acts_geom_source, - &host_det, input_opts.format); + traccc::io::read_measurements( + measurements_per_event, event, input_opts.directory, + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); } // stop measuring hit reading timer /*---------------------------- diff --git a/examples/run/cpu/seeding_example.cpp b/examples/run/cpu/seeding_example.cpp index efe83cd344..8288722245 100644 --- a/examples/run/cpu/seeding_example.cpp +++ b/examples/run/cpu/seeding_example.cpp @@ -151,7 +151,8 @@ int seq_run(const traccc::opts::track_seeding& seeding_opts, &host_mr}; traccc::io::read_spacepoints( spacepoints_per_event, event, input_opts.directory, - input_opts.use_acts_geom_source, &detector, input_opts.format); + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); n_spacepoints += spacepoints_per_event.size(); /*---------------- diff --git a/examples/run/cpu/truth_finding_example.cpp b/examples/run/cpu/truth_finding_example.cpp index 6450b87328..3868a7c816 100644 --- a/examples/run/cpu/truth_finding_example.cpp +++ b/examples/run/cpu/truth_finding_example.cpp @@ -147,7 +147,8 @@ int seq_run(const traccc::opts::track_finding& finding_opts, &host_mr}; traccc::io::read_measurements( measurements_per_event, event, input_opts.directory, - input_opts.use_acts_geom_source, &detector, input_opts.format); + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); // Run finding auto track_candidates = diff --git a/examples/run/cuda/seeding_example_cuda.cpp b/examples/run/cuda/seeding_example_cuda.cpp index 78ebf4bda5..45539cb40b 100644 --- a/examples/run/cuda/seeding_example_cuda.cpp +++ b/examples/run/cuda/seeding_example_cuda.cpp @@ -224,16 +224,16 @@ int seq_run(const traccc::opts::track_seeding& seeding_opts, traccc::performance::timer t("Hit reading (cpu)", elapsedTimes); // Read the hits from the relevant event file - traccc::io::read_spacepoints(spacepoints_per_event, event, - input_opts.directory, - input_opts.use_acts_geom_source, - &host_det, input_opts.format); + traccc::io::read_spacepoints( + spacepoints_per_event, event, input_opts.directory, + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); // Read measurements - traccc::io::read_measurements(measurements_per_event, event, - input_opts.directory, - input_opts.use_acts_geom_source, - &host_det, input_opts.format); + traccc::io::read_measurements( + measurements_per_event, event, + (input_opts.use_acts_geom_source ? &detector : nullptr), + &host_det, input_opts.format); } // stop measuring hit reading timer /*---------------------------- diff --git a/examples/run/cuda/truth_finding_example_cuda.cpp b/examples/run/cuda/truth_finding_example_cuda.cpp index c52237e6fb..5ef04e637e 100644 --- a/examples/run/cuda/truth_finding_example_cuda.cpp +++ b/examples/run/cuda/truth_finding_example_cuda.cpp @@ -200,7 +200,8 @@ int seq_run(const traccc::opts::track_finding& finding_opts, mr.host}; traccc::io::read_measurements( measurements_per_event, event, input_opts.directory, - input_opts.use_acts_geom_source, &detector, input_opts.format); + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); traccc::measurement_collection_types::buffer measurements_cuda_buffer( measurements_per_event.size(), mr.main); diff --git a/examples/run/kokkos/seeding_example_kokkos.cpp b/examples/run/kokkos/seeding_example_kokkos.cpp index 8b98e574aa..608a25b753 100644 --- a/examples/run/kokkos/seeding_example_kokkos.cpp +++ b/examples/run/kokkos/seeding_example_kokkos.cpp @@ -93,10 +93,10 @@ int seq_run(const traccc::opts::track_seeding& seeding_opts, traccc::performance::timer t("Hit reading (cpu)", elapsedTimes); // Read the hits from the relevant event file - traccc::io::read_spacepoints(spacepoints_per_event, event, - input_opts.directory, - input_opts.use_acts_geom_source, - &host_det, input_opts.format); + traccc::io::read_spacepoints( + spacepoints_per_event, event, input_opts.directory, + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); } // stop measuring hit reading timer { // Spacepoin binning for kokkos diff --git a/examples/run/sycl/seeding_example_sycl.sycl b/examples/run/sycl/seeding_example_sycl.sycl index 373fc2b270..e4798db41c 100644 --- a/examples/run/sycl/seeding_example_sycl.sycl +++ b/examples/run/sycl/seeding_example_sycl.sycl @@ -142,10 +142,10 @@ int seq_run(const traccc::opts::detector& detector_opts, traccc::performance::timer t("Hit reading (cpu)", elapsedTimes); // Read the hits from the relevant event file - traccc::io::read_spacepoints(spacepoints_per_event, event, - input_opts.directory, - input_opts.use_acts_geom_source, - &host_det, input_opts.format); + traccc::io::read_spacepoints( + spacepoints_per_event, event, input_opts.directory, + (input_opts.use_acts_geom_source ? &detector : nullptr), + input_opts.format); } // stop measuring hit reading timer diff --git a/io/include/traccc/io/read_measurements.hpp b/io/include/traccc/io/read_measurements.hpp index 81562574ff..72f4955ad9 100644 --- a/io/include/traccc/io/read_measurements.hpp +++ b/io/include/traccc/io/read_measurements.hpp @@ -28,13 +28,11 @@ namespace traccc::io { /// @param[out] measurements The measurement collection to fill /// @param[in] event The event ID to read in the measurements for /// @param[in] directory The directory holding the measurement data files -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// @param[in] format The format of the measurement data files (to read) /// void read_measurements(measurement_collection_types::host& measurements, std::size_t event, std::string_view directory, - bool use_acts_geom_source = true, const traccc::default_detector::host* detector = nullptr, data_format format = data_format::csv); @@ -44,13 +42,11 @@ void read_measurements(measurement_collection_types::host& measurements, /// /// @param[out] measurements The measurement collection to fill /// @param[in] filename The file to read the measurement data from -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// @param[in] format The format of the measurement data files (to read) /// void read_measurements(measurement_collection_types::host& measurements, std::string_view filename, - bool use_acts_geom_source = true, const traccc::default_detector::host* detector = nullptr, data_format format = data_format::csv); diff --git a/io/include/traccc/io/read_particles.hpp b/io/include/traccc/io/read_particles.hpp index 81cd72d354..f383d23150 100644 --- a/io/include/traccc/io/read_particles.hpp +++ b/io/include/traccc/io/read_particles.hpp @@ -57,13 +57,11 @@ void read_particles(particle_collection_types::host &particles, /// @param[in] event The event ID to read in the particles for /// @param[in] directory The directory holding the particle data files /// @param[in] format The format of the particle data files (to read) -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// @param[in] filename_postfix Postfix for the particle file name(s) /// void read_particles(particle_container_types::host &particles, std::size_t event, std::string_view directory, - bool use_acts_geom_source = true, const traccc::default_detector::host *detector = nullptr, data_format format = data_format::csv, std::string_view filename_postfix = "-particles_initial"); @@ -77,7 +75,6 @@ void read_particles(particle_container_types::host &particles, /// @param[in] hits_file The file to read the simulated hits from /// @param[in] measurements_file The file to read the "Acts measurements" from /// @param[in] hit_map_file The file to read the hit->measurement mapping from -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// @param[in] format The format of the particle data files (to read) /// @@ -85,7 +82,6 @@ void read_particles(particle_container_types::host &particles, std::string_view particles_file, std::string_view hits_file, std::string_view measurements_file, std::string_view hit_map_file, - bool use_acts_geom_source = true, const traccc::default_detector::host *detector = nullptr, data_format format = data_format::csv); diff --git a/io/include/traccc/io/read_spacepoints.hpp b/io/include/traccc/io/read_spacepoints.hpp index c18802bb92..2dd87866a2 100644 --- a/io/include/traccc/io/read_spacepoints.hpp +++ b/io/include/traccc/io/read_spacepoints.hpp @@ -28,13 +28,11 @@ namespace traccc::io { /// @param[out] spacepoints The spacepoint collection to fill /// @param[in] event The event ID to read in the spacepoints for /// @param[in] directory The directory holding the spacepoint data files -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// @param[in] format The format of the data files (to read) /// void read_spacepoints(spacepoint_collection_types::host& spacepoints, std::size_t event, std::string_view directory, - bool use_acts_geom_source = true, const traccc::default_detector::host* detector = nullptr, data_format format = data_format::csv); @@ -47,7 +45,6 @@ void read_spacepoints(spacepoint_collection_types::host& spacepoints, /// @param[in] meas_filename The file to read the measurement data from /// @param[in] meas_hit_map_filename The file to read the mapping from /// measurements to hits from -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// @param[in] format The format of the data files (to read) /// @@ -55,7 +52,6 @@ void read_spacepoints(spacepoint_collection_types::host& spacepoints, std::string_view hit_filename, std::string_view meas_filename, std::string_view meas_hit_map_filename, - bool use_acts_geom_source = true, const traccc::default_detector::host* detector = nullptr, data_format format = data_format::csv); diff --git a/io/src/csv/read_measurements.cpp b/io/src/csv/read_measurements.cpp index 5867169360..e512c5970a 100644 --- a/io/src/csv/read_measurements.cpp +++ b/io/src/csv/read_measurements.cpp @@ -16,7 +16,7 @@ namespace traccc::io::csv { void read_measurements(measurement_collection_types::host& measurements, - std::string_view filename, bool use_acts_geom_source, + std::string_view filename, const traccc::default_detector::host* detector, const bool do_sort) { @@ -26,7 +26,7 @@ void read_measurements(measurement_collection_types::host& measurements, // For Acts data, build a map of acts->detray geometry IDs std::map acts_to_detray_id; - if (use_acts_geom_source && detector) { + if (detector) { for (const auto& surface_desc : detector->surfaces()) { acts_to_detray_id[surface_desc.source] = surface_desc.barcode().value(); @@ -38,8 +38,8 @@ void read_measurements(measurement_collection_types::host& measurements, while (reader.read(iomeas)) { traccc::geometry_id geom_id = iomeas.geometry_id; - if (use_acts_geom_source && detector) { - geom_id = acts_to_detray_id[iomeas.geometry_id]; + if (detector) { + geom_id = acts_to_detray_id.at(iomeas.geometry_id); } // Construct the measurement object. diff --git a/io/src/csv/read_measurements.hpp b/io/src/csv/read_measurements.hpp index 00c24432ea..7ec04e64e6 100644 --- a/io/src/csv/read_measurements.hpp +++ b/io/src/csv/read_measurements.hpp @@ -20,13 +20,11 @@ namespace traccc::io::csv { /// /// @param[out] measurements The collection to fill with the measurement data /// @param[in] filename The file to read the measurement data from -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// @param[in] do_sort Whether to sort the measurements or not /// void read_measurements(measurement_collection_types::host& measurements, std::string_view filename, - bool use_acts_geom_source = true, const traccc::default_detector::host* detector = nullptr, const bool do_sort = true); diff --git a/io/src/csv/read_particles.cpp b/io/src/csv/read_particles.cpp index 6f6a28ba0c..0469b35d1b 100644 --- a/io/src/csv/read_particles.cpp +++ b/io/src/csv/read_particles.cpp @@ -43,7 +43,7 @@ void read_particles(particle_collection_types::host& particles, void read_particles(particle_container_types::host& particles, std::string_view particles_file, std::string_view hits_file, std::string_view measurements_file, - std::string_view hit_map_file, bool use_acts_geom_source, + std::string_view hit_map_file, const traccc::default_detector::host* detector) { // Memory resource used by the temporary collections. @@ -61,8 +61,8 @@ void read_particles(particle_container_types::host& particles, // Read in all measurements, into a temporary collection. static constexpr bool sort_measurements = false; measurement_collection_types::host temp_measurements{&mr}; - read_measurements(temp_measurements, measurements_file, - use_acts_geom_source, detector, sort_measurements); + read_measurements(temp_measurements, measurements_file, detector, + sort_measurements); // Make a hit to measurement map. std::unordered_map hit_to_measurement; diff --git a/io/src/csv/read_particles.hpp b/io/src/csv/read_particles.hpp index b10c4c5bfc..6139f6f257 100644 --- a/io/src/csv/read_particles.hpp +++ b/io/src/csv/read_particles.hpp @@ -31,13 +31,12 @@ void read_particles(particle_collection_types::host& particles, /// @param[in] hits_file The file to read the simulated hits from /// @param[in] measurements_file The file to read the "Acts measurements" from /// @param[in] hit_map_file The file to read the hit->measurement mapping from -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// void read_particles(particle_container_types::host& particles, std::string_view particles_file, std::string_view hits_file, std::string_view measurements_file, - std::string_view hit_map_file, bool use_acts_geom_source, + std::string_view hit_map_file, const traccc::default_detector::host* detector); } // namespace traccc::io::csv diff --git a/io/src/csv/read_spacepoints.cpp b/io/src/csv/read_spacepoints.cpp index 19d0e46bd6..522b2d9416 100644 --- a/io/src/csv/read_spacepoints.cpp +++ b/io/src/csv/read_spacepoints.cpp @@ -25,14 +25,12 @@ void read_spacepoints(spacepoint_collection_types::host& spacepoints, std::string_view hit_filename, std::string_view meas_filename, std::string_view meas_hit_map_filename, - bool use_acts_geom_source, const traccc::default_detector::host* detector) { // Read all measurements. measurement_collection_types::host measurements; static constexpr bool sort_measurements = false; - read_measurements(measurements, meas_filename, use_acts_geom_source, - detector, sort_measurements); + read_measurements(measurements, meas_filename, detector, sort_measurements); // Measurement hit id reader auto mhid_reader = diff --git a/io/src/csv/read_spacepoints.hpp b/io/src/csv/read_spacepoints.hpp index 5b94692ae0..436c280a20 100644 --- a/io/src/csv/read_spacepoints.hpp +++ b/io/src/csv/read_spacepoints.hpp @@ -23,14 +23,12 @@ namespace traccc::io::csv { /// @param[in] meas_filename The file to read the measurement data from /// @param[in] meas_hit_map_filename The file to read the mapping from /// measurements to hits from -/// @param[in] use_acts_geom_source Use acts geometry source /// @param[in] detector detray detector /// void read_spacepoints(spacepoint_collection_types::host& spacepoints, std::string_view hit_filename, std::string_view meas_filename, std::string_view meas_hit_map_filename, - bool use_acts_geom_source = false, const traccc::default_detector::host* detector = nullptr); } // namespace traccc::io::csv diff --git a/io/src/read_measurements.cpp b/io/src/read_measurements.cpp index fd523fdbbd..87c21e588c 100644 --- a/io/src/read_measurements.cpp +++ b/io/src/read_measurements.cpp @@ -19,7 +19,6 @@ namespace traccc::io { void read_measurements(measurement_collection_types::host& measurements, std::size_t event, std::string_view directory, - bool use_acts_geom_source, const traccc::default_detector::host* detector, data_format format) { @@ -31,7 +30,7 @@ void read_measurements(measurement_collection_types::host& measurements, std::filesystem::path(get_event_filename( event, "-measurements.csv"))) .native()), - use_acts_geom_source, detector, format); + detector, format); break; } case data_format::binary: { @@ -50,15 +49,14 @@ void read_measurements(measurement_collection_types::host& measurements, } void read_measurements(measurement_collection_types::host& measurements, - std::string_view filename, bool use_acts_geom_source, + std::string_view filename, const traccc::default_detector::host* detector, data_format format) { static constexpr bool sort_measurements = true; switch (format) { case data_format::csv: - return csv::read_measurements(measurements, filename, - use_acts_geom_source, detector, + return csv::read_measurements(measurements, filename, detector, sort_measurements); default: throw std::invalid_argument("Unsupported data format"); diff --git a/io/src/read_particles.cpp b/io/src/read_particles.cpp index cee9fcff95..a3f0503de4 100644 --- a/io/src/read_particles.cpp +++ b/io/src/read_particles.cpp @@ -50,7 +50,6 @@ void read_particles(particle_collection_types::host& particles, void read_particles(particle_container_types::host& particles, std::size_t event, std::string_view directory, - bool use_acts_geom_source, const traccc::default_detector::host* detector, data_format format, std::string_view filename_postfix) { @@ -75,7 +74,7 @@ void read_particles(particle_container_types::host& particles, std::filesystem::path(get_event_filename( event, "-measurement-simhit-map.csv"))) .native()), - use_acts_geom_source, detector, format); + detector, format); break; default: throw std::invalid_argument("Unsupported data format"); @@ -85,15 +84,14 @@ void read_particles(particle_container_types::host& particles, void read_particles(particle_container_types::host& particles, std::string_view particles_file, std::string_view hits_file, std::string_view measurements_file, - std::string_view hit_map_file, bool use_acts_geom_source, + std::string_view hit_map_file, const traccc::default_detector::host* detector, data_format format) { switch (format) { case data_format::csv: csv::read_particles(particles, particles_file, hits_file, - measurements_file, hit_map_file, - use_acts_geom_source, detector); + measurements_file, hit_map_file, detector); break; default: throw std::invalid_argument("Unsupported data format"); diff --git a/io/src/read_spacepoints.cpp b/io/src/read_spacepoints.cpp index 9547cffbf0..b3dff1d5ea 100644 --- a/io/src/read_spacepoints.cpp +++ b/io/src/read_spacepoints.cpp @@ -19,7 +19,6 @@ namespace traccc::io { void read_spacepoints(spacepoint_collection_types::host& spacepoints, std::size_t event, std::string_view directory, - bool use_acts_geom_source, const traccc::default_detector::host* detector, data_format format) { @@ -39,7 +38,7 @@ void read_spacepoints(spacepoint_collection_types::host& spacepoints, std::filesystem::path(get_event_filename( event, "-measurement-simhit-map.csv"))) .native()), - use_acts_geom_source, detector, format); + detector, format); break; } case data_format::binary: { @@ -60,7 +59,6 @@ void read_spacepoints(spacepoint_collection_types::host& spacepoints, std::string_view hit_filename, std::string_view meas_filename, std::string_view meas_hit_map_filename, - bool use_acts_geom_source, const traccc::default_detector::host* detector, data_format format) { @@ -68,7 +66,7 @@ void read_spacepoints(spacepoint_collection_types::host& spacepoints, case data_format::csv: return csv::read_spacepoints(spacepoints, hit_filename, meas_filename, meas_hit_map_filename, - use_acts_geom_source, detector); + detector); default: throw std::invalid_argument("Unsupported data format"); } diff --git a/tests/cpu/test_clusterization_resolution.cpp b/tests/cpu/test_clusterization_resolution.cpp index e4113efaae..26e7445041 100644 --- a/tests/cpu/test_clusterization_resolution.cpp +++ b/tests/cpu/test_clusterization_resolution.cpp @@ -64,8 +64,7 @@ TEST_P(SurfaceBinningTests, Run) { // Read the hits from the relevant event file traccc::spacepoint_collection_types::host spacepoints_truth{&host_mr}; - traccc::io::read_spacepoints(spacepoints_truth, event, data_dir, true, - &detector); + traccc::io::read_spacepoints(spacepoints_truth, event, data_dir, &detector); // Check the size of spacepoints EXPECT_TRUE(spacepoints_recon.size() > 0); diff --git a/tests/io/test_binary.cpp b/tests/io/test_binary.cpp index 43a4c7cdf0..eed11c75df 100644 --- a/tests/io/test_binary.cpp +++ b/tests/io/test_binary.cpp @@ -106,7 +106,7 @@ TEST(io_binary, spacepoint) { // Read binary file traccc::spacepoint_collection_types::host spacepoints_binary(&host_mr); traccc::io::read_spacepoints(spacepoints_binary, event, hits_directory, - false, nullptr, traccc::data_format::binary); + nullptr, traccc::data_format::binary); // Delete binary file std::string io_spacepoints_file = @@ -154,7 +154,7 @@ TEST(io_binary, measurement) { // Read binary file traccc::measurement_collection_types::host measurements_binary(&host_mr); traccc::io::read_measurements(measurements_binary, event, - measurements_directory, false, nullptr, + measurements_directory, nullptr, traccc::data_format::binary); // Delete binary file diff --git a/tests/io/test_csv.cpp b/tests/io/test_csv.cpp index 2df9919547..01784b9305 100644 --- a/tests/io/test_csv.cpp +++ b/tests/io/test_csv.cpp @@ -112,7 +112,7 @@ TEST_F(io, csv_read_tml_single_muon) { traccc::measurement_collection_types::host measurements_per_event( &resource); traccc::io::read_measurements(measurements_per_event, 0, - "tml_full/single_muon/", false, nullptr); + "tml_full/single_muon/", nullptr); // Read the particles from the relevant event file traccc::particle_collection_types::host particles_per_event(&resource); @@ -137,7 +137,7 @@ TEST_F(io, csv_read_odd_single_muon) { // Read the truth particles for the first event. traccc::particle_container_types::host particles{&mr}; - traccc::io::read_particles(particles, 0u, "odd/geant4_1muon_1GeV/", true, + traccc::io::read_particles(particles, 0u, "odd/geant4_1muon_1GeV/", &detector, traccc::data_format::csv); // Look at the read container.