Use beam variants in the experiment class#47
Merged
Conversation
…ts/CMakeLists.txt structure
for more information, see https://pre-commit.ci
This file contains hidden or 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
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 replaces the initial use of beam model templating in the experiment class with an approach using variants.
The idea here is that the experiment should be a simple container for the experiment models (beam, detector, crystal) etc, where each of these is a variant of allowed model classes. So far this is just done for beam:
This is preferable to using base-class pointers as the different physical models have a different interface (e.g
wavelengthvswavelength_range,get_s0only exists forMonochromaticBeam). For the other models we might have variants being static and scan-varying models, single vs multi-panel detector, etc.Then we define some beam helper functions in beam_ops to give type safe access and encapsulate the variant handling logic and error handling, with usage:
While I was here I split experiment.hpp into experiment.hpp and experiment.cxx, also moving out some beam serialization logic and tidied up the tests/CMakeLists.txt.