diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py index 1fb4921..24b7b27 100644 --- a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py +++ b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py @@ -975,43 +975,42 @@ class FlomniAlignmentMixin: use_vertical_default_values=True, ): """ - Read the alignment offset from the given directory and set the global parameter - tomo_alignment_fit. + Read the alignment parameters from xray eye fit. - Args: - dir_path (str, optional): The directory to read the alignment offset from. Defaults to os.path.expanduser("~/Data10/specES1/internal/"). """ tomo_alignment_fit = np.zeros((2, 5)) - with open(os.path.join(dir_path, "ptychotomoalign_Ax.txt"), "r") as file: - tomo_alignment_fit[0][0] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_Ax.txt"), "r") as file: + # tomo_alignment_fit[0][0] = file.readline() - with open(os.path.join(dir_path, "ptychotomoalign_Bx.txt"), "r") as file: - tomo_alignment_fit[0][1] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_Bx.txt"), "r") as file: + # tomo_alignment_fit[0][1] = file.readline() - with open(os.path.join(dir_path, "ptychotomoalign_Cx.txt"), "r") as file: - tomo_alignment_fit[0][2] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_Cx.txt"), "r") as file: + # tomo_alignment_fit[0][2] = file.readline() - with open(os.path.join(dir_path, "ptychotomoalign_Ay.txt"), "r") as file: - tomo_alignment_fit[1][0] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_Ay.txt"), "r") as file: + # tomo_alignment_fit[1][0] = file.readline() - with open(os.path.join(dir_path, "ptychotomoalign_By.txt"), "r") as file: - tomo_alignment_fit[1][1] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_By.txt"), "r") as file: + # tomo_alignment_fit[1][1] = file.readline() - with open(os.path.join(dir_path, "ptychotomoalign_Cy.txt"), "r") as file: - tomo_alignment_fit[1][2] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_Cy.txt"), "r") as file: + # tomo_alignment_fit[1][2] = file.readline() - with open(os.path.join(dir_path, "ptychotomoalign_Ay3.txt"), "r") as file: - tomo_alignment_fit[1][3] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_Ay3.txt"), "r") as file: + # tomo_alignment_fit[1][3] = file.readline() - with open(os.path.join(dir_path, "ptychotomoalign_Cy3.txt"), "r") as file: - tomo_alignment_fit[1][4] = file.readline() + # with open(os.path.join(dir_path, "ptychotomoalign_Cy3.txt"), "r") as file: + # tomo_alignment_fit[1][4] = file.readline() - tomo_alignment_fit[0][0] = gui.flomni.xeyegui.XRayEye.Waveform.fit_x_SineModel.dap_params['amplitude'] - tomo_alignment_fit[0][1] = gui.flomni.xeyegui.XRayEye.Waveform.fit_x_SineModel.dap_params['frequency'] - tomo_alignment_fit[0][2] = gui.flomni.xeyegui.XRayEye.Waveform.fit_x_SineModel.dap_params['shift'] - tomo_alignment_fit[1][0] = gui.flomni.xeyegui.XRayEye.Waveform_0.fit_y_SineModel.dap_params['amplitude'] - tomo_alignment_fit[1][1] = gui.flomni.xeyegui.XRayEye.Waveform_0.fit_y_SineModel.dap_params['frequency'] - tomo_alignment_fit[1][2] = gui.flomni.xeyegui.XRayEye.Waveform_0.fit_y_SineModel.dap_params['shift'] + params = dev.omny_xray_gui.fit_params_x.get() + + #amplitude + tomo_alignment_fit[0][0] = params['SineModel_0_amplitude'] + #phase + tomo_alignment_fit[0][1] = params['SineModel_0_shift'] + #offset + tomo_alignment_fit[0][2] = params['LinearModel_1_intercept'] print("applying vertical default values from mirror calibration, not from fit!") tomo_alignment_fit[1][0] = 0 tomo_alignment_fit[1][1] = 0 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 7e1f42f..19dcbdb 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 @@ -281,14 +281,6 @@ class XrayEyeAlign: ) self.gui.submit_fit_array(data) print(f"fit submited with {data}") - print("todo mirko: submitted data is 1000 fold in amplitude") # self.flomni.flomnigui_show_xeyealign_fittab() -# dev.omny_xray_gui.fit_params_x.get() -# Out[2]: -# {'LinearModel_1_intercept': 26.784736082138483, -# 'LinearModel_1_slope': 0.0, -# 'SineModel_0_amplitude': 146.92330535785158, -# 'SineModel_0_frequency': 0.0174533, -# 'SineModel_0_shift': 4.110953701129466}