From a41662020a832cfd29f327df52d5c75ef8b86db8 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Wed, 23 Oct 2024 13:33:27 +0200 Subject: [PATCH 1/2] Re-wrote spacepoint formation as a non-templated algorithm. Renamed the algorithm to traccc::host::silicon_pixel_spacepoint_formation_algorithm, to make it very clear what the algorithm is doing. Once we introduce logic for creating spacepoints off of silicon strip measurements, we can see what to do. (Rename this algorithm, or add a separate algorithm that does the strip spacepoint creation.) --- core/CMakeLists.txt | 7 +- .../impl/spacepoint_formation_algorithm.ipp | 43 ----------- ...n_pixel_spacepoint_formation_algorithm.hpp | 75 +++++++++++++++++++ .../spacepoint_formation_algorithm.hpp | 58 -------------- .../silicon_pixel_spacepoint_formation.hpp | 55 ++++++++++++++ ...n_pixel_spacepoint_formation_algorithm.cpp | 17 +++++ ..._spacepoint_formation_algorithm_defdet.cpp | 22 ++++++ ..._spacepoint_formation_algorithm_teldet.cpp | 22 ++++++ .../spacepoint_formation_algorithm.cpp | 43 ----------- 9 files changed, 196 insertions(+), 146 deletions(-) delete mode 100644 core/include/traccc/seeding/impl/spacepoint_formation_algorithm.ipp create mode 100644 core/include/traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp delete mode 100644 core/include/traccc/seeding/spacepoint_formation_algorithm.hpp create mode 100644 core/src/seeding/silicon_pixel_spacepoint_formation.hpp create mode 100644 core/src/seeding/silicon_pixel_spacepoint_formation_algorithm.cpp create mode 100644 core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_defdet.cpp create mode 100644 core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_teldet.cpp delete mode 100644 core/src/seeding/spacepoint_formation_algorithm.cpp diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index f69189bb68..d30afc5dbe 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -99,10 +99,13 @@ traccc_add_library( traccc_core core TYPE SHARED "src/seeding/seed_finding.cpp" "include/traccc/seeding/spacepoint_binning.hpp" "src/seeding/spacepoint_binning.cpp" - "include/traccc/seeding/spacepoint_formation_algorithm.hpp" - "include/traccc/seeding/impl/spacepoint_formation_algorithm.ipp" "include/traccc/seeding/detail/spacepoint_formation.hpp" "include/traccc/seeding/impl/spacepoint_formation.ipp" + "src/seeding/silicon_pixel_spacepoint_formation.hpp" + "include/traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" + "src/seeding/silicon_pixel_spacepoint_formation_algorithm.cpp" + "src/seeding/silicon_pixel_spacepoint_formation_algorithm_defdet.cpp" + "src/seeding/silicon_pixel_spacepoint_formation_algorithm_teldet.cpp" # Ambiguity resolution "include/traccc/ambiguity_resolution/greedy_ambiguity_resolution_algorithm.hpp" "src/ambiguity_resolution/greedy_ambiguity_resolution_algorithm.cpp" ) diff --git a/core/include/traccc/seeding/impl/spacepoint_formation_algorithm.ipp b/core/include/traccc/seeding/impl/spacepoint_formation_algorithm.ipp deleted file mode 100644 index f25a5e9604..0000000000 --- a/core/include/traccc/seeding/impl/spacepoint_formation_algorithm.ipp +++ /dev/null @@ -1,43 +0,0 @@ -/** TRACCC library, part of the ACTS project (R&D line) - * - * (c) 2024 CERN for the benefit of the ACTS project - * - * Mozilla Public License Version 2.0 - */ - -// Project include(s). -#include "traccc/seeding/detail/spacepoint_formation.hpp" - -namespace traccc::host { - -template -spacepoint_formation_algorithm::spacepoint_formation_algorithm( - vecmem::memory_resource& mr) - : m_mr(mr) {} - -template -spacepoint_collection_types::host -spacepoint_formation_algorithm::operator()( - const detector_t& det, - const measurement_collection_types::const_view& measurements_view) const { - - // Create device containers for the inputs. - const measurement_collection_types::const_device measurements{ - measurements_view}; - - // Create the result container. - spacepoint_collection_types::host result(&(m_mr.get())); - result.reserve(measurements.size()); - - // Set up each spacepoint in the result container. - for (const auto& meas : measurements) { - if (details::is_valid_measurement(meas)) { - result.push_back(details::create_spacepoint(det, meas)); - } - } - - // Return the created container. - return result; -} - -} // namespace traccc::host diff --git a/core/include/traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp b/core/include/traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp new file mode 100644 index 0000000000..3063083207 --- /dev/null +++ b/core/include/traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp @@ -0,0 +1,75 @@ +/** TRACCC library, part of the ACTS project (R&D line) + * + * (c) 2021-2024 CERN for the benefit of the ACTS project + * + * Mozilla Public License Version 2.0 + */ + +#pragma once + +// Library include(s). +#include "traccc/edm/measurement.hpp" +#include "traccc/edm/spacepoint.hpp" +#include "traccc/geometry/detector.hpp" +#include "traccc/utils/algorithm.hpp" + +// VecMem include(s). +#include + +// System include(s). +#include + +namespace traccc::host { + +/// Algorithm forming space points out of measurements +/// +/// This algorithm performs the local-to-global transformation of the 2D +/// measurements made on every detector module, into 3D spacepoint coordinates. +/// +class silicon_pixel_spacepoint_formation_algorithm + : public algorithm, + public algorithm { + + public: + /// Output type + using output_type = spacepoint_collection_types::host; + + /// Constructor for spacepoint_formation + /// + /// @param mr is the memory resource + /// + silicon_pixel_spacepoint_formation_algorithm(vecmem::memory_resource& mr); + + /// Construct spacepoints from 2D silicon pixel measurements + /// + /// @param det Detector object + /// @param measurements A collection of measurements + /// @return A spacepoint container, with one spacepoint for every + /// silicon pixel measurement + /// + output_type operator()( + const default_detector::host& det, + const measurement_collection_types::const_view&) const override; + + /// Construct spacepoints from 2D silicon pixel measurements + /// + /// @param det Detector object + /// @param measurements A collection of measurements + /// @return A spacepoint container, with one spacepoint for every + /// silicon pixel measurement + /// + output_type operator()( + const telescope_detector::host& det, + const measurement_collection_types::const_view&) const override; + + private: + /// Memory resource to use for the output container + std::reference_wrapper m_mr; + +}; // class silicon_pixel_spacepoint_formation_algorithm + +} // namespace traccc::host diff --git a/core/include/traccc/seeding/spacepoint_formation_algorithm.hpp b/core/include/traccc/seeding/spacepoint_formation_algorithm.hpp deleted file mode 100644 index dacff39a9c..0000000000 --- a/core/include/traccc/seeding/spacepoint_formation_algorithm.hpp +++ /dev/null @@ -1,58 +0,0 @@ -/** TRACCC library, part of the ACTS project (R&D line) - * - * (c) 2021-2024 CERN for the benefit of the ACTS project - * - * Mozilla Public License Version 2.0 - */ - -#pragma once - -// Library include(s). -#include "traccc/edm/measurement.hpp" -#include "traccc/edm/spacepoint.hpp" -#include "traccc/utils/algorithm.hpp" - -// VecMem include(s). -#include - -// System include(s). -#include - -namespace traccc::host { - -/// Algorithm forming space points out of measurements -/// -/// This algorithm performs the local-to-global transformation of the 2D -/// measurements made on every detector module, into 3D spacepoint coordinates. -/// -template -class spacepoint_formation_algorithm - : public algorithm { - - public: - /// Constructor for spacepoint_formation - /// - /// @param mr is the memory resource - /// - spacepoint_formation_algorithm(vecmem::memory_resource& mr); - - /// Callable operator for the space point formation, based on one single - /// module - /// - /// @param det Detector object - /// @param measurements A collection of measurements - /// @return A spacepoint container, with one spacepoint for every - /// measurement - /// - spacepoint_collection_types::host operator()( - const detector_t& det, - const measurement_collection_types::const_view&) const override; - - private: - std::reference_wrapper m_mr; -}; - -} // namespace traccc::host - -#include "traccc/seeding/impl/spacepoint_formation_algorithm.ipp" \ No newline at end of file diff --git a/core/src/seeding/silicon_pixel_spacepoint_formation.hpp b/core/src/seeding/silicon_pixel_spacepoint_formation.hpp new file mode 100644 index 0000000000..a3842d1d28 --- /dev/null +++ b/core/src/seeding/silicon_pixel_spacepoint_formation.hpp @@ -0,0 +1,55 @@ +/** TRACCC library, part of the ACTS project (R&D line) + * + * (c) 2022-2024 CERN for the benefit of the ACTS project + * + * Mozilla Public License Version 2.0 + */ + +#pragma once + +// Local include(s). +#include "traccc/edm/measurement.hpp" +#include "traccc/edm/spacepoint.hpp" +#include "traccc/seeding/detail/spacepoint_formation.hpp" + +// VecMem include(s). +#include + +namespace traccc::host::details { + +/// Common implementation for the spacepoint formation algorithm's execute +/// functions +/// +/// @tparam detector_t The detector type to use +/// +/// @param det The detector object +/// @param measurements_view The view of the measurements to process +/// @param mr The memory resource to create the output with +/// @return A container of the created spacepoints +/// +template +spacepoint_collection_types::host silicon_pixel_spacepoint_formation( + const detector_t& det, + const measurement_collection_types::const_view& measurements_view, + vecmem::memory_resource& mr) { + + // Create a device container for the input. + const measurement_collection_types::const_device measurements{ + measurements_view}; + + // Create the result container. + spacepoint_collection_types::host result(&mr); + result.reserve(measurements.size()); + + // Set up each spacepoint in the result container. + for (const auto& meas : measurements) { + if (traccc::details::is_valid_measurement(meas)) { + result.push_back(traccc::details::create_spacepoint(det, meas)); + } + } + + // Return the created container. + return result; +} + +} // namespace traccc::host::details diff --git a/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm.cpp b/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm.cpp new file mode 100644 index 0000000000..e3438c324b --- /dev/null +++ b/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm.cpp @@ -0,0 +1,17 @@ +/** TRACCC library, part of the ACTS project (R&D line) + * + * (c) 2022-2024 CERN for the benefit of the ACTS project + * + * Mozilla Public License Version 2.0 + */ + +// Library include(s). +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" + +namespace traccc::host { + +silicon_pixel_spacepoint_formation_algorithm:: + silicon_pixel_spacepoint_formation_algorithm(vecmem::memory_resource& mr) + : m_mr(mr) {} + +} // namespace traccc::host diff --git a/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_defdet.cpp b/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_defdet.cpp new file mode 100644 index 0000000000..70b6e3b7e1 --- /dev/null +++ b/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_defdet.cpp @@ -0,0 +1,22 @@ +/** TRACCC library, part of the ACTS project (R&D line) + * + * (c) 2022-2024 CERN for the benefit of the ACTS project + * + * Mozilla Public License Version 2.0 + */ + +// Library include(s). +#include "silicon_pixel_spacepoint_formation.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" + +namespace traccc::host { + +silicon_pixel_spacepoint_formation_algorithm::output_type +silicon_pixel_spacepoint_formation_algorithm::operator()( + const default_detector::host& det, + const measurement_collection_types::const_view& meas) const { + + return details::silicon_pixel_spacepoint_formation(det, meas, m_mr); +} + +} // namespace traccc::host diff --git a/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_teldet.cpp b/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_teldet.cpp new file mode 100644 index 0000000000..8b5ff8f50b --- /dev/null +++ b/core/src/seeding/silicon_pixel_spacepoint_formation_algorithm_teldet.cpp @@ -0,0 +1,22 @@ +/** TRACCC library, part of the ACTS project (R&D line) + * + * (c) 2022-2024 CERN for the benefit of the ACTS project + * + * Mozilla Public License Version 2.0 + */ + +// Library include(s). +#include "silicon_pixel_spacepoint_formation.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" + +namespace traccc::host { + +silicon_pixel_spacepoint_formation_algorithm::output_type +silicon_pixel_spacepoint_formation_algorithm::operator()( + const telescope_detector::host& det, + const measurement_collection_types::const_view& meas) const { + + return details::silicon_pixel_spacepoint_formation(det, meas, m_mr); +} + +} // namespace traccc::host diff --git a/core/src/seeding/spacepoint_formation_algorithm.cpp b/core/src/seeding/spacepoint_formation_algorithm.cpp deleted file mode 100644 index 37a48b97b8..0000000000 --- a/core/src/seeding/spacepoint_formation_algorithm.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/** TRACCC library, part of the ACTS project (R&D line) - * - * (c) 2022-2024 CERN for the benefit of the ACTS project - * - * Mozilla Public License Version 2.0 - */ - -// Library include(s). -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" - -#include "traccc/seeding/details/spacepoint_formation.hpp" - -namespace traccc::host { - -spacepoint_formation_algorithm::spacepoint_formation_algorithm( - vecmem::memory_resource& mr) - : m_mr(mr) {} - -spacepoint_formation_algorithm::output_type -spacepoint_formation_algorithm::operator()( - const measurement_collection_types::const_view& measurements_view, - const silicon_detector_description::const_view& dd_view) const { - - // Create device containers for the inputs. - const measurement_collection_types::const_device measurements{ - measurements_view}; - const silicon_detector_description::const_device det_descr{dd_view}; - - // Create the result container. - output_type result(measurements.size(), &(m_mr.get())); - - // Set up each spacepoint in the result container. - for (measurement_collection_types::const_device::size_type i = 0; - i < measurements.size(); ++i) { - - details::fill_spacepoint(result[i], measurements[i], det_descr); - } - - // Return the created container. - return result; -} - -} // namespace traccc::host From 9077bbcad4ca56bea18e27c67ec09817e373926e Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Wed, 23 Oct 2024 13:36:39 +0200 Subject: [PATCH 2/2] Updated all clients to the new (host) spacepoint formation algorithm. --- examples/run/alpaka/seq_example_alpaka.cpp | 8 +++----- examples/run/cpu/full_chain_algorithm.cpp | 5 ++--- examples/run/cpu/full_chain_algorithm.hpp | 9 ++++----- examples/run/cpu/seq_example.cpp | 8 +++----- examples/run/cuda/seq_example_cuda.cpp | 8 +++----- examples/run/openmp/par_example.cpp | 5 ++--- examples/run/sycl/seq_example_sycl.sycl | 8 +++----- tests/cpu/test_clusterization_resolution.cpp | 6 ++---- tests/cpu/test_spacepoint_formation.cpp | 4 ++-- 9 files changed, 24 insertions(+), 37 deletions(-) diff --git a/examples/run/alpaka/seq_example_alpaka.cpp b/examples/run/alpaka/seq_example_alpaka.cpp index 7599e35679..9b6aaebe37 100644 --- a/examples/run/alpaka/seq_example_alpaka.cpp +++ b/examples/run/alpaka/seq_example_alpaka.cpp @@ -28,7 +28,7 @@ #include "traccc/performance/container_comparator.hpp" #include "traccc/performance/timer.hpp" #include "traccc/seeding/seeding_algorithm.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" #include "traccc/seeding/track_params_estimation.hpp" // VecMem include(s). @@ -121,8 +121,7 @@ int seq_run(const traccc::opts::detector& detector_opts, // Type definitions using host_spacepoint_formation_algorithm = - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>; + traccc::host::silicon_pixel_spacepoint_formation_algorithm; using device_spacepoint_formation_algorithm = traccc::alpaka::spacepoint_formation_algorithm< traccc::default_detector::device>; @@ -156,8 +155,7 @@ int seq_run(const traccc::opts::detector& detector_opts, // Instantiate host containers/collections traccc::host::clusterization_algorithm::output_type measurements_per_event; - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>::output_type spacepoints_per_event; + host_spacepoint_formation_algorithm::output_type spacepoints_per_event; traccc::seeding_algorithm::output_type seeds; traccc::track_params_estimation::output_type params; diff --git a/examples/run/cpu/full_chain_algorithm.cpp b/examples/run/cpu/full_chain_algorithm.cpp index a0dff1fa16..9abda5159c 100644 --- a/examples/run/cpu/full_chain_algorithm.cpp +++ b/examples/run/cpu/full_chain_algorithm.cpp @@ -44,7 +44,7 @@ full_chain_algorithm::output_type full_chain_algorithm::operator()( // Run the clusterization. auto cells_data = vecmem::get_data(cells); - const host::clusterization_algorithm::output_type measurements = + const clustering_algorithm::output_type measurements = m_clusterization(cells_data, det_descr_data); // If we have a Detray detector, run the seeding track finding and fitting. @@ -53,8 +53,7 @@ full_chain_algorithm::output_type full_chain_algorithm::operator()( // Run the seed-finding. const measurement_collection_types::const_view measurements_view = vecmem::get_data(measurements); - const host::spacepoint_formation_algorithm< - const detector_type>::output_type spacepoints = + const spacepoint_formation_algorithm::output_type spacepoints = m_spacepoint_formation(*m_detector, measurements_view); const track_params_estimation::output_type track_params = m_track_parameter_estimation(spacepoints, m_seeding(spacepoints), diff --git a/examples/run/cpu/full_chain_algorithm.hpp b/examples/run/cpu/full_chain_algorithm.hpp index f9d4554f0a..4fdaf10a4f 100644 --- a/examples/run/cpu/full_chain_algorithm.hpp +++ b/examples/run/cpu/full_chain_algorithm.hpp @@ -17,7 +17,7 @@ #include "traccc/geometry/detector.hpp" #include "traccc/geometry/silicon_detector_description.hpp" #include "traccc/seeding/seeding_algorithm.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" #include "traccc/seeding/track_params_estimation.hpp" #include "traccc/utils/algorithm.hpp" @@ -61,8 +61,7 @@ class full_chain_algorithm : public algorithm; + traccc::host::silicon_pixel_spacepoint_formation_algorithm; /// Track finding algorithm type using finding_algorithm = traccc::host::ckf_algorithm; /// Track fitting algorithm type @@ -112,9 +111,9 @@ class full_chain_algorithm : public algorithm m_spacepoint_formation; + spacepoint_formation_algorithm m_spacepoint_formation; /// Seeding algorithm seeding_algorithm m_seeding; /// Track parameter estimation algorithm diff --git a/examples/run/cpu/seq_example.cpp b/examples/run/cpu/seq_example.cpp index 7d2772e2c9..1e63641e4f 100644 --- a/examples/run/cpu/seq_example.cpp +++ b/examples/run/cpu/seq_example.cpp @@ -18,7 +18,7 @@ #include "traccc/finding/ckf_algorithm.hpp" #include "traccc/fitting/fitting_algorithm.hpp" #include "traccc/seeding/seeding_algorithm.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" #include "traccc/seeding/track_params_estimation.hpp" // performance @@ -99,8 +99,7 @@ int seq_run(const traccc::opts::input_data& input_opts, // Type definitions using spacepoint_formation_algorithm = - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>; + traccc::host::silicon_pixel_spacepoint_formation_algorithm; using stepper_type = detray::rk_stepper::output_type spacepoints_per_event{ + spacepoint_formation_algorithm::output_type spacepoints_per_event{ &host_mr}; traccc::seeding_algorithm::output_type seeds{&host_mr}; traccc::track_params_estimation::output_type params{&host_mr}; diff --git a/examples/run/cuda/seq_example_cuda.cpp b/examples/run/cuda/seq_example_cuda.cpp index 5b40809849..49226908a9 100644 --- a/examples/run/cuda/seq_example_cuda.cpp +++ b/examples/run/cuda/seq_example_cuda.cpp @@ -36,7 +36,7 @@ #include "traccc/performance/container_comparator.hpp" #include "traccc/performance/timer.hpp" #include "traccc/seeding/seeding_algorithm.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" #include "traccc/seeding/track_params_estimation.hpp" // Detray include(s). @@ -122,8 +122,7 @@ int seq_run(const traccc::opts::detector& detector_opts, // Type definitions using host_spacepoint_formation_algorithm = - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>; + traccc::host::silicon_pixel_spacepoint_formation_algorithm; using device_spacepoint_formation_algorithm = traccc::cuda::spacepoint_formation_algorithm< traccc::default_detector::device>; @@ -199,8 +198,7 @@ int seq_run(const traccc::opts::detector& detector_opts, // Instantiate host containers/collections traccc::host::clusterization_algorithm::output_type measurements_per_event; - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>::output_type spacepoints_per_event; + host_spacepoint_formation_algorithm::output_type spacepoints_per_event; traccc::seeding_algorithm::output_type seeds; traccc::track_params_estimation::output_type params; host_finding_algorithm::output_type track_candidates; diff --git a/examples/run/openmp/par_example.cpp b/examples/run/openmp/par_example.cpp index 4026a04f6d..45094c5aa7 100644 --- a/examples/run/openmp/par_example.cpp +++ b/examples/run/openmp/par_example.cpp @@ -19,7 +19,7 @@ #include "traccc/options/detector.hpp" #include "traccc/options/input_data.hpp" #include "traccc/options/program_options.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" // VecMem include(s). #include @@ -65,8 +65,7 @@ int par_run(const traccc::opts::input_data& input_opts, // Type definitions using spacepoint_formation_algorithm = - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>; + traccc::host::silicon_pixel_spacepoint_formation_algorithm; // Algorithms traccc::host::clusterization_algorithm ca(resource); diff --git a/examples/run/sycl/seq_example_sycl.sycl b/examples/run/sycl/seq_example_sycl.sycl index abfb68b9af..ec98b4dcda 100644 --- a/examples/run/sycl/seq_example_sycl.sycl +++ b/examples/run/sycl/seq_example_sycl.sycl @@ -17,7 +17,7 @@ // algorithms #include "traccc/clusterization/clusterization_algorithm.hpp" #include "traccc/seeding/seeding_algorithm.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" #include "traccc/seeding/track_params_estimation.hpp" #include "traccc/sycl/clusterization/clusterization_algorithm.hpp" #include "traccc/sycl/seeding/seeding_algorithm.hpp" @@ -132,8 +132,7 @@ int seq_run(const traccc::opts::detector& detector_opts, // Type definitions using host_spacepoint_formation_algorithm = - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>; + traccc::host::silicon_pixel_spacepoint_formation_algorithm; using device_spacepoint_formation_algorithm = traccc::sycl::spacepoint_formation_algorithm< traccc::default_detector::device>; @@ -171,8 +170,7 @@ int seq_run(const traccc::opts::detector& detector_opts, // Instantiate host containers/collections traccc::host::clusterization_algorithm::output_type measurements_per_event; - traccc::host::spacepoint_formation_algorithm< - traccc::default_detector::host>::output_type spacepoints_per_event; + host_spacepoint_formation_algorithm::output_type spacepoints_per_event; traccc::seeding_algorithm::output_type seeds; traccc::track_params_estimation::output_type params; diff --git a/tests/cpu/test_clusterization_resolution.cpp b/tests/cpu/test_clusterization_resolution.cpp index 26e7445041..e8c17a0570 100644 --- a/tests/cpu/test_clusterization_resolution.cpp +++ b/tests/cpu/test_clusterization_resolution.cpp @@ -14,7 +14,7 @@ #include "traccc/io/read_detector_description.hpp" #include "traccc/io/read_spacepoints.hpp" #include "traccc/performance/details/is_same_object.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" // VecMem include(s). #include @@ -50,9 +50,7 @@ TEST_P(SurfaceBinningTests, Run) { // Algorithms traccc::host::clusterization_algorithm ca(host_mr); - traccc::host::spacepoint_formation_algorithm< - const traccc::default_detector::host> - sf(host_mr); + traccc::host::silicon_pixel_spacepoint_formation_algorithm sf(host_mr); // Read the cells from the relevant event file traccc::edm::silicon_cell_collection::host cells_truth{host_mr}; diff --git a/tests/cpu/test_spacepoint_formation.cpp b/tests/cpu/test_spacepoint_formation.cpp index 911af4f986..17af194f05 100644 --- a/tests/cpu/test_spacepoint_formation.cpp +++ b/tests/cpu/test_spacepoint_formation.cpp @@ -8,7 +8,7 @@ // Project include(s). #include "traccc/definitions/common.hpp" #include "traccc/edm/spacepoint.hpp" -#include "traccc/seeding/spacepoint_formation_algorithm.hpp" +#include "traccc/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp" // Detray include(s). #include "detray/geometry/shapes/rectangle2D.hpp" @@ -60,7 +60,7 @@ TEST(spacepoint_formation, cpu) { measurements.push_back({{10.f, 15.f}, {0.f, 0.f}, surfaces[8u].barcode()}); // Run spacepoint formation - host::spacepoint_formation_algorithm sp_formation(host_mr); + host::silicon_pixel_spacepoint_formation_algorithm sp_formation(host_mr); auto spacepoints = sp_formation(det, vecmem::get_data(measurements)); // Check the results