Update mx-bluesky references to ApertureScatterguard #430
Conversation
DiamondJoseph
force-pushed
the
aperture_scatterguard
branch
from
332f9e4
to
0aee946
Compare
DiamondJoseph
requested review from
DominicOram,
dperl-dls and
olliesilvester
DiamondJoseph
force-pushed
the
aperture_scatterguard
branch
from
d9a11b8
to
2bc05ca
Compare
tests/unit_tests/hyperion/experiment_plans/test_flyscan_xray_centre_plan.py
Outdated
Show resolved
Hide resolved
tests/unit_tests/hyperion/experiment_plans/test_flyscan_xray_centre_plan.py
Outdated
Show resolved
Hide resolved
Ensure values match previous values
tests/unit_tests/hyperion/experiment_plans/test_flyscan_xray_centre_plan.py
Outdated
Show resolved
Hide resolved
…entre_plan.py Co-authored-by: David Perl <david.perl@diamond.ac.uk>
| @@ -153,7 +151,7 @@ def _handle_ispyb_transmission_flux_read(self, doc) -> Sequence[ScanDataInfo]: | |||
| hwscan_data_collection_info, None, self.params | |||
| ) | |||
| ISPYB_LOGGER.info("Updating ispyb data collection after flux read.") | |||
| self.append_to_comment(f"Aperture: {aperture_size.name}. ") | |||
| self.append_to_comment(f"Aperture: {aperture}. ") | |||
There was a problem hiding this comment.
Now that we've dropped the user friendly names in the device this now means that the comment in ispyb is Aperture: SMALL_APERTURE rather than Aperture: Small, right? I think this might be ok, just noting the change in behaviour
There was a problem hiding this comment.
I just checked, it's Aperture: ApertureValue.SMALL: ApertureValue.SMALL.value == SMALL_APERTURE. We could ammend the __str__ of the ApertureValue if we want to get just Small?
There was a problem hiding this comment.
To be exact it's Aperture: ApertureValue.SMALL. with stop and space
There was a problem hiding this comment.
Yh, that's quite ugly. Sorry, could we fix it to be Small etc. and add a test? If you want to move on to other things feel free to just add a new issue
There was a problem hiding this comment.
I'll make an issue, I'm trying to finish the Pydantic update
For dodal change DiamondLightSource/dodal#769
Required for dodal pydantic 2/ophyd_async 0.5.0 update