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

Add setup type ("nb" or "nb_bi")

Browse Source
This commit is contained in:
usov_i 2020-03-31 14:25:16 +02:00
parent 8805740716
commit e398f0718a
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyzebra/app.py
View File

@ -18,6 +18,7 @@ from bokeh.models import (
LinearColorMapper, LinearColorMapper,
PanTool, PanTool,
Plot, Plot,
RadioButtonGroup,
Range1d, Range1d,
Rect, Rect,
ResetTool, ResetTool,
@ -67,7 +68,7 @@ def update_image():
index_spinner.value = current_index index_spinner.value = current_index
def calculate_hkl(): def calculate_hkl(setup_type="nb_bi"):
h = np.empty(shape=(IMAGE_H, IMAGE_W)) h = np.empty(shape=(IMAGE_H, IMAGE_W))
k = np.empty(shape=(IMAGE_H, IMAGE_W)) k = np.empty(shape=(IMAGE_H, IMAGE_W))
l = np.empty(shape=(IMAGE_H, IMAGE_W)) l = np.empty(shape=(IMAGE_H, IMAGE_W))
@ -76,11 +77,18 @@ def calculate_hkl():
ddist = det_data["ddist"] ddist = det_data["ddist"]
gammad = det_data["pol_angle"][current_index] gammad = det_data["pol_angle"][current_index]
om = det_data["rot_angle"][current_index] om = det_data["rot_angle"][current_index]
ch = det_data["chi_angle"][current_index]
ph = det_data["phi_angle"][current_index]
nud = det_data["tlt_angle"] nud = det_data["tlt_angle"]
ub = det_data["UB"] ub = det_data["UB"]
if setup_type == "nb_bi":
ch = det_data["chi_angle"][current_index]
ph = det_data["phi_angle"][current_index]
elif setup_type == "nb":
ch = 0
ph = 0
else:
raise ValueError(f"Unknown setup type '{setup_type}'")
for xi in np.arange(IMAGE_W): for xi in np.arange(IMAGE_W):
for yi in np.arange(IMAGE_H): for yi in np.arange(IMAGE_H):
h[yi, xi], k[yi, xi], l[yi, xi] = pyzebra.ang2hkl( h[yi, xi], k[yi, xi], l[yi, xi] = pyzebra.ang2hkl(
@ -393,8 +401,12 @@ colormap.on_change("value", colormap_callback)
colormap.value = "plasma" colormap.value = "plasma"
radio_button_group = RadioButtonGroup(labels=["nb", "nb_bi"], active=0)
def hkl_button_callback(): def hkl_button_callback():
h, k, l = calculate_hkl() setup_type = "nb_bi" if radio_button_group.active else "nb"
h, k, l = calculate_hkl(setup_type)
image_source.data.update(h=[h], k=[k], l=[l]) image_source.data.update(h=[h], k=[k], l=[l])
@ -414,7 +426,7 @@ doc.add_root(
row(prev_button, next_button), row(prev_button, next_button),
row(index_spinner, animate_toggle), row(index_spinner, animate_toggle),
row(colormap), row(colormap),
row(hkl_button), row(radio_button_group, hkl_button),
), ),
column(row(overview_plot_x, overview_plot_y), roi_avg_plot), column(row(overview_plot_x, overview_plot_y), roi_avg_plot),
) )