From 2e2677d856abf5cced88f7a211b6f70087ed5a2e Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Thu, 1 Jun 2023 16:18:50 +0200 Subject: [PATCH] Set chi=180, phi=0 for nb geometry --- pyzebra/app/panel_hdf_viewer.py | 8 ++------ pyzebra/h5.py | 8 ++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyzebra/app/panel_hdf_viewer.py b/pyzebra/app/panel_hdf_viewer.py index 59d0ff8..bde9302 100644 --- a/pyzebra/app/panel_hdf_viewer.py +++ b/pyzebra/app/panel_hdf_viewer.py @@ -356,8 +356,8 @@ def create(): gamma_c = gamma[det_c_y, det_c_x] nu_c = nu[det_c_y, det_c_x] omega_c = omega[det_c_y, det_c_x] - chi_c = None - phi_c = None + chi_c = scan["chi"][index] + phi_c = scan["phi"][index] else: # zebra_mode == "bi" wave = scan["wave"] @@ -842,10 +842,6 @@ def create(): x_pos = scan["fit"]["x_pos"] y_pos = scan["fit"]["y_pos"] - if scan["zebra_mode"] == "nb": - chi = None - phi = None - events_data["wave"].append(wave) events_data["ddist"].append(ddist) events_data["cell"].append(cell) diff --git a/pyzebra/h5.py b/pyzebra/h5.py index a7a728c..dc63e55 100644 --- a/pyzebra/h5.py +++ b/pyzebra/h5.py @@ -114,10 +114,14 @@ def read_detector_data(filepath, cami_meta=None): scan["nu"] = h5f["/entry1/ZEBRA/area_detector2/tilt_angle"][0] scan["ddist"] = h5f["/entry1/ZEBRA/area_detector2/distance"][0] scan["wave"] = h5f["/entry1/ZEBRA/monochromator/wavelength"][0] - scan["chi"] = h5f["/entry1/sample/chi"][:] + if scan["zebra_mode"] == "nb": + scan["chi"] = np.array([180]) + scan["phi"] = np.array([0]) + elif scan["zebra_mode"] == "bi": + scan["chi"] = h5f["/entry1/sample/chi"][:] + scan["phi"] = h5f["/entry1/sample/phi"][:] if len(scan["chi"]) == 1: scan["chi"] = np.ones(n) * scan["chi"] - scan["phi"] = h5f["/entry1/sample/phi"][:] if len(scan["phi"]) == 1: scan["phi"] = np.ones(n) * scan["phi"] if h5f["/entry1/sample/UB"].size == 0: