Merge pull request #2863 from nem1234/debug_dm_axes

bugfix: broken axis name when signal_type==""
hyperspy · Dec 21, 2021 · 55b56ff · 55b56ff
2 parents 97687bf + 5c4e9e5
commit 55b56ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/hyperspy/io_plugins/digital_micrograph.py b/hyperspy/io_plugins/digital_micrograph.py
@@ -536,13 +536,14 @@ def units(self):
     def names(self):
         names = [t.Undefined] * len(self.shape)
         indices = list(range(len(self.shape)))
+
         if self.signal_type == "EELS":
             if "eV" in self.units:
                 names[indices.pop(self.units.index("eV"))] = "Energy loss"
         elif self.signal_type in ("EDS", "EDX"):
             if "keV" in self.units:
                 names[indices.pop(self.units.index("keV"))] = "Energy"
-        elif self.signal_type in ("CL"):
+        elif self.signal_type == "CL":
             if "nm" in self.units:
                 names[indices.pop(self.units.index("nm"))] = "Wavelength"
         for index, name in zip(indices[::-1], ("x", "y", "z")):

diff --git a/hyperspy/tests/io/test_dm3.py b/hyperspy/tests/io/test_dm3.py
@@ -489,3 +489,8 @@ def test_data(pdict):
                                   err_msg='content %s type % i: '
                                   '\n%s not equal to \n%s' %
                                   (subfolder, key, str(s.data), str(dat)))
+
+def test_axes_bug_for_image():
+    fname = os.path.join(MY_PATH, "dm3_2D_data", "test_STEM_image.dm3")
+    s = load(fname)
+    assert s.axes_manager[1].name == 'y'