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

Fix active_roi determination

Browse source
This commit is contained in:
rasmusvt 2022-07-04 18:18:31 +02:00
parent 1a06e7b4fc
commit b5cac158a4
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nafuma/xanes/calib.py
View file

@ -375,7 +375,7 @@ def post_edge_fit(data: dict, options={}):
aux.write_log(message='Post edge fitting done!', options=options) aux.write_log(message='Post edge fitting done!', options=options)
if options['post_edge_store_data']: if options['post_edge_store_data']:
data['post_edge_fit_data'] = post_edge_fit_data data['post_edge_fit_data'] = post_edge_fit_data.dropna(axis=0)
return post_edge_fit_data return post_edge_fit_data
@ -875,7 +875,6 @@ def normalise(data: dict, options={}):
#Finding the normalisation constant µ_0(E_0), by subtracting the value of the pre-edge-line from the value of the post-edge line at e0 #Finding the normalisation constant µ_0(E_0), by subtracting the value of the pre-edge-line from the value of the post-edge line at e0
for filename in data['path']: for filename in data['path']:
print(filename)
e0_ind = data['post_edge_fit_data'].loc[data['post_edge_fit_data']['ZapEnergy'] == find_nearest(data['post_edge_fit_data']['ZapEnergy'], data['e0_diff'][filename])].index.values[0] e0_ind = data['post_edge_fit_data'].loc[data['post_edge_fit_data']['ZapEnergy'] == find_nearest(data['post_edge_fit_data']['ZapEnergy'], data['e0_diff'][filename])].index.values[0]
#norm = data['post_edge_fit_data'][filename].iloc[find_nearest(data['post_edge_fit_data'][filename], data['e0'][filename])] #norm = data['post_edge_fit_data'][filename].iloc[find_nearest(data['post_edge_fit_data'][filename], data['e0'][filename])]
normalisation_constant = data['post_edge_fit_data'][filename].iloc[e0_ind] - data['pre_edge_fit_data'][filename].iloc[e0_ind] normalisation_constant = data['post_edge_fit_data'][filename].iloc[e0_ind] - data['pre_edge_fit_data'][filename].iloc[e0_ind]

5
nafuma/xanes/io.py
View file

@ -225,9 +225,6 @@ def determine_active_roi(scan_data):
# active_roi = 'xmap_roi01' # active_roi = 'xmap_roi01'
# FIXME This is broken now -
if not ('xmap_roi00' in scan_data.columns) or not ('xmap_roi01' in scan_data.columns): if not ('xmap_roi00' in scan_data.columns) or not ('xmap_roi01' in scan_data.columns):
if 'xmap_roi00' in scan_data.columns: if 'xmap_roi00' in scan_data.columns:
active_roi = 'xmap_roi00' active_roi = 'xmap_roi00'
@ -235,7 +232,7 @@ def determine_active_roi(scan_data):
active_roi = 'xmap_roi01' active_roi = 'xmap_roi01'
elif (scan_data['xmap_roi00'].iloc[0:100].mean() < scan_data['xmap_roi00'].iloc[-100:].mean()) and (scan_data['xmap_roi01'].iloc[0:100].mean() < scan_data['xmap_roi01'].iloc[-100:].mean()): elif (scan_data['xmap_roi00'].iloc[0:100].mean() < scan_data['xmap_roi00'].iloc[-100:].mean()) and (scan_data['xmap_roi01'].iloc[0:100].mean() < scan_data['xmap_roi01'].iloc[-100:].mean()):
if ((scan_data['xmap_roi00'].max()-scan_data['xmap_roi00'].min())) > ((scan_data['xmap_roi01'].max() - scan_data['xmap_roi01'].min())): if (scan_data['xmap_roi00'].iloc[:int(scan_data.shape[0]/2)].max() - scan_data['xmap_roi00'].iloc[0])/scan_data['xmap_roi00'].max() > (scan_data['xmap_roi01'].iloc[:int(scan_data.shape[0]/2)].max() - scan_data['xmap_roi01'].iloc[0])/scan_data['xmap_roi01'].max():
active_roi = 'xmap_roi00' active_roi = 'xmap_roi00'
else: else:
active_roi = 'xmap_roi01' active_roi = 'xmap_roi01'