Optionally generate primaries without a HepMC3 input file in the demo loop #463
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ooh fancy! Reviewing now! |
sethrj
approved these changes
Jul 27, 2022
hahnjo
reviewed
Aug 3, 2022
Comment on lines
+23
to
+35
| int pdg; //!< Primary PDG number | ||
| real_type energy; //!< [MeV] | ||
| Real3 position; //!< [cm] | ||
| Real3 direction; | ||
| size_type num_events; | ||
| size_type primaries_per_event; | ||
|
|
||
| //! Whether the options are valid | ||
| explicit operator bool() const | ||
| { | ||
| return pdg != 0 && energy >= 0 && num_events > 0 | ||
| && primaries_per_event > 0; | ||
| } |
There was a problem hiding this comment.
Without initializers, these scalar types are uninitialized; in particular for the object LDemoArgs::primary_gen_options. If you're unlucky (and on my machine, I seem to be always unlucky), this makes operator bool() return true and it's not possible to load HepMC3 files (unless an explicit primary_gen_options initializes the fields to zero? not tested).
There was a problem hiding this comment.
Ugh, you're right: and since there's no unit test for this class it doesn't run through valgrind. I'll add a test and push a fix.
sethrj
added a commit
to sethrj/celeritas
that referenced
this pull request
Aug 21, 2022
The unintentional explicit constructor causes problems with nljson on clang 14. This showed up because of the IO in celeritas-project#463.
sethrj
added a commit
that referenced
this pull request
Aug 21, 2022
The unintentional explicit constructor causes problems with nljson on clang 14. This showed up because of the IO in #463.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds an optional demo loop input argument to generate primaries based on a specified quantity, particle type, energy, position, and direction rather than reading the events from a HepMC3 input file. For example, adding the following to the input JSON would generate the same primaries as in testem3.100k.hepmc3:
This should make it easier to run with a range of inputs, e.g. for #460, without needing to create a new HepMC3 input file each time.