Merge branch 'release-0.2.2'

blleng · Sep 9, 2024 · 112dfdd · 112dfdd
2 parents 9b75b1d + 50d9aea
commit 112dfdd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "convert-emd"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = ["rosettasciio[all]>=0.6"]
 authors = [
   { name="Bing-Liang Leng", email="leng.bl@sjtu.edu.cn" },

diff --git a/src/convert_emd/cemd.py b/src/convert_emd/cemd.py
@@ -7,7 +7,6 @@ def main():
 
     file_name = args.file
     data = emdfun.get_data(file_name)
-    eds = emdfun.is_eds(data)
     output_type = "." + args.out
 
     if args.no_scale:
@@ -29,7 +28,8 @@ def main():
         ele_color = ele + 1
         eds_color[args.eds[ele]] = args.eds[ele_color]
     all_elements = emdfun.eds_elements(data)
-    if eds and len(all_elements):
+    mapping_overlay = []
+    if len(all_elements):
         mapping_overlay = args.overlay if len(args.overlay) else all_elements
         overlay = True
     else:

diff --git a/src/convert_emd/function.py b/src/convert_emd/function.py
@@ -18,10 +18,11 @@ def is_eds_spectrum(frame):
 
 def eds_elements(data):
     element = []
-    for i in range(len(data)):
-        if data_signal_type(data[i]) == "":
-            element.append(get_title(data[i]))
-    if len(element) > 0: element.remove("HAADF")
+    if is_eds(data):
+        for i in range(len(data)):
+            if data_signal_type(data[i]) == "":
+                element.append(get_title(data[i]))
+        if len(element) > 0: element.remove("HAADF")
     return element
 
 def get_scale(frame):