601 convert smargon to ophyd async #656
Merged
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
rtuck99
force-pushed
the
601_convert_smargon_to_ophyd_async
branch
from
cc16c11 to
097b332
Compare
d-perl
approved these changes
Jul 3, 2024
| min_value: float | ||
| max_value: float | ||
|
|
||
| def contains(self, pos: float): |
There was a problem hiding this comment.
Was it a deliberate choice not to use __contains__ here?
| @@ -1,10 +1,13 @@ | |||
| from functools import partial | |||
| from typing import Callable | |||
|
|
|||
| from bluesky.protocols import Movable | |||
There was a problem hiding this comment.
Nit: I would like it better if we did something like
from ophyd_async.core import device as OphydAsyncDevice
from ophyd import device as OphydDeviceor alternatively to use module.object syntax for both ophyd and ophyd_async items
| ] | ||
| ) | ||
| @AsyncStatus.wrap | ||
| async def set(self, value: int): |
|
|
||
|
|
||
| @pytest.fixture | ||
| def smargon(): |
There was a problem hiding this comment.
Could: There is a better sim motor now in ophyd_async.sim.demo.sim_motor which we could replace the Motors with instead
| set_mock_value(device.disp, 1) | ||
| proc_mock = get_mock_put(device.proc) | ||
| proc_mock.return_value = NullStatus() | ||
| status: AsyncStatus = cast(AsyncStatus, device.set(1)) |
* Remove I23 gonio * Remove unused XYZLimitBundle and related classes * Remove validate_against_hardware as the original is_valid() method it is based on was never used
rtuck99
force-pushed
the
601_convert_smargon_to_ophyd_async
branch
from
097b332 to
07ea06c
Compare
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 #601
See also DiamondLightSource/hyperion#1469
Note that the I23
gonio,XYZLimitBundleandGridScanParams.is_valid()logic were all removed as unused.Instructions to reviewer on how to test:
Checks for reviewer
dodal connect ${BEAMLINE}