Skip to content

Commit 32db4cb

Browse files
committed
Small improvements to the simulation code.
Made traccc::smearing_writer use std::filesystem for a little bit of additional robustness, and removed some awkwardness from the parameter passing in these classes.
1 parent 43d3f65 commit 32db4cb

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

simulation/include/traccc/simulation/measurement_smearer.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) 2023 CERN for the benefit of the ACTS project
3+
* (c) 2023-2025 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -35,7 +35,7 @@ struct measurement_smearer {
3535
const scalar_type stddev_local1)
3636
: stddev({stddev_local0, stddev_local1}) {}
3737

38-
measurement_smearer(measurement_smearer& smearer)
38+
measurement_smearer(const measurement_smearer& smearer)
3939
: stddev(smearer.stddev), generator(smearer.generator) {}
4040

4141
void set_seed(const uint_fast64_t sd) { generator.seed(sd); }

simulation/include/traccc/simulation/smearing_writer.hpp

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** Detray library, part of the ACTS project (R&D line)
22
*
3-
* (c) 2023-2024 CERN for the benefit of the ACTS project
3+
* (c) 2023-2025 CERN for the benefit of the ACTS project
44
*
55
* Mozilla Public License Version 2.0
66
*/
@@ -26,6 +26,10 @@
2626
#include <dfe/dfe_io_dsv.hpp>
2727
#include <dfe/dfe_namedtuple.hpp>
2828

29+
// System include(s).
30+
#include <filesystem>
31+
#include <string>
32+
2933
namespace traccc {
3034

3135
template <typename smearer_t>
@@ -45,18 +49,25 @@ struct smearing_writer : detray::actor {
4549
};
4650

4751
struct state {
48-
state(std::size_t event_id, config&& writer_cfg,
52+
state(std::size_t event_id, const config& writer_cfg,
4953
const std::string directory)
50-
: m_particle_writer(directory +
51-
traccc::io::get_event_filename(
52-
event_id, "-particles_initial.csv")),
53-
m_hit_writer(directory + traccc::io::get_event_filename(
54-
event_id, "-hits.csv")),
55-
m_meas_writer(directory + traccc::io::get_event_filename(
56-
event_id, "-measurements.csv")),
54+
: m_particle_writer((std::filesystem::path{directory} /
55+
traccc::io::get_event_filename(
56+
event_id, "-particles_initial.csv"))
57+
.native()),
58+
m_hit_writer(
59+
(std::filesystem::path{directory} /
60+
traccc::io::get_event_filename(event_id, "-hits.csv"))
61+
.native()),
62+
m_meas_writer((std::filesystem::path{directory} /
63+
traccc::io::get_event_filename(
64+
event_id, "-measurements.csv"))
65+
.native()),
5766
m_measurement_hit_id_writer(
58-
directory + traccc::io::get_event_filename(
59-
event_id, "-measurement-simhit-map.csv")),
67+
(std::filesystem::path{directory} /
68+
traccc::io::get_event_filename(
69+
event_id, "-measurement-simhit-map.csv"))
70+
.native()),
6071
m_meas_smearer(writer_cfg.smearer) {}
6172

6273
uint64_t particle_id = 0u;

0 commit comments

Comments
 (0)