Skip to content

Commit fa3ee41

Browse files
author
Mark
committed
formatting
1 parent 69f97ef commit fa3ee41

File tree

5 files changed

+34
-32
lines changed

5 files changed

+34
-32
lines changed

examples/run/alpaka/full_chain_algorithm.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ full_chain_algorithm::full_chain_algorithm(
8080

8181
if (usingGBTS) {
8282
TRACCC_LOCAL_LOGGER(std::move(logger));
83-
TRACCC_ERROR("GBTS not implemented for alpaka, this will run with "
84-
"triplet seeding");
83+
TRACCC_ERROR(
84+
"GBTS not implemented for alpaka, this will run with "
85+
"triplet seeding");
8586
}
8687
std::cout << traccc::alpaka::get_device_info() << std::endl;
8788

examples/run/cpu/full_chain_algorithm.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ full_chain_algorithm::full_chain_algorithm(
4949

5050
if (usingGBTS) {
5151
TRACCC_LOCAL_LOGGER(std::move(logger));
52-
TRACCC_ERROR("GBTS not implemented for CPU, this will run with "
53-
"triplet seeding");
52+
TRACCC_ERROR(
53+
"GBTS not implemented for CPU, this will run with "
54+
"triplet seeding");
5455
}
5556
}
5657

examples/run/cuda/full_chain_algorithm.cpp

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ full_chain_algorithm::full_chain_algorithm(
8686
m_finder_config(finder_config),
8787
m_grid_config(grid_config),
8888
m_filter_config(filter_config),
89-
m_gbts_config(gbts_config),
89+
m_gbts_config(gbts_config),
9090
m_track_params_estimation_config(track_params_estimation_config),
9191
m_finding_config(finding_config),
9292
m_fitting_config(fitting_config),
@@ -190,18 +190,17 @@ full_chain_algorithm::output_type full_chain_algorithm::operator()(
190190
// Run the seed-finding (asynchronously).
191191
const spacepoint_formation_algorithm::output_type spacepoints =
192192
m_spacepoint_formation(m_device_detector, measurements);
193-
194-
triplet_seeding_algorithm::output_type seeds;
195-
if(usingGBTS) {
196-
seeds = m_gbts_seeding(spacepoints, measurements);
197-
}
198-
else {
199-
seeds = m_seeding(spacepoints);
200-
}
201-
const seed_parameter_estimation_algorithm::output_type track_params =
202-
m_track_parameter_estimation(m_field, measurements, spacepoints,
203-
seeds);
204-
193+
194+
triplet_seeding_algorithm::output_type seeds;
195+
if (usingGBTS) {
196+
seeds = m_gbts_seeding(spacepoints, measurements);
197+
} else {
198+
seeds = m_seeding(spacepoints);
199+
}
200+
const seed_parameter_estimation_algorithm::output_type track_params =
201+
m_track_parameter_estimation(m_field, measurements, spacepoints,
202+
seeds);
203+
205204
// Run the track finding (asynchronously).
206205
const finding_algorithm::output_type track_candidates =
207206
m_finding(m_device_detector, m_field, measurements, track_params);
@@ -250,16 +249,16 @@ bound_track_parameters_collection_types::host full_chain_algorithm::seeding(
250249
// Run the seed-finding (asynchronously).
251250
const spacepoint_formation_algorithm::output_type spacepoints =
252251
m_spacepoint_formation(m_device_detector, measurements);
253-
254-
triplet_seeding_algorithm::output_type seeds;
255-
if (usingGBTS) {
256-
seeds = m_gbts_seeding(spacepoints, measurements);
257-
} else {
258-
seeds = m_seeding(spacepoints);
259-
}
260-
const seed_parameter_estimation_algorithm::output_type track_params =
261-
m_track_parameter_estimation(m_field, measurements, spacepoints,
262-
seeds);
252+
253+
triplet_seeding_algorithm::output_type seeds;
254+
if (usingGBTS) {
255+
seeds = m_gbts_seeding(spacepoints, measurements);
256+
} else {
257+
seeds = m_seeding(spacepoints);
258+
}
259+
const seed_parameter_estimation_algorithm::output_type track_params =
260+
m_track_parameter_estimation(m_field, measurements, spacepoints,
261+
seeds);
263262

264263
// Copy a limited amount of result data back to the host.
265264
const auto host_seeds = m_copy.to(track_params, m_cached_pinned_host_mr,

examples/run/cuda/full_chain_algorithm.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
#include "traccc/cuda/clusterization/measurement_sorting_algorithm.hpp"
1414
#include "traccc/cuda/finding/combinatorial_kalman_filter_algorithm.hpp"
1515
#include "traccc/cuda/fitting/kalman_fitting_algorithm.hpp"
16+
#include "traccc/cuda/gbts_seeding/gbts_seeding_algorithm.hpp"
1617
#include "traccc/cuda/seeding/seed_parameter_estimation_algorithm.hpp"
1718
#include "traccc/cuda/seeding/silicon_pixel_spacepoint_formation_algorithm.hpp"
1819
#include "traccc/cuda/seeding/triplet_seeding_algorithm.hpp"
19-
#include "traccc/cuda/gbts_seeding/gbts_seeding_algorithm.hpp"
2020
#include "traccc/cuda/utils/stream.hpp"
2121
#include "traccc/edm/silicon_cell_collection.hpp"
2222
#include "traccc/edm/track_collection.hpp"
@@ -156,8 +156,8 @@ class full_chain_algorithm
156156
spacepoint_formation_algorithm m_spacepoint_formation;
157157
/// Seeding algorithm
158158
triplet_seeding_algorithm m_seeding;
159-
/// Seeding with GBTS algorithm
160-
gbts_seeding_algorithm m_gbts_seeding;
159+
/// Seeding with GBTS algorithm
160+
gbts_seeding_algorithm m_gbts_seeding;
161161
/// Track parameter estimation algorithm
162162
seed_parameter_estimation_algorithm m_track_parameter_estimation;
163163

examples/run/sycl/full_chain_algorithm.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,9 @@ full_chain_algorithm::full_chain_algorithm(
100100

101101
if (usingGBTS) {
102102
TRACCC_LOCAL_LOGGER(std::move(log));
103-
TRACCC_ERROR("GBTS not implemented for sycl, this will run with "
104-
"triplet seeding");
103+
TRACCC_ERROR(
104+
"GBTS not implemented for sycl, this will run with "
105+
"triplet seeding");
105106
}
106107
// Tell the user what device is being used.
107108
TRACCC_INFO("Using SYCL device: " << m_data->m_queue.device_name());

0 commit comments

Comments
 (0)