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

Fix bug to iterate correctly through filenames

Browse source
This commit is contained in:
rasmusvt 2022-03-22 20:25:53 +01:00
parent b2ee68859a
commit 86a2ae2379
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
beamtime/xrd/io.py
View file

@ -40,10 +40,11 @@ def integrate_1d(data, options={}, index=0):
df: DataFrame contianing 1D diffractogram if option 'return' is True df: DataFrame contianing 1D diffractogram if option 'return' is True
''' '''
required_options = ['unit', 'save', 'save_filename', 'save_extension', 'save_folder', 'overwrite'] required_options = ['unit', 'nbins', 'save', 'save_filename', 'save_extension', 'save_folder', 'overwrite']
default_options = { default_options = {
'unit': '2th_deg', 'unit': '2th_deg',
'nbins': 3000,
'save': False, 'save': False,
'save_filename': None, 'save_filename': None,
'save_extension': '_integrated.xy', 'save_extension': '_integrated.xy',
@ -64,17 +65,17 @@ def integrate_1d(data, options={}, index=0):
ai = pyFAI.load(data['calibrant']) ai = pyFAI.load(data['calibrant'])
# Determine filename # Determine filename
filename = make_filename(data=data, options=options) filename = make_filename(options=options, path=data['path'][index])
# Make save_folder if this does not exist already # Make save_folder if this does not exist already
if not os.path.isdir(options['save_folder']): if not os.path.isdir(options['save_folder']):
os.makedirs(options['save_folder']) os.makedirs(options['save_folder'])
res = ai.integrate1d(data['image'], data['nbins'], unit=options['unit'], filename=filename) res = ai.integrate1d(data['image'], options['nbins'], unit=options['unit'], filename=filename)
data['path'][index] = filename data['path'][index] = filename
diffractogram, wavelength = read_xy(data=data, options=options) diffractogram, wavelength = read_xy(data=data, options=options, index=index)
if not options['save']: if not options['save']:
os.remove(filename) os.remove(filename)
@ -98,7 +99,7 @@ def make_filename(options, path=None):
# If a path is given instead of an image array, the path is taken as the trunk of the savename # If a path is given instead of an image array, the path is taken as the trunk of the savename
if path: if path:
# Make filename by joining the save_folder, the filename (with extension deleted) and adding the save_extension # Make filename by joining the save_folder, the filename (with extension deleted) and adding the save_extension
filename = os.path.join(options['save_folder'], os.path.split(data['path'])[-1].split('.')[0] + options['save_extension']) filename = os.path.join(options['save_folder'], os.path.split(path)[-1].split('.')[0] + options['save_extension'])
else: else:
# Make filename just "integrated.dat" in the save_folder # Make filename just "integrated.dat" in the save_folder
filename = os.path.join(options['save_folder'], 'integrated.xy') filename = os.path.join(options['save_folder'], 'integrated.xy')
@ -403,6 +404,8 @@ def translate_wavelengths(data, wavelength, to_wavelength=None):
def find_wavelength_from_xy(path): def find_wavelength_from_xy(path):
print(path)
wavelength_dict = {'Cu': 1.54059, 'Mo': 0.71073} wavelength_dict = {'Cu': 1.54059, 'Mo': 0.71073}