From 93dc0d127fa4cc57dea28b43d278a9fe3e4cdac1 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Tue, 5 Mar 2024 15:14:29 +0100 Subject: [PATCH] Updated the example applications for the modified "options code". Made all of the applications print their configuration parameters in a uniform way, using the helper code introduced with the "options code". --- .../run/alpaka/seeding_example_alpaka.cpp | 32 +++++++++++-------- examples/run/cpu/seeding_example.cpp | 21 +++++++----- examples/run/cpu/seq_example.cpp | 12 ++++--- examples/run/cpu/truth_finding_example.cpp | 17 ++++++---- examples/run/cpu/truth_fitting_example.cpp | 10 ++++-- examples/run/cuda/seeding_example_cuda.cpp | 21 +++++++----- examples/run/cuda/seq_example_cuda.cpp | 12 ++++--- .../run/cuda/truth_finding_example_cuda.cpp | 17 ++++++---- .../run/cuda/truth_fitting_example_cuda.cpp | 10 ++++-- .../run/kokkos/seeding_example_kokkos.cpp | 13 +++++--- examples/run/sycl/seeding_example_sycl.sycl | 11 ++++--- examples/run/sycl/seq_example_sycl.sycl | 14 ++++---- examples/simulation/simulate.cpp | 4 +-- examples/simulation/simulate_telescope.cpp | 12 +++---- examples/simulation/simulate_toy_detector.cpp | 8 ++--- examples/simulation/simulate_wire_chamber.cpp | 8 ++--- 16 files changed, 133 insertions(+), 89 deletions(-) diff --git a/examples/run/alpaka/seeding_example_alpaka.cpp b/examples/run/alpaka/seeding_example_alpaka.cpp index e37d4fa115..b8acc311c7 100644 --- a/examples/run/alpaka/seeding_example_alpaka.cpp +++ b/examples/run/alpaka/seeding_example_alpaka.cpp @@ -1,6 +1,6 @@ /** TRACCC library, part of the ACTS project (R&D line) * - * (c) 2023 CERN for the benefit of the ACTS project + * (c) 2023-2024 CERN for the benefit of the ACTS project * * Mozilla Public License Version 2.0 */ @@ -61,12 +61,11 @@ using namespace traccc; namespace po = boost::program_options; -int seq_run( - const traccc::seeding_input_config& /*i_cfg*/, - const traccc::finding_input_config& /*finding_cfg*/, - const traccc::propagation_options& /*propagation_opts*/, - const traccc::common_options& common_opts, - const traccc::detector_input_options& det_opts, bool run_cpu) { +int seq_run(const traccc::seeding_input_options& /*i_cfg*/, + const traccc::finding_input_options& /*finding_cfg*/, + const traccc::propagation_options& /*propagation_opts*/, + const traccc::common_options& common_opts, + const traccc::detector_input_options& det_opts, bool run_cpu) { using host_detector_type = detray::detector<>; @@ -318,9 +317,9 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::seeding_input_config seeding_input_cfg(desc); - traccc::finding_input_config finding_input_cfg(desc); - traccc::propagation_options propagation_opts(desc); + traccc::seeding_input_options seeding_input_cfg(desc); + traccc::finding_input_options finding_input_cfg(desc); + traccc::propagation_options propagation_opts(desc); desc.add_options()("run-cpu", po::value()->default_value(false), "run cpu tracking as well"); @@ -334,12 +333,17 @@ int main(int argc, char* argv[]) { common_opts.read(vm); det_opts.read(vm); seeding_input_cfg.read(vm); - // finding_input_cfg.read(vm); - // propagation_opts.read(vm); + finding_input_cfg.read(vm); + propagation_opts.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " << det_opts.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the tracking chain using Alpaka\n\n" + << common_opts << "\n" + << det_opts << "\n" + << seeding_input_cfg << "\n" + << finding_input_cfg << "\n" + << propagation_opts << "\n" << std::endl; return seq_run(seeding_input_cfg, finding_input_cfg, propagation_opts, diff --git a/examples/run/cpu/seeding_example.cpp b/examples/run/cpu/seeding_example.cpp index f1b2acecd6..ee7d6a6aae 100644 --- a/examples/run/cpu/seeding_example.cpp +++ b/examples/run/cpu/seeding_example.cpp @@ -53,9 +53,9 @@ using namespace traccc; namespace po = boost::program_options; -int seq_run(const traccc::seeding_input_config& /*i_cfg*/, - const traccc::finding_input_config& finding_cfg, - const traccc::propagation_options& propagation_opts, +int seq_run(const traccc::seeding_input_options& /*i_cfg*/, + const traccc::finding_input_options& finding_cfg, + const traccc::propagation_options& propagation_opts, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts) { @@ -272,9 +272,9 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::seeding_input_config seeding_input_cfg(desc); - traccc::finding_input_config finding_input_cfg(desc); - traccc::propagation_options propagation_opts(desc); + traccc::seeding_input_options seeding_input_cfg(desc); + traccc::finding_input_options finding_input_cfg(desc); + traccc::propagation_options propagation_opts(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); @@ -289,8 +289,13 @@ int main(int argc, char* argv[]) { finding_input_cfg.read(vm); propagation_opts.read(vm); - std::cout << "Running " << argv[0] << " " << det_opts.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the tracking chain on the host\n\n" + << common_opts << "\n" + << det_opts << "\n" + << seeding_input_cfg << "\n" + << finding_input_cfg << "\n" + << propagation_opts << "\n" << std::endl; return seq_run(seeding_input_cfg, finding_input_cfg, propagation_opts, diff --git a/examples/run/cpu/seq_example.cpp b/examples/run/cpu/seq_example.cpp index 709c9453e4..8e973df89b 100644 --- a/examples/run/cpu/seq_example.cpp +++ b/examples/run/cpu/seq_example.cpp @@ -34,7 +34,7 @@ namespace po = boost::program_options; -int seq_run(const traccc::full_tracking_input_config& i_cfg, +int seq_run(const traccc::full_tracking_input_options& i_cfg, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts) { @@ -162,7 +162,7 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::full_tracking_input_config full_tracking_input_cfg(desc); + traccc::full_tracking_input_options full_tracking_input_cfg(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); @@ -175,9 +175,11 @@ int main(int argc, char* argv[]) { det_opts.read(vm); full_tracking_input_cfg.read(vm); - std::cout << "Running " << argv[0] << " " - << full_tracking_input_cfg.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the full tracking chain on the host\n\n" + << common_opts << "\n" + << det_opts << "\n" + << full_tracking_input_cfg << "\n" << std::endl; return seq_run(full_tracking_input_cfg, common_opts, det_opts); diff --git a/examples/run/cpu/truth_finding_example.cpp b/examples/run/cpu/truth_finding_example.cpp index 64b5a01e0d..57ce07f345 100644 --- a/examples/run/cpu/truth_finding_example.cpp +++ b/examples/run/cpu/truth_finding_example.cpp @@ -43,8 +43,8 @@ using namespace traccc; namespace po = boost::program_options; -int seq_run(const traccc::finding_input_config& i_cfg, - const traccc::propagation_options& propagation_opts, +int seq_run(const traccc::finding_input_options& i_cfg, + const traccc::propagation_options& propagation_opts, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts) { @@ -203,8 +203,8 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::finding_input_config finding_input_cfg(desc); - traccc::propagation_options propagation_opts(desc); + traccc::finding_input_options finding_input_cfg(desc); + traccc::propagation_options propagation_opts(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); @@ -218,8 +218,13 @@ int main(int argc, char* argv[]) { finding_input_cfg.read(vm); propagation_opts.read(vm); - std::cout << "Running " << argv[0] << " " << common_opts.input_directory - << " " << common_opts.events << std::endl; + // Tell the user what's happening. + std::cout << "\nRunning truth track finding on the host\n\n" + << common_opts << "\n" + << det_opts << "\n" + << finding_input_cfg << "\n" + << propagation_opts << "\n" + << std::endl; return seq_run(finding_input_cfg, propagation_opts, common_opts, det_opts); } diff --git a/examples/run/cpu/truth_fitting_example.cpp b/examples/run/cpu/truth_fitting_example.cpp index 0479aa74b0..d22f8d253c 100644 --- a/examples/run/cpu/truth_fitting_example.cpp +++ b/examples/run/cpu/truth_fitting_example.cpp @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::propagation_options propagation_opts(desc); + traccc::propagation_options propagation_opts(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); @@ -64,8 +64,12 @@ int main(int argc, char* argv[]) { propagation_opts.read(vm); - std::cout << "Running " << argv[0] << " " << common_opts.input_directory - << " " << common_opts.events << std::endl; + // Tell the user what's happening. + std::cout << "\nRunning truth track fitting on the host\n\n" + << common_opts << "\n" + << det_opts << "\n" + << propagation_opts << "\n" + << std::endl; /// Type declarations using host_detector_type = detray::detector& finding_cfg, - const traccc::propagation_options& propagation_opts, +int seq_run(const traccc::seeding_input_options& /*i_cfg*/, + const traccc::finding_input_options& finding_cfg, + const traccc::propagation_options& propagation_opts, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts, bool run_cpu) { @@ -485,9 +485,9 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::seeding_input_config seeding_input_cfg(desc); - traccc::finding_input_config finding_input_cfg(desc); - traccc::propagation_options propagation_opts(desc); + traccc::seeding_input_options seeding_input_cfg(desc); + traccc::finding_input_options finding_input_cfg(desc); + traccc::propagation_options propagation_opts(desc); desc.add_options()("run-cpu", po::value()->default_value(false), "run cpu tracking as well"); @@ -505,8 +505,13 @@ int main(int argc, char* argv[]) { propagation_opts.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " << det_opts.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the tracking chain using CUDA\n\n" + << common_opts << "\n" + << det_opts << "\n" + << seeding_input_cfg << "\n" + << finding_input_cfg << "\n" + << propagation_opts << "\n" << std::endl; return seq_run(seeding_input_cfg, finding_input_cfg, propagation_opts, diff --git a/examples/run/cuda/seq_example_cuda.cpp b/examples/run/cuda/seq_example_cuda.cpp index b8480fb6bd..fe5810923b 100644 --- a/examples/run/cuda/seq_example_cuda.cpp +++ b/examples/run/cuda/seq_example_cuda.cpp @@ -39,7 +39,7 @@ namespace po = boost::program_options; -int seq_run(const traccc::full_tracking_input_config& i_cfg, +int seq_run(const traccc::full_tracking_input_options& i_cfg, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts, bool run_cpu) { @@ -308,7 +308,7 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::full_tracking_input_config full_tracking_input_cfg(desc); + traccc::full_tracking_input_options full_tracking_input_cfg(desc); desc.add_options()("run-cpu", po::value()->default_value(false), "run cpu tracking as well"); @@ -324,9 +324,11 @@ int main(int argc, char* argv[]) { full_tracking_input_cfg.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " - << full_tracking_input_cfg.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the full tracking chain using CUDA\n\n" + << common_opts << "\n" + << det_opts << "\n" + << full_tracking_input_cfg << "\n" << std::endl; return seq_run(full_tracking_input_cfg, common_opts, det_opts, run_cpu); diff --git a/examples/run/cuda/truth_finding_example_cuda.cpp b/examples/run/cuda/truth_finding_example_cuda.cpp index 660f45781a..af6ae51a94 100644 --- a/examples/run/cuda/truth_finding_example_cuda.cpp +++ b/examples/run/cuda/truth_finding_example_cuda.cpp @@ -55,8 +55,8 @@ using namespace traccc; namespace po = boost::program_options; -int seq_run(const traccc::finding_input_config& i_cfg, - const traccc::propagation_options& propagation_opts, +int seq_run(const traccc::finding_input_options& i_cfg, + const traccc::propagation_options& propagation_opts, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts, bool run_cpu) { @@ -360,8 +360,8 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::finding_input_config finding_input_cfg(desc); - traccc::propagation_options propagation_opts(desc); + traccc::finding_input_options finding_input_cfg(desc); + traccc::propagation_options propagation_opts(desc); desc.add_options()("run-cpu", po::value()->default_value(false), "run cpu tracking as well"); @@ -379,8 +379,13 @@ int main(int argc, char* argv[]) { propagation_opts.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " << common_opts.input_directory - << " " << common_opts.events << std::endl; + // Tell the user what's happening. + std::cout << "\nRunning truth track finding using CUDA\n\n" + << common_opts << "\n" + << det_opts << "\n" + << finding_input_cfg << "\n" + << propagation_opts << "\n" + << std::endl; return seq_run(finding_input_cfg, propagation_opts, common_opts, det_opts, run_cpu); diff --git a/examples/run/cuda/truth_fitting_example_cuda.cpp b/examples/run/cuda/truth_fitting_example_cuda.cpp index 2aced2cb0b..470214b465 100644 --- a/examples/run/cuda/truth_fitting_example_cuda.cpp +++ b/examples/run/cuda/truth_fitting_example_cuda.cpp @@ -61,7 +61,7 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::propagation_options propagation_opts(desc); + traccc::propagation_options propagation_opts(desc); desc.add_options()("run-cpu", po::value()->default_value(false), "run cpu tracking as well"); @@ -78,8 +78,12 @@ int main(int argc, char* argv[]) { propagation_opts.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " << common_opts.input_directory - << " " << common_opts.events << std::endl; + // Tell the user what's happening. + std::cout << "\nRunning truth track fitting using CUDA\n\n" + << common_opts << "\n" + << det_opts << "\n" + << propagation_opts << "\n" + << std::endl; /// Type declarations using host_detector_type = detray::detector()->default_value(false), "run cpu tracking as well"); @@ -173,8 +173,11 @@ int main(int argc, char* argv[]) { seeding_input_cfg.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " << det_opts.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the tracking chain using Kokkos\n\n" + << common_opts << "\n" + << det_opts << "\n" + << seeding_input_cfg << "\n" << std::endl; int ret = seq_run(seeding_input_cfg, common_opts, det_opts, run_cpu); diff --git a/examples/run/sycl/seeding_example_sycl.sycl b/examples/run/sycl/seeding_example_sycl.sycl index ebe66f124f..a5d7d311e8 100644 --- a/examples/run/sycl/seeding_example_sycl.sycl +++ b/examples/run/sycl/seeding_example_sycl.sycl @@ -50,7 +50,7 @@ namespace po = boost::program_options; -int seq_run(const traccc::seeding_input_config& /*i_cfg*/, +int seq_run(const traccc::seeding_input_options& /*i_cfg*/, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts, bool run_cpu) { @@ -279,7 +279,7 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::seeding_input_config seeding_input_cfg(desc); + traccc::seeding_input_options seeding_input_cfg(desc); desc.add_options()("run-cpu", po::value()->default_value(false), "run cpu tracking as well"); @@ -296,8 +296,11 @@ int main(int argc, char* argv[]) { seeding_input_cfg.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " << det_opts.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the tracking chain using SYCL\n\n" + << common_opts << "\n" + << det_opts << "\n" + << seeding_input_cfg << "\n" << std::endl; return seq_run(seeding_input_cfg, common_opts, det_opts, run_cpu); diff --git a/examples/run/sycl/seq_example_sycl.sycl b/examples/run/sycl/seq_example_sycl.sycl index f7358cbf22..a5e6c0a81f 100644 --- a/examples/run/sycl/seq_example_sycl.sycl +++ b/examples/run/sycl/seq_example_sycl.sycl @@ -63,7 +63,7 @@ auto handle_async_error = [](::sycl::exception_list elist) { } }; -int seq_run(const traccc::full_tracking_input_config& i_cfg, +int seq_run(const traccc::full_tracking_input_options& i_cfg, const traccc::common_options& common_opts, const traccc::detector_input_options& det_opts, bool run_cpu) { @@ -334,7 +334,7 @@ int main(int argc, char* argv[]) { desc.add_options()("help,h", "Give some help with the program's options"); traccc::common_options common_opts(desc); traccc::detector_input_options det_opts(desc); - traccc::full_tracking_input_config full_tracking_input_cfg(desc); + traccc::full_tracking_input_options full_tracking_input_cfg(desc); desc.add_options()("run-cpu", po::value()->default_value(false), "run cpu tracking as well"); @@ -350,10 +350,12 @@ int main(int argc, char* argv[]) { full_tracking_input_cfg.read(vm); auto run_cpu = vm["run-cpu"].as(); - std::cout << "Running " << argv[0] << " " - << full_tracking_input_cfg.detector_file << " " - << common_opts.input_directory << " " << common_opts.events + // Tell the user what's happening. + std::cout << "\nRunning the full tracking chain using SYCL\n\n" + << common_opts << "\n" + << det_opts << "\n" + << full_tracking_input_cfg << "\n" << std::endl; return seq_run(full_tracking_input_cfg, common_opts, det_opts, run_cpu); -} \ No newline at end of file +} diff --git a/examples/simulation/simulate.cpp b/examples/simulation/simulate.cpp index 77bb4d3c74..91cf17c6b6 100644 --- a/examples/simulation/simulate.cpp +++ b/examples/simulation/simulate.cpp @@ -52,8 +52,8 @@ int main(int argc, char* argv[]) { desc.add_options()("events", po::value()->required(), "number of events"); traccc::detector_input_options det_opts(desc); - traccc::particle_gen_options pg_opts(desc); - traccc::propagation_options propagation_opts(desc); + traccc::particle_gen_options pg_opts(desc); + traccc::propagation_options propagation_opts(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); diff --git a/examples/simulation/simulate_telescope.cpp b/examples/simulation/simulate_telescope.cpp index 1c7cea33c8..7eb42a4eeb 100644 --- a/examples/simulation/simulate_telescope.cpp +++ b/examples/simulation/simulate_telescope.cpp @@ -39,9 +39,9 @@ using namespace traccc; namespace po = boost::program_options; int simulate(std::string output_directory, unsigned int events, - const traccc::particle_gen_options& pg_opts, - const traccc::propagation_options& propagation_opts, - const traccc::telescope_detector_options& telescope_opts) { + const traccc::particle_gen_options& pg_opts, + const traccc::propagation_options& propagation_opts, + const traccc::telescope_detector_options& telescope_opts) { // Use deterministic random number generator for testing using uniform_gen_t = @@ -156,9 +156,9 @@ int main(int argc, char* argv[]) { "specify the directory of output data"); desc.add_options()("events", po::value()->required(), "number of events"); - traccc::particle_gen_options pg_opts(desc); - traccc::propagation_options propagation_opts(desc); - traccc::telescope_detector_options telescope_opts(desc); + traccc::particle_gen_options pg_opts(desc); + traccc::propagation_options propagation_opts(desc); + traccc::telescope_detector_options telescope_opts(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); diff --git a/examples/simulation/simulate_toy_detector.cpp b/examples/simulation/simulate_toy_detector.cpp index 8fc9e016bd..8c9be4b4f2 100644 --- a/examples/simulation/simulate_toy_detector.cpp +++ b/examples/simulation/simulate_toy_detector.cpp @@ -34,8 +34,8 @@ using namespace traccc; namespace po = boost::program_options; int simulate(std::string output_directory, unsigned int events, - const traccc::particle_gen_options& pg_opts, - const traccc::propagation_options& propagation_opts) { + const traccc::particle_gen_options& pg_opts, + const traccc::propagation_options& propagation_opts) { // Use deterministic random number generator for testing using uniform_gen_t = @@ -124,8 +124,8 @@ int main(int argc, char* argv[]) { "specify the directory of output data"); desc.add_options()("events", po::value()->required(), "number of events"); - traccc::particle_gen_options pg_opts(desc); - traccc::propagation_options propagation_opts(desc); + traccc::particle_gen_options pg_opts(desc); + traccc::propagation_options propagation_opts(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm); diff --git a/examples/simulation/simulate_wire_chamber.cpp b/examples/simulation/simulate_wire_chamber.cpp index b18ec6f635..11378a2a01 100644 --- a/examples/simulation/simulate_wire_chamber.cpp +++ b/examples/simulation/simulate_wire_chamber.cpp @@ -34,8 +34,8 @@ using namespace traccc; namespace po = boost::program_options; int simulate(std::string output_directory, unsigned int events, - const traccc::particle_gen_options& pg_opts, - const traccc::propagation_options& propagation_opts) { + const traccc::particle_gen_options& pg_opts, + const traccc::propagation_options& propagation_opts) { // Use deterministic random number generator for testing using uniform_gen_t = @@ -129,8 +129,8 @@ int main(int argc, char* argv[]) { "specify the directory of output data"); desc.add_options()("events", po::value()->required(), "number of events"); - traccc::particle_gen_options pg_opts(desc); - traccc::propagation_options propagation_opts(desc); + traccc::particle_gen_options pg_opts(desc); + traccc::propagation_options propagation_opts(desc); po::variables_map vm; po::store(po::parse_command_line(argc, argv, desc), vm);