Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Read aperture properly rather than private method #506

Merged
merged 8 commits into from
Sep 27, 2024
Merged

Read aperture properly rather than private method #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0745af6
Read aperture properly rather than private method
DominicOram Sep 18, 2024
16679ff
Pin to correct dodal
DominicOram Sep 18, 2024
92401d8
Refactor test
DominicOram Sep 18, 2024
b8e1e6e
Revert test
DominicOram Sep 19, 2024
36fd2d4
Merge branch 'main' into dodal_782_read_aperture
DominicOram Sep 20, 2024
f430cc6
Merge branch 'main' into dodal_782_read_aperture
DominicOram Sep 23, 2024
5ab1f2a
Pin dodal
DominicOram Sep 23, 2024
eab4984
Merge branch 'main' into dodal_782_read_aperture
DominicOram Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies = [
"ophyd == 1.9.0",
"ophyd-async >= 0.3a5",
"bluesky >= 1.13.0a4",
"dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@db42ad951155ba2cfd7574d3b5452c9bf975bfcf",
"dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main",
]


Expand Down
4 changes: 1 addition & 3 deletions tests/unit_tests/hyperion/experiment_plans/test_rotation_scan_plan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,12 @@ async def test_full_rotation_plan_smargon_settings(

async def test_rotation_plan_moves_aperture_correctly(
run_full_rotation_plan: RotationScanComposite,
test_rotation_params: RotationScan,
) -> None:
aperture_scatterguard: ApertureScatterguard = (
run_full_rotation_plan.aperture_scatterguard
)
assert (
await aperture_scatterguard.get_current_aperture_position()
== ApertureValue.SMALL
await aperture_scatterguard.selected_aperture.get_value() == ApertureValue.SMALL
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

selected_aperture is the sole HintedSignal of aperture_scatterguard, you should be able to just aperture_scatterguard.read()?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I see the advantage of this as it's more verbose and now makes the test depend on the fact the signal is hinted but don't care so much so have changed it. Are you suggesting it because read() is the more externally facing API over get_value()?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the change to the test I think I was just wrong? I thought that
selected_aperture.read() == ApertureValue.SMALL

And then we could ensure that the selected_aperture was always readable and always gave the ApertureValue as its output.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yh, I think even reading the one signal it will still return a dict with the name and value.

But the test shouldn't care if it's readable or hinted. The test is "does doing this plan change the aperture in the expected way". We have other tests that are "can I read the selected aperture in the way I expect" like

mx-bluesky/tests/unit_tests/hyperion/experiment_plans/test_flyscan_xray_centre_plan.py

Line 301 in 1dc26a5

"aperture_scatterguard-selected_aperture": ApertureValue.SMALL,

)


Expand Down
Loading