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 3 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@040a72885deaca1055a930f09eccef4acca812f5",
"dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@69df71c072408e2b1aa372bfd351df5cd4978620",
]


Expand Down
7 changes: 3 additions & 4 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 @@ -238,10 +238,9 @@ async def test_rotation_plan_moves_aperture_correctly(
aperture_scatterguard: ApertureScatterguard = (
run_full_rotation_plan.aperture_scatterguard
)
assert (
await aperture_scatterguard.get_current_aperture_position()
== ApertureValue.SMALL
)
reading = await aperture_scatterguard.read()
aperture_state = reading[aperture_scatterguard.selected_aperture.name]["value"]
assert aperture_state == ApertureValue.SMALL


async def test_rotation_plan_smargon_doesnt_move_xyz_if_not_given_in_params(
Expand Down
Loading