Skip to content

Commit f0da9fb

Browse files
krasznaakrasznaa
committed
Adapted all tests to the cell+measurement concretization.
1 parent c91e7f1 commit f0da9fb

34 files changed

+160
-205
lines changed

‎tests/alpaka/test_cca.cpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2022-2025 CERN for the benefit of the ACTS project
3+
* (c) 2022-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -38,11 +38,10 @@ cca_function_t get_f_with(traccc::clustering_config cfg) {
3838

3939
-> std::pair<
4040
std::map<traccc::geometry_id,
41-
traccc::edm::measurement_collection<
42-
traccc::default_algebra>::host>,
41+
traccc::edm::measurement_collection::host>,
4342
std::optional<traccc::edm::silicon_cluster_collection::host>> {
44-
std::map<traccc::geometry_id, traccc::edm::measurement_collection<
45-
traccc::default_algebra>::host>
43+
std::map<traccc::geometry_id,
44+
traccc::edm::measurement_collection::host>
4645
result;
4746

4847
traccc::alpaka::queue queue;
@@ -94,8 +93,8 @@ cca_function_t get_f_with(traccc::clustering_config cfg) {
9493
cc(cells_buffer, det_desc_buffer, det_cond_buffer,
9594
traccc::device::clustering_keep_disjoint_set{});
9695
queue.synchronize();
97-
traccc::edm::measurement_collection<traccc::default_algebra>::host
98-
measurements{pinned_host_mr};
96+
traccc::edm::measurement_collection::host measurements{
97+
pinned_host_mr};
9998
copy(measurements_buffer, measurements)->wait();
10099

101100
traccc::edm::silicon_cluster_collection::host clusters{host_mr};
@@ -106,8 +105,7 @@ cca_function_t get_f_with(traccc::clustering_config cfg) {
106105
measurements.at(i).surface_link().value()) == false) {
107106
result.insert(
108107
{measurements.at(i).surface_link().value(),
109-
traccc::edm::measurement_collection<
110-
traccc::default_algebra>::host{host_mr}});
108+
traccc::edm::measurement_collection::host{host_mr}});
111109
}
112110
result.at(measurements.at(i).surface_link().value())
113111
.push_back(measurements.at(i));

‎tests/common/tests/cca_test.hpp‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2021-2024 CERN for the benefit of the ACTS project
3+
* (c) 2021-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -38,13 +38,12 @@
3838
#include <sstream>
3939
#include <string>
4040

41-
using cca_function_t = std::function<
42-
std::pair<std::map<traccc::geometry_id, traccc::edm::measurement_collection<
43-
traccc::default_algebra>::host>,
44-
std::optional<traccc::edm::silicon_cluster_collection::host>>(
45-
const traccc::edm::silicon_cell_collection::host &,
46-
const traccc::detector_design_description::host &,
47-
const traccc::detector_conditions_description::host &)>;
41+
using cca_function_t = std::function<std::pair<
42+
std::map<traccc::geometry_id, traccc::edm::measurement_collection::host>,
43+
std::optional<traccc::edm::silicon_cluster_collection::host>>(
44+
const traccc::edm::silicon_cell_collection::host &,
45+
const traccc::detector_design_description::host &,
46+
const traccc::detector_conditions_description::host &)>;
4847

4948
inline traccc::clustering_config default_ccl_test_config() {
5049
traccc::clustering_config rv;
@@ -195,8 +194,7 @@ class ConnectedComponentAnalysisTests
195194
while (truth_reader.read(io_truth)) {
196195
ASSERT_TRUE(result.find(io_truth.geometry_id) != result.end());
197196

198-
const traccc::edm::measurement_collection<
199-
traccc::default_algebra>::host &meas =
197+
const traccc::edm::measurement_collection::host &meas =
200198
result.at(io_truth.geometry_id);
201199

202200
const traccc::scalar tol = 0.0001f;

‎tests/common/tests/kalman_fitting_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2022-2025 CERN for the benefit of the ACTS project
3+
* (c) 2022-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -136,7 +136,7 @@ void KalmanFittingTests::p_value_tests(
136136
void KalmanFittingTests::ndf_tests(
137137
const edm::track_collection<default_algebra>::host::const_proxy_type& track,
138138
const edm::track_state_collection<default_algebra>::host& track_states,
139-
const edm::measurement_collection<default_algebra>::host& measurements) {
139+
const edm::measurement_collection::host& measurements) {
140140

141141
scalar dim_sum = 0;
142142
std::size_t n_effective_states = 0;

‎tests/common/tests/kalman_fitting_test.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2022-2025 CERN for the benefit of the ACTS project
3+
* (c) 2022-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -82,7 +82,7 @@ class KalmanFittingTests : public testing::Test {
8282
const edm::track_collection<default_algebra>::host::const_proxy_type&
8383
track,
8484
const edm::track_state_collection<default_algebra>::host& track_states,
85-
const edm::measurement_collection<default_algebra>::host& measurements);
85+
const edm::measurement_collection::host& measurements);
8686

8787
/// Count the number of tracks that were successfully fitted
8888
///

‎tests/common/tests/triplet_fitting_test.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2022-2023 CERN for the benefit of the ACTS project
3+
* (c) 2022-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -136,7 +136,7 @@ void TripletFittingTests::p_value_tests(
136136
void TripletFittingTests::ndf_tests(
137137
const edm::track_collection<default_algebra>::host::const_proxy_type& track,
138138
const edm::track_state_collection<default_algebra>::host& track_states,
139-
const edm::measurement_collection<default_algebra>::host& measurements) {
139+
const edm::measurement_collection::host& measurements) {
140140

141141
scalar dim_sum = 0;
142142
std::size_t n_effective_states = 0;

‎tests/common/tests/triplet_fitting_test.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2022-2024 CERN for the benefit of the ACTS project
3+
* (c) 2022-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -87,7 +87,7 @@ class TripletFittingTests : public testing::Test {
8787
const edm::track_collection<default_algebra>::host::const_proxy_type&
8888
track,
8989
const edm::track_state_collection<default_algebra>::host& track_states,
90-
const edm::measurement_collection<default_algebra>::host& measurements);
90+
const edm::measurement_collection::host& measurements);
9191

9292
/// Count the number of tracks that were successfully fitted
9393
///

‎tests/cpu/compare_with_acts_seeding.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ TEST_P(CompareWithActsSeedingTests, Run) {
8181

8282
// Read the hits from the relevant event file
8383
traccc::edm::spacepoint_collection::host spacepoints_per_event{host_mr};
84-
traccc::edm::measurement_collection<traccc::default_algebra>::host
85-
measurements_per_event{host_mr};
84+
traccc::edm::measurement_collection::host measurements_per_event{host_mr};
8685
traccc::io::read_spacepoints(spacepoints_per_event, measurements_per_event,
8786
event, hits_dir);
8887

‎tests/cpu/test_ambiguity_resolution.cpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2025 CERN for the benefit of the ACTS project
3+
* (c) 2025-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -26,9 +26,8 @@ namespace {
2626
vecmem::host_memory_resource host_mr;
2727
} // namespace
2828

29-
void fill_measurements(
30-
edm::measurement_collection<default_algebra>::host& measurements,
31-
const measurement_id_type max_meas_id) {
29+
void fill_measurements(edm::measurement_collection::host& measurements,
30+
const measurement_id_type max_meas_id) {
3231

3332
measurements.reserve(max_meas_id + 1);
3433
for (measurement_id_type i = 0; i <= max_meas_id; i++) {
@@ -44,7 +43,7 @@ void fill_pattern(edm::track_container<default_algebra>::host& track_candidates,
4443
track_candidates.tracks.resize(track_candidates.tracks.size() + 1u);
4544
track_candidates.tracks.pval().back() = pval;
4645

47-
edm::measurement_collection<default_algebra>::const_device measurements{
46+
edm::measurement_collection::const_device measurements{
4847
track_candidates.measurements};
4948

5049
for (const auto& meas_id : pattern) {
@@ -64,7 +63,7 @@ std::vector<std::size_t> get_pattern(
6463
const edm::track_container<default_algebra>::host& track_candidates,
6564
const std::size_t idx) {
6665

67-
edm::measurement_collection<default_algebra>::const_device measurements{
66+
edm::measurement_collection::const_device measurements{
6867
track_candidates.measurements};
6968
std::vector<std::size_t> ret;
7069
// A const reference would be fine here. But GCC fears that that would lead
@@ -80,7 +79,7 @@ std::vector<std::size_t> get_pattern(
8079

8180
TEST(AmbiguitySolverTests, GreedyResolverTest0) {
8281

83-
edm::measurement_collection<default_algebra>::host measurements{host_mr};
82+
edm::measurement_collection::host measurements{host_mr};
8483
fill_measurements(measurements, 100);
8584

8685
edm::track_container<default_algebra>::host trk_cands{
@@ -157,7 +156,7 @@ TEST(AmbiguitySolverTests, GreedyResolverTest0) {
157156

158157
TEST(AmbiguitySolverTests, GreedyResolverTest1) {
159158

160-
edm::measurement_collection<default_algebra>::host measurements{host_mr};
159+
edm::measurement_collection::host measurements{host_mr};
161160
fill_measurements(measurements, 100);
162161

163162
edm::track_container<default_algebra>::host trk_cands{
@@ -205,7 +204,7 @@ TEST(AmbiguitySolverTests, GreedyResolverTest1) {
205204

206205
TEST(AmbiguitySolverTests, GreedyResolverTest2) {
207206

208-
edm::measurement_collection<default_algebra>::host measurements{host_mr};
207+
edm::measurement_collection::host measurements{host_mr};
209208
fill_measurements(measurements, 100);
210209

211210
edm::track_container<default_algebra>::host trk_cands{
@@ -232,7 +231,7 @@ TEST(AmbiguitySolverTests, GreedyResolverTest2) {
232231

233232
TEST(AmbiguitySolverTests, GreedyResolverTest3) {
234233

235-
edm::measurement_collection<default_algebra>::host measurements{host_mr};
234+
edm::measurement_collection::host measurements{host_mr};
236235
fill_measurements(measurements, 100);
237236

238237
edm::track_container<default_algebra>::host trk_cands{
@@ -280,7 +279,7 @@ TEST(AmbiguitySolverTests, GreedyResolverTest3) {
280279
// Comparison to the legacy algorithm.
281280
TEST(AmbiguitySolverTests, GreedyResolverTest4) {
282281

283-
edm::measurement_collection<default_algebra>::host measurements{host_mr};
282+
edm::measurement_collection::host measurements{host_mr};
284283
const measurement_id_type max_meas_id = 10000;
285284
fill_measurements(measurements, max_meas_id);
286285

@@ -365,7 +364,7 @@ TEST(AmbiguitySolverTests, GreedyResolverTest4) {
365364

366365
TEST(AmbiguitySolverTests, GreedyResolverTest5) {
367366

368-
edm::measurement_collection<default_algebra>::host measurements{host_mr};
367+
edm::measurement_collection::host measurements{host_mr};
369368
fill_measurements(measurements, 100);
370369

371370
edm::track_container<default_algebra>::host trk_cands{
@@ -395,7 +394,7 @@ TEST(AmbiguitySolverTests, GreedyResolverTest5) {
395394

396395
TEST(AmbiguitySolverTests, GreedyResolverTest6) {
397396

398-
edm::measurement_collection<default_algebra>::host measurements{host_mr};
397+
edm::measurement_collection::host measurements{host_mr};
399398
fill_measurements(measurements, 100);
400399

401400
edm::track_container<default_algebra>::host trk_cands{

‎tests/cpu/test_cca.cpp‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2021-2025 CERN for the benefit of the ACTS project
3+
* (c) 2021-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -34,12 +34,10 @@ cca_function_t f =
3434
[](const traccc::edm::silicon_cell_collection::host& cells,
3535
const traccc::detector_design_description::host& det_desc,
3636
const traccc::detector_conditions_description::host& det_cond)
37-
-> std::pair<
38-
std::map<traccc::geometry_id, traccc::edm::measurement_collection<
39-
traccc::default_algebra>::host>,
40-
std::optional<traccc::edm::silicon_cluster_collection::host>> {
41-
std::map<traccc::geometry_id,
42-
traccc::edm::measurement_collection<traccc::default_algebra>::host>
37+
-> std::pair<std::map<traccc::geometry_id,
38+
traccc::edm::measurement_collection::host>,
39+
std::optional<traccc::edm::silicon_cluster_collection::host>> {
40+
std::map<traccc::geometry_id, traccc::edm::measurement_collection::host>
4341
result;
4442

4543
const traccc::edm::silicon_cell_collection::const_data cells_data =
@@ -56,9 +54,9 @@ cca_function_t f =
5654
for (std::size_t i = 0; i < measurements.size(); i++) {
5755
if (result.contains(measurements.at(i).surface_link().value()) ==
5856
false) {
59-
result.insert({measurements.at(i).surface_link().value(),
60-
traccc::edm::measurement_collection<
61-
traccc::default_algebra>::host{resource}});
57+
result.insert(
58+
{measurements.at(i).surface_link().value(),
59+
traccc::edm::measurement_collection::host{resource}});
6260
}
6361
result.at(measurements.at(i).surface_link().value())
6462
.push_back(measurements.at(i));

‎tests/cpu/test_ckf_combinatorics_telescope.cpp‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** TRACCC library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2023-2025 CERN for the benefit of the ACTS project
3+
* (c) 2023-2026 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -140,8 +140,7 @@ TEST_P(CpuCkfCombinatoricsTelescopeTests, Run) {
140140
// Truth Track Candidates
141141
traccc::event_data evt_data(path, i_evt, host_mr);
142142

143-
traccc::edm::measurement_collection<traccc::default_algebra>::host
144-
truth_measurements{host_mr};
143+
traccc::edm::measurement_collection::host truth_measurements{host_mr};
145144
traccc::edm::track_container<traccc::default_algebra>::host
146145
truth_track_candidates{host_mr};
147146
evt_data.generate_truth_candidates(truth_track_candidates,
@@ -161,12 +160,11 @@ TEST_P(CpuCkfCombinatoricsTelescopeTests, Run) {
161160
seeds_view = vecmem::get_data(seeds);
162161

163162
// Read measurements
164-
traccc::edm::measurement_collection<traccc::default_algebra>::host
165-
measurements_per_event{host_mr};
163+
traccc::edm::measurement_collection::host measurements_per_event{
164+
host_mr};
166165
traccc::io::read_measurements(measurements_per_event, i_evt, path);
167-
const traccc::edm::measurement_collection<
168-
traccc::default_algebra>::const_view measurements_view =
169-
vecmem::get_data(measurements_per_event);
166+
const traccc::edm::measurement_collection::const_view
167+
measurements_view = vecmem::get_data(measurements_per_event);
170168

171169
// Run finding
172170
auto track_candidates =

0 commit comments

Comments
 (0)