From 7e16ea0fea5493437975eac42e5b7ae3613193b5 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Fri, 23 Oct 2020 15:35:15 +0200 Subject: [PATCH] Make magnetic field and temperature optional --- pyzebra/app/panel_hdf_viewer.py | 11 +++++++++-- pyzebra/h5.py | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pyzebra/app/panel_hdf_viewer.py b/pyzebra/app/panel_hdf_viewer.py index 2ff09d9..e992267 100644 --- a/pyzebra/app/panel_hdf_viewer.py +++ b/pyzebra/app/panel_hdf_viewer.py @@ -83,8 +83,15 @@ def create(): image_glyph.color_mapper.low = im_min image_glyph.color_mapper.high = im_max - magnetic_field_spinner.value = det_data["magnetic_field"][index] - temperature_spinner.value = det_data["temperature"][index] + if "magnetic_field" in det_data: + magnetic_field_spinner.value = det_data["magnetic_field"][index] + else: + magnetic_field_spinner.value = None + + if "temperature" in det_data: + temperature_spinner.value = det_data["temperature"][index] + else: + temperature_spinner.value = None gamma, nu = calculate_pol(det_data, index) omega = np.ones((IMAGE_H, IMAGE_W)) * det_data["rot_angle"][index] diff --git a/pyzebra/h5.py b/pyzebra/h5.py index 3286f0e..c11b3dd 100644 --- a/pyzebra/h5.py +++ b/pyzebra/h5.py @@ -60,7 +60,12 @@ def read_detector_data(filepath): det_data["chi_angle"] = h5f["/entry1/sample/chi"][:] # ch det_data["phi_angle"] = h5f["/entry1/sample/phi"][:] # ph det_data["UB"] = h5f["/entry1/sample/UB"][:].reshape(3, 3) - det_data["magnetic_field"] = h5f["/entry1/sample/magnetic_field"][:] - det_data["temperature"] = h5f["/entry1/sample/temperature"][:] + + # optional parameters + if "/entry1/sample/magnetic_field" in h5f: + det_data["magnetic_field"] = h5f["/entry1/sample/magnetic_field"][:] + + if "/entry1/sample/temperature" in h5f: + det_data["temperature"] = h5f["/entry1/sample/temperature"][:] return det_data