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

Support other than omega scanning variables

Browse Source
This commit is contained in:
usov_i 2021-02-15 15:08:32 +01:00
parent eb4e30b7e0
commit 1a7cd2a4b5
3 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pyzebra/app/panel_ccl_integrate.py
View File

@ -186,20 +186,23 @@ def create():
nonlocal peak_pos_textinput_lock nonlocal peak_pos_textinput_lock
peak_pos_textinput_lock = True peak_pos_textinput_lock = True
y = scan["Counts"] scan_motor = scan["scan_motor"]
x = scan["omega"]
y = scan["Counts"]
x = scan[scan_motor]
plot.axis[0].axis_label = scan_motor
plot_scatter_source.data.update(x=x, y=y, y_upper=y + np.sqrt(y), y_lower=y - np.sqrt(y)) plot_scatter_source.data.update(x=x, y=y, y_upper=y + np.sqrt(y), y_lower=y - np.sqrt(y))
num_of_peaks = len(scan.get("peak_indexes", [])) num_of_peaks = len(scan.get("peak_indexes", []))
if num_of_peaks is not None and num_of_peaks > 0: if num_of_peaks is not None and num_of_peaks > 0:
peak_indexes = scan["peak_indexes"] peak_indexes = scan["peak_indexes"]
if len(peak_indexes) == 1: if len(peak_indexes) == 1:
peak_pos_textinput.value = str(scan["omega"][peak_indexes[0]]) peak_pos_textinput.value = str(scan[scan_motor][peak_indexes[0]])
else: else:
peak_pos_textinput.value = str([scan["omega"][ind] for ind in peak_indexes]) peak_pos_textinput.value = str([scan[scan_motor][ind] for ind in peak_indexes])
plot_peak_source.data.update(x=scan["omega"][peak_indexes], y=scan["peak_heights"]) plot_peak_source.data.update(x=scan[scan_motor][peak_indexes], y=scan["peak_heights"])
plot_line_smooth_source.data.update(x=x, y=scan["smooth_peaks"]) plot_line_smooth_source.data.update(x=x, y=scan["smooth_peaks"])
else: else:
peak_pos_textinput.value = None peak_pos_textinput.value = None
@ -255,7 +258,7 @@ def create():
plot = Plot(x_range=DataRange1d(), y_range=DataRange1d(), plot_height=470, plot_width=700) plot = Plot(x_range=DataRange1d(), y_range=DataRange1d(), plot_height=470, plot_width=700)
plot.add_layout(LinearAxis(axis_label="Counts"), place="left") plot.add_layout(LinearAxis(axis_label="Counts"), place="left")
plot.add_layout(LinearAxis(axis_label="Omega"), place="below") plot.add_layout(LinearAxis(axis_label="Scan motor"), place="below")
plot.add_layout(Grid(dimension=0, ticker=BasicTicker())) plot.add_layout(Grid(dimension=0, ticker=BasicTicker()))
plot.add_layout(Grid(dimension=1, ticker=BasicTicker())) plot.add_layout(Grid(dimension=1, ticker=BasicTicker()))

30
pyzebra/app/panel_param_study.py
View File

@ -201,9 +201,12 @@ def create():
nonlocal peak_pos_textinput_lock nonlocal peak_pos_textinput_lock
peak_pos_textinput_lock = True peak_pos_textinput_lock = True
y = scan["Counts"] scan_motor = scan["scan_motor"]
x = scan["omega"]
y = scan["Counts"]
x = scan[scan_motor]
plot.axis[0].axis_label = scan_motor
plot_scatter_source.data.update(x=x, y=y, y_upper=y + np.sqrt(y), y_lower=y - np.sqrt(y)) plot_scatter_source.data.update(x=x, y=y, y_upper=y + np.sqrt(y), y_lower=y - np.sqrt(y))
num_of_peaks = len(scan.get("peak_indexes", [])) num_of_peaks = len(scan.get("peak_indexes", []))
@ -275,12 +278,19 @@ def create():
par = [] par = []
for s, p in enumerate(scan_table_source.data["param"]): for s, p in enumerate(scan_table_source.data["param"]):
if p: if p:
xs.append(np.array(det_data[s]["omega"])) scan = det_data[s]
x.extend(det_data[s]["omega"]) scan_motor = scan["scan_motor"]
ys.append(np.array(det_data[s]["Counts"])) xs.append(scan[scan_motor])
y.extend([float(p)] * len(det_data[s]["omega"])) x.extend(scan[scan_motor])
ys.append(scan["Counts"])
y.extend([float(p)] * len(scan[scan_motor]))
param.append(float(p)) param.append(float(p))
par.extend(det_data[s]["Counts"]) par.extend(scan["Counts"])
if det_data:
scan_motor = det_data[0]["scan_motor"]
ov_plot.axis[0].axis_label = scan_motor
ov_param_plot.axis[0].axis_label = scan_motor
ov_plot_mline_source.data.update(xs=xs, ys=ys, param=param, color=color_palette(len(xs))) ov_plot_mline_source.data.update(xs=xs, ys=ys, param=param, color=color_palette(len(xs)))
ov_param_plot_scatter_source.data.update(x=x, y=y, param=par) ov_param_plot_scatter_source.data.update(x=x, y=y, param=par)
@ -289,7 +299,7 @@ def create():
plot = Plot(x_range=DataRange1d(), y_range=DataRange1d(), plot_height=450, plot_width=700) plot = Plot(x_range=DataRange1d(), y_range=DataRange1d(), plot_height=450, plot_width=700)
plot.add_layout(LinearAxis(axis_label="Counts"), place="left") plot.add_layout(LinearAxis(axis_label="Counts"), place="left")
plot.add_layout(LinearAxis(axis_label="Omega"), place="below") plot.add_layout(LinearAxis(axis_label="Scan motor"), place="below")
plot.add_layout(Grid(dimension=0, ticker=BasicTicker())) plot.add_layout(Grid(dimension=0, ticker=BasicTicker()))
plot.add_layout(Grid(dimension=1, ticker=BasicTicker())) plot.add_layout(Grid(dimension=1, ticker=BasicTicker()))
@ -329,7 +339,7 @@ def create():
ov_plot = Plot(x_range=DataRange1d(), y_range=DataRange1d(), plot_height=400, plot_width=700) ov_plot = Plot(x_range=DataRange1d(), y_range=DataRange1d(), plot_height=400, plot_width=700)
ov_plot.add_layout(LinearAxis(axis_label="Counts"), place="left") ov_plot.add_layout(LinearAxis(axis_label="Counts"), place="left")
ov_plot.add_layout(LinearAxis(axis_label="Omega"), place="below") ov_plot.add_layout(LinearAxis(axis_label="Scan motor"), place="below")
ov_plot.add_layout(Grid(dimension=0, ticker=BasicTicker())) ov_plot.add_layout(Grid(dimension=0, ticker=BasicTicker()))
ov_plot.add_layout(Grid(dimension=1, ticker=BasicTicker())) ov_plot.add_layout(Grid(dimension=1, ticker=BasicTicker()))
@ -346,7 +356,7 @@ def create():
) )
ov_param_plot.add_layout(LinearAxis(axis_label="Param"), place="left") ov_param_plot.add_layout(LinearAxis(axis_label="Param"), place="left")
ov_param_plot.add_layout(LinearAxis(axis_label="Omega"), place="below") ov_param_plot.add_layout(LinearAxis(axis_label="Scan motor"), place="below")
ov_param_plot.add_layout(Grid(dimension=0, ticker=BasicTicker())) ov_param_plot.add_layout(Grid(dimension=0, ticker=BasicTicker()))
ov_param_plot.add_layout(Grid(dimension=1, ticker=BasicTicker())) ov_param_plot.add_layout(Grid(dimension=1, ticker=BasicTicker()))

9
pyzebra/ccl_io.py
View File

@ -208,6 +208,15 @@ def parse_1D(fileobj, data_type):
s["omega"] = s["om"] s["omega"] = s["om"]
del s["om"] del s["om"]
# "tt" -> "temp"
elif s["scan_motor"] == "tt":
s["scan_motor"] = "temp"
s["temp"] = s["tt"]
del s["tt"]
# "mf" stays "mf"
# "phi" stays "phi"
s["h"] = s["k"] = s["l"] = float("nan") s["h"] = s["k"] = s["l"] = float("nan")
for param in ("mf", "temp"): for param in ("mf", "temp"):