Skip to content

Change FileLoader to return Datasets following conventions #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pbeaucage wants to merge 1 commit into
base: dev_v100
Choose a base branch
from
Draft

Change FileLoader to return Datasets following conventions #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/PyHyperScattering/load/FileLoader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ def loadFileSeries(self,basepath,dims,coords={},file_filter=None,file_filter_reg
#prepare the index...
dest_coords_sorted = sorted(dest_coords.items())

vals = []
keys = []
meta_values = []
meta_names = []

for key,val in dest_coords_sorted:
vals.append(val)
keys.append(key)
meta_values.append(val)
meta_names.append(key)

#index = pd.MultiIndex.from_arrays(
# list(dest_coords.values()
Expand All @@ -153,7 +153,7 @@ def loadFileSeries(self,basepath,dims,coords={},file_filter=None,file_filter_reg
# )
#)
try:
index = pd.MultiIndex.from_arrays(vals,names=keys)
index = pd.MultiIndex.from_arrays(meta_values,names=meta_names)
except ValueError as e:
raise ValueError('This load found files, but none were deemed loadable.\nThis usually means that you set a file_filter or md_filter that was too restrictive, or your directory is wrong.\nCheck and rerun') from e
index.name = 'system'
Expand All @@ -177,9 +177,16 @@ def loadFileSeries(self,basepath,dims,coords={},file_filter=None,file_filter_reg
row.interp(coords={'qx':dest_qx,'qy':dest_qy}))
data_rows = data_rows_transformed
#this doesn't work post-xarray 2022.3 out = xr.concat(data_rows,dim=index)
out = xr.concat(data_rows,dim='system').assign_coords({'system':('system',index)})
out = xr.Dataset()

out['raw_intensity'] = xr.concat(data_rows,dim='img_num')
#.assign_coords({'system':('system',index)})

out.attrs.update({'dims_unpacked':dims})
for i,name in enumerate(meta_names):
out[name] = xr.DataArray(meta_values[i],dims=['img_num'])
if not output_qxy and not output_raw:
out = out.assign_coords(pix_x=('pix_x',np.arange(0,len(out.pix_x))),pix_y=('pix_y',np.arange(0,len(out.pix_y))))
out['raw_intensity'] = out['raw_intensity'].assign_coords(pix_x=('pix_x',np.arange(0,len(out.pix_x))),pix_y=('pix_y',np.arange(0,len(out.pix_y))))

print(f'Loaded {nloaded}/{nprocessed} files')
return out