Skip to content
This repository was archived by the owner on Jul 15, 2026. It is now read-only.

Commit e92130b

Browse files
author
Mark
committed
formatting
1 parent 0957a75 commit e92130b

10 files changed

Lines changed: 47 additions & 50 deletions

‎examples/run/alpaka/full_chain_algorithm.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ full_chain_algorithm::full_chain_algorithm(
2626
const fitting_algorithm::config_type& fitting_config,
2727
const silicon_detector_description::host& det_descr,
2828
const magnetic_field& field, host_detector* detector,
29-
std::unique_ptr<const traccc::Logger> logger,
30-
bool useGBTS = false)
29+
std::unique_ptr<const traccc::Logger> logger, bool useGBTS = false)
3130
: messaging(logger->clone()),
3231
m_queue(),
3332
m_vecmem_objects(m_queue),
@@ -74,7 +73,7 @@ full_chain_algorithm::full_chain_algorithm(
7473
m_track_params_estimation_config(track_params_estimation_config),
7574
m_finding_config(finding_config),
7675
m_fitting_config(fitting_config),
77-
usingGBTS(useGBTS) {
76+
usingGBTS(useGBTS) {
7877

7978
std::cout << traccc::alpaka::get_device_info() << std::endl;
8079

@@ -139,7 +138,7 @@ full_chain_algorithm::full_chain_algorithm(const full_chain_algorithm& parent)
139138
m_track_params_estimation_config(parent.m_track_params_estimation_config),
140139
m_finding_config(parent.m_finding_config),
141140
m_fitting_config(parent.m_fitting_config),
142-
usingGBTS(parent.usingGBTS) {
141+
usingGBTS(parent.usingGBTS) {
143142

144143
// Copy the detector (description) to the device.
145144
m_vecmem_objects

‎examples/run/alpaka/full_chain_algorithm.hpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,13 @@ class full_chain_algorithm
8080
const seedfinder_config& finder_config,
8181
const spacepoint_grid_config& grid_config,
8282
const seedfilter_config& filter_config,
83-
const gbts_seedfinder_config& gbts_config,
83+
const gbts_seedfinder_config& gbts_config,
8484
const track_params_estimation_config& track_params_estimation_config,
8585
const finding_algorithm::config_type& finding_config,
8686
const fitting_algorithm::config_type& fitting_config,
8787
const silicon_detector_description::host& det_descr,
8888
const magnetic_field& field, host_detector* detector,
89-
std::unique_ptr<const traccc::Logger> logger,
90-
useGBTS = false);
89+
std::unique_ptr<const traccc::Logger> logger, useGBTS = false);
9190

9291
/// Copy constructor
9392
///
@@ -179,19 +178,19 @@ class full_chain_algorithm
179178
spacepoint_grid_config m_grid_config;
180179
/// Configuration for the seed filtering
181180
seedfilter_config m_filter_config;
182-
/// placeholder GBTS config
183-
gbts_seedfinder_config m_gbts_config;
181+
/// placeholder GBTS config
182+
gbts_seedfinder_config m_gbts_config;
184183
/// Configuration for track parameter estimation
185184
track_params_estimation_config m_track_params_estimation_config;
186-
187-
/// Configuration for the track finding
185+
186+
/// Configuration for the track finding
188187
finding_algorithm::config_type m_finding_config;
189188
/// Configuration for the track fitting
190189
fitting_algorithm::config_type m_fitting_config;
191-
192-
bool usingGBTS;
193-
194-
/// @}
190+
191+
bool usingGBTS;
192+
193+
/// @}
195194

196195
}; // class full_chain_algorithm
197196

‎examples/run/common/throughput_mt.ipp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ int throughput_mt(std::string_view description, int argc, char* argv[]) {
152152
const traccc::seedfilter_config seedfilter_config(seeding_opts);
153153
const traccc::spacepoint_grid_config spacepoint_grid_config(seeding_opts);
154154
const traccc::track_params_estimation_config track_params_estimation_config;
155-
155+
156156
traccc::gbts_seedfinder_config gbts_config;
157157
if (seeding_gbts_opts.useGBTS) {
158158
if (!gbts_config.setLinkingScheme(
@@ -177,11 +177,12 @@ int throughput_mt(std::string_view description, int argc, char* argv[]) {
177177
std::vector<FULL_CHAIN_ALG> algs;
178178
algs.reserve(threading_opts.threads + 1);
179179
for (std::size_t i = 0; i < threading_opts.threads + 1; ++i) {
180-
algs.push_back({host_mr, clustering_cfg, seedfinder_config,
181-
spacepoint_grid_config, seedfilter_config, gbts_config, track_params_estimation_config,
182-
finding_cfg, fitting_cfg, det_descr, field, &detector,
183-
logger().clone(), seeding_gbts_opts.useGBTS});
184-
}
180+
algs.push_back({host_mr, clustering_cfg, seedfinder_config,
181+
spacepoint_grid_config, seedfilter_config, gbts_config,
182+
track_params_estimation_config, finding_cfg,
183+
fitting_cfg, det_descr, field, &detector,
184+
logger().clone(), seeding_gbts_opts.useGBTS});
185+
}
185186

186187
// Set up a lambda that calls the correct function on the algorithms.
187188
std::function<std::size_t(int, const edm::silicon_cell_collection::host&)>

‎examples/run/common/throughput_st.ipp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ int throughput_st(std::string_view description, int argc, char* argv[]) {
130130
const traccc::seedfinder_config seedfinder_config(seeding_opts);
131131
const traccc::seedfilter_config seedfilter_config(seeding_opts);
132132
const traccc::spacepoint_grid_config spacepoint_grid_config(seeding_opts);
133-
traccc::gbts_seedfinder_config gbts_config;
134-
const traccc::track_params_estimation_config track_params_estimation_config;
133+
traccc::gbts_seedfinder_config gbts_config;
134+
const traccc::track_params_estimation_config track_params_estimation_config;
135135

136136
typename FULL_CHAIN_ALG::finding_algorithm::config_type finding_cfg(
137137
finding_opts);
@@ -145,7 +145,7 @@ int throughput_st(std::string_view description, int argc, char* argv[]) {
145145
std::unique_ptr<FULL_CHAIN_ALG> alg = std::make_unique<FULL_CHAIN_ALG>(
146146
host_mr, clustering_cfg, seedfinder_config, spacepoint_grid_config,
147147
seedfilter_config, gbts_config, track_params_estimation_config,
148-
finding_cfg, fitting_cfg, det_descr, field, &detector,
148+
finding_cfg, fitting_cfg, det_descr, field, &detector,
149149
logger().clone("FullChainAlg"));
150150

151151
// Seed the random number generator.

‎examples/run/cpu/full_chain_algorithm.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ full_chain_algorithm::full_chain_algorithm(
2121
const fitting_algorithm::config_type& fitting_config,
2222
const silicon_detector_description::host& det_descr,
2323
const magnetic_field& field, const host_detector* detector,
24-
std::unique_ptr<const traccc::Logger> logger,
25-
const bool useGBTS)
24+
std::unique_ptr<const traccc::Logger> logger, const bool useGBTS)
2625
: messaging(logger->clone()),
2726
m_mr(mr),
2827
m_copy{std::make_unique<vecmem::copy>()},

‎examples/run/cpu/full_chain_algorithm.hpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,14 @@ class full_chain_algorithm
7676
const seedfinder_config& finder_config,
7777
const spacepoint_grid_config& grid_config,
7878
const seedfilter_config& filter_config,
79-
const gbts_seedfinder_config& gbts_config,
79+
const gbts_seedfinder_config& gbts_config,
8080
const track_params_estimation_config& track_params_estimation_config,
8181
const finding_algorithm::config_type& finding_config,
8282
const fitting_algorithm::config_type& fitting_config,
8383
const silicon_detector_description::host& det_descr,
8484
const magnetic_field& field, const host_detector* detector,
85-
std::unique_ptr<const traccc::Logger> logger, const bool useGBTS);
85+
std::unique_ptr<const traccc::Logger> logger,
86+
const bool useGBTS = false);
8687

8788
/// Reconstruct track parameters in the entire detector
8889
///
@@ -144,12 +145,12 @@ class full_chain_algorithm
144145
spacepoint_grid_config m_grid_config;
145146
/// Configuration for the seed filtering
146147
seedfilter_config m_filter_config;
147-
/// placeholder GBTS config
148-
gbts_seedfinder_config m_gbts_config;
148+
/// placeholder GBTS config
149+
gbts_seedfinder_config m_gbts_config;
149150
/// Configuration for track parameter estimation
150151
track_params_estimation_config m_track_params_estimation_config;
151152

152-
/// Configuration for the track finding
153+
/// Configuration for the track finding
153154
finding_algorithm::config_type m_finding_config;
154155
/// Configuration for the track fitting
155156
fitting_algorithm::config_type m_fitting_config;

‎examples/run/cuda/full_chain_algorithm.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ full_chain_algorithm::full_chain_algorithm(
3737
const seedfinder_config& finder_config,
3838
const spacepoint_grid_config& grid_config,
3939
const seedfilter_config& filter_config,
40-
const gbts_seedfinder_config& gbts_config,
41-
const track_params_estimation_config& track_params_estimation_config,
40+
const gbts_seedfinder_config& gbts_config,
41+
const track_params_estimation_config& track_params_estimation_config,
4242
const finding_algorithm::config_type& finding_config,
4343
const fitting_algorithm::config_type& fitting_config,
4444
const silicon_detector_description::host& det_descr,
@@ -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),
@@ -155,7 +155,7 @@ full_chain_algorithm::full_chain_algorithm(const full_chain_algorithm& parent)
155155
m_finder_config(parent.m_finder_config),
156156
m_grid_config(parent.m_grid_config),
157157
m_filter_config(parent.m_filter_config),
158-
m_gbts_config(parent.m_gbts_config),
158+
m_gbts_config(parent.m_gbts_config),
159159
m_track_params_estimation_config(parent.m_track_params_estimation_config),
160160
m_finding_config(parent.m_finding_config),
161161
m_fitting_config(parent.m_fitting_config),
@@ -253,8 +253,8 @@ bound_track_parameters_collection_types::host full_chain_algorithm::seeding(
253253
// Run the seed-finding (asynchronously).
254254
const spacepoint_formation_algorithm::output_type spacepoints =
255255
m_spacepoint_formation(m_device_detector, measurements);
256-
257-
seeding_algorithm::output_type seeds;
256+
257+
seeding_algorithm::output_type seeds;
258258
if (usingGBTS) {
259259
seeds = m_gbts_seeding(spacepoints, measurements);
260260
} else {

‎examples/run/cuda/full_chain_algorithm.hpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,13 @@ class full_chain_algorithm
7878
const seedfinder_config& finder_config,
7979
const spacepoint_grid_config& grid_config,
8080
const seedfilter_config& filter_config,
81-
const gbts_seedfinder_config& gbts_config,
81+
const gbts_seedfinder_config& gbts_config,
8282
const track_params_estimation_config& track_params_estimation_config,
8383
const finding_algorithm::config_type& finding_config,
8484
const fitting_algorithm::config_type& fitting_config,
8585
const silicon_detector_description::host& det_descr,
8686
const magnetic_field& field, host_detector* detector,
87-
std::unique_ptr<const traccc::Logger> logger
88-
bool useGBTS = false);
87+
std::unique_ptr<const traccc::Logger> logger, bool useGBTS = false);
8988

9089
/// Copy constructor
9190
///

‎examples/run/sycl/full_chain_algorithm.hpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ class full_chain_algorithm
8484
const fitting_algorithm::config_type& fitting_config,
8585
const silicon_detector_description::host& det_descr,
8686
const magnetic_field& field, host_detector* detector,
87-
std::unique_ptr<const traccc::Logger> logger,
88-
bool useGBTS = false);
87+
std::unique_ptr<const traccc::Logger> logger, bool useGBTS = false);
8988

9089
/// Copy constructor
9190
///
@@ -181,12 +180,12 @@ class full_chain_algorithm
181180
spacepoint_grid_config m_grid_config;
182181
/// Configuration for the seed filtering
183182
seedfilter_config m_filter_config;
184-
/// placeholder GBTS config
185-
m_gbts_seedfinder_config m_gbts_config;
183+
/// placeholder GBTS config
184+
m_gbts_seedfinder_config m_gbts_config;
186185
/// Configuration for track parameter estimation
187186
track_params_estimation_config m_track_params_estimation_config;
188-
189-
/// Configuration for the track finding
187+
188+
/// Configuration for the track finding
190189
finding_algorithm::config_type m_finding_config;
191190
/// Configuration for the track fitting
192191
fitting_algorithm::config_type m_fitting_config;

‎examples/run/sycl/full_chain_algorithm.sycl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ full_chain_algorithm::full_chain_algorithm(
121121
m_finder_config(finder_config),
122122
m_grid_config(grid_config),
123123
m_filter_config(filter_config),
124-
m_gbts_config(gbts_config),
124+
m_gbts_config(gbts_config),
125125
m_track_params_estimation_config(track_params_estimation_config),
126126
m_finding_config(finding_config),
127127
m_fitting_config(fitting_config),
128-
usingGBTS = useGBTS {
128+
usingGBTS = useGBTS {
129129

130130
// Tell the user what device is being used.
131131
std::cout
@@ -198,12 +198,12 @@ full_chain_algorithm::full_chain_algorithm(const full_chain_algorithm& parent)
198198
m_clustering_config(parent.m_clustering_config),
199199
m_finder_config(parent.m_finder_config),
200200
m_grid_config(parent.m_grid_config),
201-
m_gbts_config(parent.m_gbts_config),
201+
m_gbts_config(parent.m_gbts_config),
202202
m_filter_config(parent.m_filter_config),
203203
m_track_params_estimation_config(parent.m_track_params_estimation_config),
204204
m_finding_config(parent.m_finding_config),
205205
m_fitting_config(parent.m_fitting_config),
206-
usingGBTS = parent.usingGBTS {
206+
usingGBTS = parent.usingGBTS {
207207

208208
// Copy the detector (description) to the device.
209209
m_copy(vecmem::get_data(m_det_descr.get()), m_device_det_descr)->wait();

0 commit comments

Comments
 (0)