From 26f834b9333aead64c7d2ee1b89a437432d0ee45 Mon Sep 17 00:00:00 2001 From: e21191 Date: Mon, 22 May 2023 08:31:17 +0200 Subject: [PATCH] Fixed but to remove Thread Signal from Axis movements - working motions on samx/samy --- ophyd_devices/galil/sgalil_ophyd.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ophyd_devices/galil/sgalil_ophyd.py b/ophyd_devices/galil/sgalil_ophyd.py index b0dfea6..b67b65a 100644 --- a/ophyd_devices/galil/sgalil_ophyd.py +++ b/ophyd_devices/galil/sgalil_ophyd.py @@ -49,7 +49,6 @@ class GalilController(Controller): "galil_show_all", "socket_put_and_receive", "socket_put_confirmed", - "lgalil_is_air_off_and_orchestra_enabled", ] def __init__( @@ -308,14 +307,11 @@ class GalilMotorIsMoving(GalilSignalRO): def _socket_get(self): if self.parent.axis_Id_numeric == 2: ret = self.controller.is_axis_moving(self.parent.axis_Id, self.parent.axis_Id_numeric) - elif self.parent.axis_Id_numeric == 4: + return ret + if self.parent.axis_Id_numeric == 4: # Motion signal from axis 4 is mapped to axis 5 ret = self.controller.is_axis_moving('F', 5) - return ( - ret - or self.controller.is_thread_active(0) - or self.controller.is_thread_active(2) - ) + return ret or self.controller.is_thread_active(4) def get(self): val = super().get()