Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/MergerConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct SourceConfig {
// Beam background config, beam direction and speed
bool attach_to_beam{false};
float beam_angle{0.0f};
float beam_speed{0.299792458f}; //Speed of light in m/ns
float beam_speed{299.792458f}; //Speed of light in mm/ns
float beam_spread{0.0f};

// New generator status offset
Expand Down
6 changes: 3 additions & 3 deletions src/CommandLineParser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void CommandLineParser::printUsage(const char* program_name) {
<< " --source:NAME:beam_attachment BOOL\n"
<< " Enable beam attachment (true/false)\n"
<< " --source:NAME:beam_speed SPEED\n"
<< " Beam speed in ns/mm\n"
<< " Beam speed in mm/ns\n"
<< " --source:NAME:beam_spread SPREAD\n"
<< " Beam spread for Gaussian smearing\n"
<< " --source:NAME:status_offset OFFSET\n"
Expand Down Expand Up @@ -205,7 +205,7 @@ void CommandLineParser::mergeCliSources(MergerConfig& config, const std::vector<
if (cli_source.attach_to_beam) {
existing_source.attach_to_beam = cli_source.attach_to_beam;
}
if (cli_source.beam_speed != 299.7924580f) {
if (cli_source.beam_speed != 299.792458f) {
existing_source.beam_speed = cli_source.beam_speed;
}
if (cli_source.beam_spread != 0.0f) {
Expand Down Expand Up @@ -271,7 +271,7 @@ void CommandLineParser::printConfiguration(const MergerConfig& config) {
std::cout << " Mean event frequency: " << source.mean_event_frequency << " events/ns" << std::endl;
std::cout << " Use bunch crossing: " << (source.use_bunch_crossing ? "true" : "false") << std::endl;
std::cout << " Beam attachment: " << (source.attach_to_beam ? "true" : "false") << std::endl;
std::cout << " Beam speed: " << source.beam_speed << " ns/mm" << std::endl;
std::cout << " Beam speed: " << source.beam_speed << " mm/ns" << std::endl;
std::cout << " Beam spread: " << source.beam_spread << std::endl;
std::cout << " Generator status offset: " << source.generator_status_offset << std::endl;
std::cout << " Repeat on EOF: " << (source.repeat_on_eof ? "true" : "false") << std::endl;
Expand Down