From 977a2beb4c95b94f8bf4a0c7edf7265dfbb6d61d Mon Sep 17 00:00:00 2001 From: Holler Mirko Date: Tue, 2 Jul 2024 15:12:23 +0200 Subject: [PATCH] omny galil --- csaxs_bec/devices/omny/galil/ogalil_ophyd.py | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/csaxs_bec/devices/omny/galil/ogalil_ophyd.py b/csaxs_bec/devices/omny/galil/ogalil_ophyd.py index 5149c83..b32c6de 100644 --- a/csaxs_bec/devices/omny/galil/ogalil_ophyd.py +++ b/csaxs_bec/devices/omny/galil/ogalil_ophyd.py @@ -91,6 +91,9 @@ class OMNYGalilController(GalilController): "_ogalil_switchsocket_switch_all_on", "_ogalil_switchsocket_status", "_ogalil_switchsocket_are_all_on", + "_ogalil_folerr_not_ignore", + "_ogalil_folerr_reset_and_ignore", + ] def on(self) -> None: """Open a new socket connection to the controller""" @@ -130,13 +133,14 @@ class OMNYGalilController(GalilController): print("not yet implemented") return 0 - def _ogalil_folerr_reset_and_ignore(self, axis_Id_numeric: int) -> None: - self.socket_put_confirmed(f"folaxerr[{axis_Id_numeric}]=0") + def _ogalil_folerr_reset_and_ignore(self, device) -> None: + axis_id = device._config["deviceConfig"].get("axis_Id") + # axis_id_numeric = self.axis_id_to_numeric(axis_id) + # self.socket_put_confirmed(f"folaxerr[{axis_id_numeric}]=0") self.socket_put_confirmed(f"folerr=0") self.socket_put_confirmed(f"IgNoFol=1") -# # ---------------------------------------------------------------------- -# def _ogalil_set_axis_to_pos_wo_reference_search(mne, pos_mm) '{ +# def _ogalil_set_axis_to_pos_wo_reference_search(mne, pos_mm) '{ # printf("be careful. this routine does not yet take the user motor direction into account\n") @@ -195,11 +199,11 @@ class OMNYGalilController(GalilController): def show_status_other(self): swver = float(self.socket_put_and_receive("MGswver")) - allaxref = bool(self.socket_put_and_receive("MGallaxref")) - tempab = bool(self.socket_put_and_receive("MGtempab")) - timeab = bool(self.socket_put_and_receive("MGtimeab")) - IgNoFol = bool(self.socket_put_and_receive("MGIgNoFol")) - print(f"OMNY galil firmware {swver:2.0f}, TempAbort: {tempab}, Allaxref: {allaxref}, TimeAbort: {timeab}, Ignore Folerr: {IgNoFol}\n") + allaxref = float(self.socket_put_and_receive("MGallaxref")) + tempab = float(self.socket_put_and_receive("MGtempab")) + timeab = float(self.socket_put_and_receive("MGtimeab")) + IgNoFol = float(self.socket_put_and_receive("MGIgNoFol")) + print(f"OMNY galil firmware {swver:2.0f}, TempAbort: {tempab:1.0f}, Allaxref: {allaxref:1.0f}, TimeAbort: {timeab:1.0f}, Ignore Folerr: {IgNoFol:1.0f}\n") if self.sock.port == 8083: self._ogalil_switchsocket_status()