zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set chi=180, phi=0 for nb geometry

Browse Source
This commit is contained in:
usov_i 2023-06-01 16:18:50 +02:00
parent a165167902
commit 2e2677d856
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pyzebra/app/panel_hdf_viewer.py
View File

@ -356,8 +356,8 @@ def create():
gamma_c = gamma[det_c_y, det_c_x] gamma_c = gamma[det_c_y, det_c_x]
nu_c = nu[det_c_y, det_c_x] nu_c = nu[det_c_y, det_c_x]
omega_c = omega[det_c_y, det_c_x] omega_c = omega[det_c_y, det_c_x]
chi_c = None chi_c = scan["chi"][index]
phi_c = None phi_c = scan["phi"][index]
else: # zebra_mode == "bi" else: # zebra_mode == "bi"
wave = scan["wave"] wave = scan["wave"]
@ -842,10 +842,6 @@ def create():
x_pos = scan["fit"]["x_pos"] x_pos = scan["fit"]["x_pos"]
y_pos = scan["fit"]["y_pos"] y_pos = scan["fit"]["y_pos"]
if scan["zebra_mode"] == "nb":
chi = None
phi = None
events_data["wave"].append(wave) events_data["wave"].append(wave)
events_data["ddist"].append(ddist) events_data["ddist"].append(ddist)
events_data["cell"].append(cell) events_data["cell"].append(cell)

8
pyzebra/h5.py
View File

@ -114,10 +114,14 @@ def read_detector_data(filepath, cami_meta=None):
scan["nu"] = h5f["/entry1/ZEBRA/area_detector2/tilt_angle"][0] scan["nu"] = h5f["/entry1/ZEBRA/area_detector2/tilt_angle"][0]
scan["ddist"] = h5f["/entry1/ZEBRA/area_detector2/distance"][0] scan["ddist"] = h5f["/entry1/ZEBRA/area_detector2/distance"][0]
scan["wave"] = h5f["/entry1/ZEBRA/monochromator/wavelength"][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: if len(scan["chi"]) == 1:
scan["chi"] = np.ones(n) * scan["chi"] scan["chi"] = np.ones(n) * scan["chi"]
scan["phi"] = h5f["/entry1/sample/phi"][:]
if len(scan["phi"]) == 1: if len(scan["phi"]) == 1:
scan["phi"] = np.ones(n) * scan["phi"] scan["phi"] = np.ones(n) * scan["phi"]
if h5f["/entry1/sample/UB"].size == 0: if h5f["/entry1/sample/UB"].size == 0: