diff --git a/csaxs_bec/device_configs/omny_config.yaml b/csaxs_bec/device_configs/omny_config.yaml index 86d8897..7e1f2ba 100644 --- a/csaxs_bec/device_configs/omny_config.yaml +++ b/csaxs_bec/device_configs/omny_config.yaml @@ -254,7 +254,7 @@ oshuttleopen: sign: 1 deviceTags: - omny - enabled: false + enabled: true onFailure: buffer readOnly: true readoutPriority: baseline @@ -273,7 +273,7 @@ oshuttlealign: sign: 1 deviceTags: - omny - enabled: false + enabled: true onFailure: buffer readOnly: true readoutPriority: baseline diff --git a/csaxs_bec/devices/omny/galil/galil_ophyd.py b/csaxs_bec/devices/omny/galil/galil_ophyd.py index 35b4d2b..a799d7e 100644 --- a/csaxs_bec/devices/omny/galil/galil_ophyd.py +++ b/csaxs_bec/devices/omny/galil/galil_ophyd.py @@ -171,6 +171,8 @@ class GalilController(Controller): if not limit: raise GalilError(f"Failed to drive axis {axis_Id}/{axis_Id_numeric} to limit.") + else: + print(f"Axis {}") def find_reference(self, axis_Id_numeric: int) -> None: """ diff --git a/csaxs_bec/devices/omny/galil/ogalil_ophyd.py b/csaxs_bec/devices/omny/galil/ogalil_ophyd.py index 0ac0b8a..0f95ed4 100644 --- a/csaxs_bec/devices/omny/galil/ogalil_ophyd.py +++ b/csaxs_bec/devices/omny/galil/ogalil_ophyd.py @@ -196,7 +196,7 @@ class OMNYGalilController(GalilController): class OMNYGalilMotor(Device, PositionerBase): - USER_ACCESS = ["controller", "find_reference", "_ogalil_folerr_reset_and_ignore", "_ogalil_set_axis_to_pos_wo_reference_search"] + USER_ACCESS = ["controller", "find_reference", "drive_axis_to_limit", "_ogalil_folerr_reset_and_ignore", "_ogalil_set_axis_to_pos_wo_reference_search"] readback = Cpt(OMNYGalilReadbackSignal, signal_name="readback", kind="hinted") user_setpoint = Cpt(GalilSetpointSignal, signal_name="setpoint") motor_resolution = Cpt(GalilMotorResolution, signal_name="resolution", kind="config") @@ -404,7 +404,7 @@ class OMNYGalilMotor(Device, PositionerBase): Args: direction (str): Direction in which the axis should be driven to the limit. Either 'forward' or 'reverse'. """ - self.controller.drive_axis_to_limit(self, self.axis_Id_numeric, direction) + self.controller.drive_axis_to_limit(self.axis_Id_numeric, direction) def stop(self, *, success=False): self.controller.stop_all_axes()