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 0b1b41a..6873a37 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 @@ -417,17 +417,23 @@ class XrayEyeAlign: self.movement_buttons_enabled(False, False) target_angle = LAMNI_ALIGNMENT_ANGLES[k - 1] # 45...315 deg - # Approach from halfway between previous and current angle - # to reduce mechanical hysteresis (same as old alignment.py) - prev_angle = LAMNI_ALIGNMENT_ANGLES[k - 2] - approach_angle = prev_angle + (target_angle - prev_angle) / 2 - self._disable_rt_feedback() - self.tomo_rotate(approach_angle) - self.scans.lamni_move_to_scan_center( - shift_x=self.shift_xy[0] / 1000, - shift_y=self.shift_xy[1] / 1000, - angle=float(self.get_tomo_angle()), - ).wait() + if keep_shutter_open: + # Rotate via the halfway point between previous and + # current angle so the sample is seen sweeping + # smoothly through the intermediate position in live + # view. Only worth the extra move when the shutter + # is open and someone is actually watching -- with + # the shutter closed, jump straight to target_angle + # below. + prev_angle = LAMNI_ALIGNMENT_ANGLES[k - 2] + approach_angle = prev_angle + (target_angle - prev_angle) / 2 + self._disable_rt_feedback() + self.tomo_rotate(approach_angle) + self.scans.lamni_move_to_scan_center( + shift_x=self.shift_xy[0] / 1000, + shift_y=self.shift_xy[1] / 1000, + angle=float(self.get_tomo_angle()), + ).wait() self._disable_rt_feedback() self.tomo_rotate(target_angle) self.scans.lamni_move_to_scan_center( diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/x_ray_eye_align.py b/csaxs_bec/bec_ipython_client/plugins/omny/x_ray_eye_align.py index 9f3c9d7..3d8597f 100644 --- a/csaxs_bec/bec_ipython_client/plugins/omny/x_ray_eye_align.py +++ b/csaxs_bec/bec_ipython_client/plugins/omny/x_ray_eye_align.py @@ -103,7 +103,7 @@ class XrayEyeAlign: dev.cam_xeye.live_mode_enabled.put(True) self.gui.on_live_view_enabled(True) dev.omnyfsh.fshopen() - time.sleep(0.5) + time.sleep(1) if not keep_shutter_open: self.gui.on_live_view_enabled(False) time.sleep(0.1)