diff --git a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py b/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py index fb44267..00ead8f 100644 --- a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py +++ b/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py @@ -22,7 +22,7 @@ class LaMNIInitStagesMixin: user_input = input("Starting initialization of LamNI stages. OK? [y/n]") if user_input == "y": print("staring...") - dev.lsamrot.enabled=True + dev.lsamrot.enabled = True else: return @@ -42,7 +42,7 @@ class LaMNIInitStagesMixin: return self.drive_axis_to_limit(dev.lsamrot, "forward") - dev.lsamrot.enabled=False + dev.lsamrot.enabled = False print("Now hard reboot the controller and run the initialization routine again.") print("The controller will be disabled in bec. To enable dev.lsamrot.enabled=True") return @@ -108,10 +108,10 @@ class LaMNIInitStagesMixin: time.sleep(1) dev.losax.controller.find_reference_mark(1, 0, 1000, 1) time.sleep(1) - #dev.losax.controller.find_reference_mark(3, 1, 1000, 1) - #time.sleep(1) - #dev.losax.controller.find_reference_mark(4, 1, 1000, 1) - #time.sleep(1) + # dev.losax.controller.find_reference_mark(3, 1, 1000, 1) + # time.sleep(1) + # dev.losax.controller.find_reference_mark(4, 1, 1000, 1) + # time.sleep(1) # set_lm losax -1.5 0.25 # set_lm losay -2.5 4.1 diff --git a/csaxs_bec/bec_ipython_client/plugins/LamNI/x_ray_eye_align.py b/csaxs_bec/bec_ipython_client/plugins/LamNI/x_ray_eye_align.py index 053fed0..2a5ade6 100644 --- a/csaxs_bec/bec_ipython_client/plugins/LamNI/x_ray_eye_align.py +++ b/csaxs_bec/bec_ipython_client/plugins/LamNI/x_ray_eye_align.py @@ -16,8 +16,7 @@ from typeguard import typechecked from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_get, epics_put, fshopen -from .lamni_optics_mixin import LamNIOpticsMixin -from .lamni_optics_mixin import LaMNIInitStagesMixin +from .lamni_optics_mixin import LaMNIInitStagesMixin, LamNIOpticsMixin logger = bec_logger.logger bec = builtins.__dict__.get("bec") diff --git a/csaxs_bec/devices/epics/devices/omny_sample_storage.py b/csaxs_bec/devices/epics/devices/omny_sample_storage.py index 9b49c47..201064a 100644 --- a/csaxs_bec/devices/epics/devices/omny_sample_storage.py +++ b/csaxs_bec/devices/epics/devices/omny_sample_storage.py @@ -4,7 +4,7 @@ from ophyd import Component as Cpt from ophyd import Device from ophyd import DynamicDeviceComponent as Dcpt from ophyd import EpicsSignal -from prettytable import PrettyTable, FRAME +from prettytable import FRAME, PrettyTable class OMNYSampleStorageError(Exception): diff --git a/csaxs_bec/devices/galil/galil_ophyd.py b/csaxs_bec/devices/galil/galil_ophyd.py index 8ed556c..273beae 100644 --- a/csaxs_bec/devices/galil/galil_ophyd.py +++ b/csaxs_bec/devices/galil/galil_ophyd.py @@ -94,7 +94,9 @@ class GalilController(Controller): if axis_Id is None and axis_Id_numeric is not None: axis_Id = self.axis_Id_numeric_to_alpha(axis_Id_numeric) is_moving = bool(float(self.socket_put_and_receive(f"MG_BG{axis_Id}")) != 0) - backlash_is_active = bool(float(self.socket_put_and_receive(f"MGbcklact[{axis_Id_numeric}]")) != 0) + backlash_is_active = bool( + float(self.socket_put_and_receive(f"MGbcklact[{axis_Id_numeric}]")) != 0 + ) return bool( is_moving or backlash_is_active or self.is_thread_active(0) or self.is_thread_active(2) ) @@ -118,8 +120,8 @@ class GalilController(Controller): rt_not_blocked_by_galil = bool(self.socket_put_and_receive(f"MG@OUT[9]")) air_off = bool(self.socket_put_and_receive(f"MG@OUT[13]")) return rt_not_blocked_by_galil and air_off - - def get_digital_input(self,channel): + + def get_digital_input(self, channel): return bool(float(self.socket_put_and_receive(f"MG @IN[{channel}]").strip())) def axis_is_referenced(self, axis_Id_numeric) -> bool: @@ -249,22 +251,22 @@ class GalilController(Controller): self.show_status_other() def show_status_other(self): - #Todo: move to lgalil specific section - if(self.get_digital_input(5)): + # Todo: move to lgalil specific section + if self.get_digital_input(5): print("Emergency stop is not pushed.") else: print("Emergency stop is pushed.") - if(self.get_digital_input(6)): + if self.get_digital_input(6): print("Driver axis 2 error.") - if(self.get_digital_input(13)): + if self.get_digital_input(13): print("No air pressure at inner rotation.") else: print("There is air pressure at the inner rotation.") - if(self.get_digital_input(14)): + if self.get_digital_input(14): print("No air pressure at outer rotation axial.") else: print("There is air pressure at the outer rotation axial.") - if(self.get_digital_input(15)): + if self.get_digital_input(15): print("No air pressure at outer rotation radial.") else: print("There is air pressure at the outer rotation radial.") @@ -378,7 +380,9 @@ class GalilSetpointSignal(GalilSignalBase): if angle_status: self.controller.socket_put_confirmed("angintf=1") except KeyError: - logger.warning("RT is disabled. Failed to update RT angle interferometer status to galil.") + logger.warning( + "RT is disabled. Failed to update RT angle interferometer status to galil." + ) self.controller.socket_put_confirmed(f"naxis={self.parent.axis_Id_numeric}") self.controller.socket_put_confirmed(f"ntarget={target_val:.3f}") diff --git a/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py b/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py index d3d14bf..02ed69b 100644 --- a/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py +++ b/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py @@ -8,6 +8,10 @@ from ophyd import Component as Cpt from ophyd import Device, PositionerBase, Signal from ophyd.status import wait as status_wait from ophyd.utils import LimitError +from ophyd_devices.utils.controller import threadlocked +from ophyd_devices.utils.socket import SocketIO, raise_if_disconnected +from prettytable import PrettyTable + from csaxs_bec.devices.rt_lamni.rt_ophyd import ( BECConfigError, RtCommunicationError, @@ -18,9 +22,6 @@ from csaxs_bec.devices.rt_lamni.rt_ophyd import ( RtSignalRO, retry_once, ) -from ophyd_devices.utils.controller import threadlocked -from ophyd_devices.utils.socket import SocketIO, raise_if_disconnected -from prettytable import PrettyTable logger = bec_logger.logger