diff --git a/csaxs_bec/devices/npoint/npoint.py b/csaxs_bec/devices/npoint/npoint.py index c99b185..47595be 100644 --- a/csaxs_bec/devices/npoint/npoint.py +++ b/csaxs_bec/devices/npoint/npoint.py @@ -442,9 +442,14 @@ class NPointAxis(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/galil/fgalil_ophyd.py b/csaxs_bec/devices/omny/galil/fgalil_ophyd.py index 37640fb..a643ef9 100644 --- a/csaxs_bec/devices/omny/galil/fgalil_ophyd.py +++ b/csaxs_bec/devices/omny/galil/fgalil_ophyd.py @@ -212,9 +212,14 @@ class FlomniGalilMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/galil/fupr_ophyd.py b/csaxs_bec/devices/omny/galil/fupr_ophyd.py index 7ca1439..3bf5b26 100644 --- a/csaxs_bec/devices/omny/galil/fupr_ophyd.py +++ b/csaxs_bec/devices/omny/galil/fupr_ophyd.py @@ -185,9 +185,14 @@ class FuprGalilMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/galil/lgalil_ophyd.py b/csaxs_bec/devices/omny/galil/lgalil_ophyd.py index 2f2d304..43d39c1 100644 --- a/csaxs_bec/devices/omny/galil/lgalil_ophyd.py +++ b/csaxs_bec/devices/omny/galil/lgalil_ophyd.py @@ -170,9 +170,14 @@ class LamniGalilMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/galil/ogalil_ophyd.py b/csaxs_bec/devices/omny/galil/ogalil_ophyd.py index 90f45fe..7be97ce 100644 --- a/csaxs_bec/devices/omny/galil/ogalil_ophyd.py +++ b/csaxs_bec/devices/omny/galil/ogalil_ophyd.py @@ -324,9 +324,14 @@ class OMNYGalilMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/galil/sgalil_ophyd.py b/csaxs_bec/devices/omny/galil/sgalil_ophyd.py index d0e838b..5a64a1e 100644 --- a/csaxs_bec/devices/omny/galil/sgalil_ophyd.py +++ b/csaxs_bec/devices/omny/galil/sgalil_ophyd.py @@ -530,9 +530,14 @@ class SGalilMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py b/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py index 044884f..b1a3705 100644 --- a/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py +++ b/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py @@ -678,9 +678,14 @@ class RtFlomniMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py b/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py index 60e8730..cfefae8 100644 --- a/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py +++ b/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py @@ -588,9 +588,14 @@ class RtLamniMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py b/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py index a1ee947..5756f86 100644 --- a/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py +++ b/csaxs_bec/devices/omny/rt/rt_omny_ophyd.py @@ -1119,9 +1119,14 @@ class RtOMNYMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get()) diff --git a/csaxs_bec/devices/smaract/smaract_ophyd.py b/csaxs_bec/devices/smaract/smaract_ophyd.py index 8944ddf..b7059d3 100644 --- a/csaxs_bec/devices/smaract/smaract_ophyd.py +++ b/csaxs_bec/devices/smaract/smaract_ophyd.py @@ -153,9 +153,14 @@ class SmaractMotor(Device, PositionerBase): self.low_limit_travel.put(limits[0]) self.high_limit_travel.put(limits[1]) - def wait_for_connection(self, all_signals=False, timeout: float = 30.0) -> bool: + def wait_for_connection(self, timeout: float = 30.0) -> bool: self.controller.on(timeout=timeout) + def destroy(self): + """Make sure to turn off the controller socket on destroy.""" + self.controller.off() + return super().destroy() + @property def limits(self): return (self.low_limit_travel.get(), self.high_limit_travel.get())