Set aperture according to XRC results#1705
Open
rtuck99 wants to merge 36 commits into
Open
Conversation
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## 27_3_26_fix_system_tests #1705 +/- ##
============================================================
- Coverage 92.83% 92.71% -0.13%
============================================================
Files 155 156 +1
Lines 8545 8590 +45
============================================================
+ Hits 7933 7964 +31
- Misses 612 626 +14
🚀 New features to boost your workflow:
|
… tests, system tests still broken
…nfig server fixture now sets the URL env var
6d2126e to
cbfd727
Compare
1c41985 to
87e3e7b
Compare
Add json schema documentation generation
Validation for selected_aperture in LoadCentreCollectParams
87e3e7b to
43043b9
Compare
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.
Fixes
Link to dodal PR (if required): #XXX
(remember to update
pyproject.tomlwith the dodal commit tag if you need it for tests to pass!)For single-sample pins, the aperture is now selected according to the crystal size detected in XRC, if the crystal is larger than 1 box (20um) then the large aperture is selected, otherwise the medium aperture is selected.
The previous code in
change_aperture_then_move_plan.pyhas been removed as it was never used.For multisample pins, the large aperture is always selected.
This introduces changes to the parameter model whereby the type of
selected_apertureis changed fromApertureValue(an enum defined by the dodalApertureScatterguarddevice) toAperturePolicy.These changes should be non-breaking for plans called via
blueapi;SMALL,MEDIUMandLARGEvalues have the same json representation. However for plan implementations using this enum viaDiffractionExperimentsubclasses in the parameter model these must now explicitly mapAperturePolicytoApertureValue. There are the following changes:AperturePolicydoes not have theOUT_OF_BEAMorPARKEDvalues as these are not useful for experiment plansAperturePolicyhas the additional valuesAUTOandCURRENT_POSITION, for plans where the aperture position is determined automatically (as in Hyperion UDC) and for plans which may opt to execute from the aperture's currently selected position (this may be useful for commissioning plans and for plans which are e.g. executed as part of GDA operation where aperture selection is managed externally)selected_apertureinDiffractionExperimentisAUTO.Noneis no longer a valid value.selected_aperturedefaults inDiffractionExperimentare no longer overridden in subclasses. The intention is that whereAUTOis selected, it will be resolved to one of the physical aperture sizes in the relevant part of the plan.Instructions to reviewer on how to test:
Checks for reviewer