diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py index a709003..5d54086 100644 --- a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py +++ b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py @@ -30,12 +30,14 @@ class FlomniOpticsMixin: # move rotation stage to zero to avoid problems with wires umv(dev.fsamroy, 0) - # umv(dev.fttrx1, 9.2) + fttrx_in = self._get_user_param_safe("feyex", "fttrx_in") + umv(dev.fttrx1, fttrx_in) def feye_in(self): bec.queue.next_dataset_number += 1 - # umv(dev.fttrx1, -17) - + fttrx_out = self._get_user_param_safe("feyex", "fttrx_out") + umv(dev.fttrx1, fttrx_out) + feyex_in = self._get_user_param_safe("feyex", "in") feyey_in = self._get_user_param_safe("feyey", "in") diff --git a/csaxs_bec/device_configs/ptycho_flomni.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml index c68247e..54dedb3 100644 --- a/csaxs_bec/device_configs/ptycho_flomni.yaml +++ b/csaxs_bec/device_configs/ptycho_flomni.yaml @@ -21,6 +21,9 @@ feyex: userParameter: in: -16.267 out: -1 + fttrx_in: 4.1 + fttrx_out: -22 + feyey: description: Xray eye Y deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -439,8 +442,8 @@ cam_xeye: deviceConfig: camera_id: 11 bits_per_pixel: 24 - num_rotation_90: 3 - transpose: false + num_rotation_90: 0 + transpose: true force_monochrome: true m_n_colormode: 1 enabled: true