Corrected the swapped axes for non-dm3/4 files at load_file.

etienne-monier · Mar 25, 2020 · 0ed3ba3 · 0ed3ba3
1 parent 5518f00
commit 0ed3ba3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/inpystem/dataset.py b/inpystem/dataset.py
@@ -201,11 +201,18 @@ def load_file(
         # This is a matlab file
         else:
             # The data variable name
-            variable_name = config[section]['mat_variable_name']
+            if 'mat_variable_name' in config[section]:
+                variable_name = config[section]['mat_variable_name']
+            else:
+                raise ValueError('The mat_variable_name entry is necessary'
+                                 ' for .mat files.')
             mat_data = scio.loadmat(str(data_file),
                                     variable_names=variable_name)
             ndata = mat_data[variable_name]
 
+        # To prevent hsdata swap axes.
+        ndata = np.swapaxes(ndata, 0, 1)
+
         if ndim == 2:
             data = hs.signals.Signal2D(ndata)
         else:

diff --git a/inpystem/version.py b/inpystem/version.py
@@ -3,7 +3,7 @@
 name = 'inpystem'
 
 # Related PEP: https://www.python.org/dev/peps/pep-0440/
-version = "0.1rc2"
+version = "0.1.1"
 description = "A python library for STEM acquisition inpainting."
 license = 'MIT'