diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py b/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py index e7ab3ea..cba1b1e 100644 --- a/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py +++ b/csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py @@ -59,7 +59,7 @@ class XrayEyeAlign: time.sleep(0.5) print("waiting for live view to start...") - fshopen() + dev.omnyfsh.fshopen() if self.labview: epics_put("XOMNYI-XEYE-ACQDONE:0", 0) @@ -73,7 +73,7 @@ class XrayEyeAlign: if not keep_shutter_open: epics_put("XOMNYI-XEYE-ACQ:0", 0) time.sleep(0.1) - fshclose() + dev.omnyfsh.fshclose() print("got new frame") else: print("Staying in live view, shutter is and remains open!") @@ -143,7 +143,7 @@ class XrayEyeAlign: self.flomni.fosa_out() fsamx_in = self.flomni._get_user_param_safe("fsamx", "in") - umv(dev.fsamx, fsamx_in - 0.25) + #umv(dev.fsamx, fsamx_in - 0.25) self.flomni.ffzp_in() self.update_frame(keep_shutter_open) @@ -172,12 +172,12 @@ class XrayEyeAlign: self.flomni.feedback_disable() fsamx_in = self.flomni._get_user_param_safe("fsamx", "in") - umv(dev.fsamx, fsamx_in) + #(dev.fsamx, fsamx_in) self.flomni.foptics_out() self.flomni.feedback_disable() - umv(dev.fsamx, fsamx_in - 0.25) + #umv(dev.fsamx, fsamx_in - 0.25) if self.labview: self.update_frame(keep_shutter_open) @@ -186,7 +186,7 @@ class XrayEyeAlign: time.sleep(0.5) print("waiting for background frame...") - umv(dev.fsamx, fsamx_in) + #umv(dev.fsamx, fsamx_in) time.sleep(0.5) self.flomni.feedback_enable_with_reset() @@ -254,7 +254,7 @@ class XrayEyeAlign: epics_put("XOMNYI-XEYE-ACQ:0", 2) if keep_shutter_open and not self.labview: if self.flomni.OMNYTools.yesno("Close the shutter now?","y"): - fshclose() + dev.omnyfsh.fshclose() epics_put("XOMNYI-XEYE-ACQ:0", 0) if not self.labview: self.flomni.flomnigui_idle()