rasmus/nafuma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add first stab at ylim widget, should be improved

Browse source
This commit is contained in:
rasmusvt 2022-03-23 16:03:34 +01:00
parent 2424d89156
commit 606bfc180d
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
beamtime/xrd/io.py
View file

@ -388,6 +388,8 @@ def load_reflection_table(data, options={}):
def translate_wavelengths(data, wavelength, to_wavelength=None):
# FIXME Somewhere here there is an invalid arcsin-argument. Not sure where.
pd.options.mode.chained_assignment = None
# Translate to CuKalpha
@ -424,9 +426,7 @@ def translate_wavelengths(data, wavelength, to_wavelength=None):
if to_wavelength:
if to_wavelength > cuka:
if to_wavelength >= cuka:
max_2th = 2*np.arcsin(cuka/to_wavelength) * 180/np.pi
else:
max_2th = data['2th_cuka'].max()

21
beamtime/xrd/plot.py
View file

@ -176,6 +176,24 @@ def plot_diffractogram_interactive(data, options):
update_minmax(minmax, data)
ymin, ymax = None, None
for index, diffractogram in enumerate(data['diffractogram']):
if not ymin or (ymin > (diffractogram['I'].min())): #+index*options['offset_y'])):
ymin = diffractogram['I'].min()#+index*options['offset_y']
if not ymax or (ymax < (diffractogram['I'].max())):#+index*options['offset_y'])):
ymax = diffractogram['I'].max()#+index*options['offset_y']
print(ymax)
ymin_start = ymin - 0.1*ymax
ymax_start = ymax+0.2*ymax
ymin = ymin - 5*ymax
ymax = ymax*5
options['widgets'] = {
'xlim': {
'w': widgets.FloatRangeSlider(value=[minmax['2th'][0], minmax['2th'][1]], min=minmax['2th'][0], max=minmax['2th'][1], step=0.5, layout=widgets.Layout(width='95%')),
@ -199,7 +217,8 @@ def plot_diffractogram_interactive(data, options):
reflections_plot=widgets.ToggleButton(value=True),
reflections_indices=widgets.ToggleButton(value=False),
x_vals=widgets.Dropdown(options=['2th', 'd', '1/d', 'q', 'q2', 'q4', '2th_cuka', '2th_moka'], value='2th', description='X-values'),
xlim=options['widgets']['xlim']['w'])
xlim=options['widgets']['xlim']['w'],
ylim=widgets.FloatRangeSlider(value=[ymin_start, ymax_start], min=ymin, max=ymax, step=0.5, layout=widgets.Layout(width='95%')))
else:
w = widgets.interactive(btp.ipywidgets_update, func=widgets.fixed(plot_diffractogram), data=widgets.fixed(data), options=widgets.fixed(options),