Skip to content

I19: update piezo device to expose the setpoint #2165

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

Closed
noemifrisina wants to merge 2 commits into from
Closed

I19: update piezo device to expose the setpoint #2165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e7a00
Add a readable signal for piezo setpoints as readback drifts too much
noemifrisina Jul 29, 2026
024f28a
Merge branch 'main' into i19-166-piezoz-update
noemifrisina Aug 6, 2026
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: 2 additions & 0 deletions src/dodal/devices/beamlines/i19/access_controlled/piezo_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ def __init__(
name: str = "",
):
with self.add_children_as_readables(StandardReadableFormat.HINTED_SIGNAL):
self.setpoint = epics_signal_r(float, f"{prefix}AOFPITCH")
# Piezo not in a closed loop so readback drifting
self.readback = epics_signal_r(float, f"{prefix}AOFPITCH:RBV")
self.mirror = mirror_type
super().__init__(hutch=hutch, instrument_session=instrument_session, name=name)
Expand Down
14 changes: 12 additions & 2 deletions tests/devices/beamlines/i19/access_controlled/test_piezo_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def eh1_vfm_piezo() -> AccessControlledPiezoActuator:
name="mock_vfm_piezo",
)
v_piezo.url = "http://test.url"
set_mock_value(v_piezo.setpoint, 0.7)
set_mock_value(v_piezo.readback, 1.0)
return v_piezo

Expand All @@ -41,6 +42,7 @@ def eh2_hfm_piezo() -> AccessControlledPiezoActuator:
name="mock_hfm_piezo",
)
h_piezo.url = "http://test.url"
set_mock_value(h_piezo.setpoint, 0.99)
set_mock_value(h_piezo.readback, 1.0)
return h_piezo

Expand All @@ -66,15 +68,23 @@ async def test_vfm_piezo_rbv_value_can_be_read(
eh1_vfm_piezo: AccessControlledPiezoActuator,
):
await assert_reading(
eh1_vfm_piezo, {"mock_vfm_piezo-readback": partial_reading(1.0)}
eh1_vfm_piezo,
{
"mock_vfm_piezo-setpoint": partial_reading(0.7),
"mock_vfm_piezo-readback": partial_reading(1.0),
},
)


async def test_hfm_piezo_rbv_value_can_be_read(
eh2_hfm_piezo: AccessControlledPiezoActuator,
):
await assert_reading(
eh2_hfm_piezo, {"mock_hfm_piezo-readback": partial_reading(1.0)}
eh2_hfm_piezo,
{
"mock_hfm_piezo-setpoint": partial_reading(0.99),
"mock_hfm_piezo-readback": partial_reading(1.0),
},
)


Expand Down
Loading