-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Common XRC: Modify parameters and composite devices #806
base: main
Are you sure you want to change the base?
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #806 +/- ##
==========================================
- Coverage 86.94% 86.89% -0.06%
==========================================
Files 102 104 +2
Lines 6969 6988 +19
==========================================
+ Hits 6059 6072 +13
- Misses 910 916 +6
|
|
||
|
||
@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True}) | ||
class HyperionFlyScanXRayCentreComposite: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not immediately obvious but we get circular imports without moving this
GridscanParamConstants, | ||
HardwareConstants, | ||
) | ||
|
||
"""Parameter models in this file are abstract. They should be inherited by a top-level model""" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this no longer true?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR adds detector_params
to SpecifiedThreeDGridScan
, so this class isn't abstract anymore
Part of #794
feature_dependant_config
function toFeatureFlags
, which handles configuration relying on the live feature settings. and is done before the XRC kicks offdetector_params
toSpecifiedThreeDGridScan
, using a dictionary mapping beamline to detector size. This meansSpecifiedThreeDGridScan
is not abstract so can be used by other beamlines wanting to do XRCcommon