Only use detector input

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,

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
 
             /*----------------------------

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();
 
         /*----------------

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 =

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
 
             /*----------------------------

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);

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

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
 

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);
 

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,15 +75,13 @@ 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)
 ///
 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);
 

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,15 +45,13 @@ 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)
 ///
 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);
 

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<geometry_id, geometry_id> 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.

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);
 

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<std::size_t, std::size_t> hit_to_measurement;

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

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 =

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

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");