Short term fix for heatmap generation with beamline data
This commit is contained in:
parent
7285f47db3
commit
9ed675b8cb
1 changed files with 25 additions and 15 deletions
|
|
@ -362,6 +362,10 @@ def generate_heatmap(data, options={}):
|
||||||
|
|
||||||
|
|
||||||
if options['increase_contrast']:
|
if options['increase_contrast']:
|
||||||
|
|
||||||
|
if d['I'].min() < 0:
|
||||||
|
d['I'] = d['I'] - d['I'].min()
|
||||||
|
|
||||||
d['I'] = d['I']**(1/options['contrast_factor'])
|
d['I'] = d['I']**(1/options['contrast_factor'])
|
||||||
|
|
||||||
twotheta = np.append(twotheta, d['2th'].to_numpy())
|
twotheta = np.append(twotheta, d['2th'].to_numpy())
|
||||||
|
|
@ -418,23 +422,29 @@ def generate_heatmap(data, options={}):
|
||||||
scan_numbers = []
|
scan_numbers = []
|
||||||
|
|
||||||
temperatures = []
|
temperatures = []
|
||||||
for i, filename in enumerate(data['path']):
|
|
||||||
scan_numbers.append(i)
|
# FIXME This is a very bad check for whether it is HTXRD or not - it bascailly just excludes any files that has a .poni-file passed. Make more rigorous in future!
|
||||||
temperatures.append(xrd.io.read_metadata_from_xy(filename)['temperature'])
|
if not 'calibrant' in data.keys():
|
||||||
|
for i, filename in enumerate(data['path']):
|
||||||
|
scan_numbers.append(i)
|
||||||
|
temperatures.append(xrd.io.read_metadata_from_xy(filename)['temperature'])
|
||||||
|
|
||||||
|
yticks = scan_numbers[0::options['heatmap_y_tick_locators'][0]]
|
||||||
|
yticks.append(scan_numbers[-1])
|
||||||
|
|
||||||
|
if not temperatures[0]:
|
||||||
|
yticklabels = yticks
|
||||||
|
options['heatmap.ylabel'] = 'Scan number'
|
||||||
|
options['heatmap.yunit'] = None
|
||||||
|
|
||||||
|
else:
|
||||||
|
yticklabels = temperatures[0::options['heatmap_y_tick_locators'][0]]
|
||||||
|
yticklabels.append(temperatures[-1])
|
||||||
|
options['heatmap.ylabel'] = 'Temperature'
|
||||||
|
options['heatmap.yunit'] = '$^\circ$C'
|
||||||
|
|
||||||
yticks = scan_numbers[0::options['heatmap_y_tick_locators'][0]]
|
|
||||||
yticks.append(scan_numbers[-1])
|
|
||||||
|
|
||||||
if not temperatures[0]:
|
|
||||||
yticklabels = yticks
|
|
||||||
options['heatmap.ylabel'] = 'Scan number'
|
|
||||||
options['heatmap.yunit'] = None
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
yticklabels = temperatures[0::options['heatmap_y_tick_locators'][0]]
|
yticks, yticklabels = None, None
|
||||||
yticklabels.append(temperatures[-1])
|
|
||||||
options['heatmap.ylabel'] = 'Temperature'
|
|
||||||
options['heatmap.yunit'] = '$^\circ$C'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue