bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-06-05 19:30:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: recover galil_ophyd from master

Browse Source
This commit is contained in:
e21206 2023-07-04 16:47:58 +02:00
parent f488f0b21c
commit 5f655caf29
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ophyd_devices/galil/galil_ophyd.py
View File

@ -218,7 +218,7 @@ class GalilController(Controller):
for controller in self._controller_instances.values(): for controller in self._controller_instances.values():
if isinstance(controller, GalilController): if isinstance(controller, GalilController):
controller.describe() controller.describe()
class GalilSignalBase(SocketSignal): class GalilSignalBase(SocketSignal):
def __init__(self, signal_name, **kwargs): def __init__(self, signal_name, **kwargs):
@ -448,7 +448,6 @@ class GalilMotor(Device, PositionerBase):
kwargs.pop("sub_type") kwargs.pop("sub_type")
self._run_subs(sub_type="readback", **kwargs) self._run_subs(sub_type="readback", **kwargs)
@raise_if_disconnected @raise_if_disconnected
def move(self, position, wait=True, **kwargs): def move(self, position, wait=True, **kwargs):
"""Move to a specified position, optionally waiting for motion to """Move to a specified position, optionally waiting for motion to
@ -558,3 +557,31 @@ class GalilMotor(Device, PositionerBase):
def stop(self, *, success=False): def stop(self, *, success=False):
self.controller.stop_all_axes() self.controller.stop_all_axes()
return super().stop(success=success) return super().stop(success=success)
if __name__ == "__main__":
mock = False
if not mock:
leyey = GalilMotor("H", name="leyey", host="mpc2680.psi.ch", port=8081, sign=-1)
leyey.stage()
status = leyey.move(0, wait=True)
status = leyey.move(10, wait=True)
leyey.read()
leyey.get()
leyey.describe()
leyey.unstage()
else:
from ophyd_devices.utils.socket import SocketMock
leyex = GalilMotor(
"G", name="leyex", host="mpc2680.psi.ch", port=8081, socket_cls=SocketMock
)
leyey = GalilMotor(
"H", name="leyey", host="mpc2680.psi.ch", port=8081, socket_cls=SocketMock
)
leyex.stage()
# leyey.stage()
leyex.controller.galil_show_all()