Merge pull request #156 from fmi-faim/none-wavelength

None wavelength
fmi-faim · Jul 3, 2024 · f08b4a9 · f08b4a9
2 parents 1d64e04 + af5c816
commit f08b4a9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/faim_ipa/visiview/ome_companion_utils.py b/src/faim_ipa/visiview/ome_companion_utils.py
@@ -106,7 +106,7 @@ def get_channels(metadata: lxml.etree.ElementTree) -> dict[str, ChannelMetadata]
             wavelength = int(channel["EmissionWavelength"])
             display_color = rgb_to_hex(*wavelength_to_rgb(wavelength))
         else:
-            wavelength = channel["Name"]
+            wavelength = None
             display_color = "#ffffff"
         ch_metadata[f"w{idx+1}"] = ChannelMetadata(
             channel_index=idx,
@@ -152,9 +152,9 @@ def get_stage_positions(
             y_pos = float(stage_label["Y"])
             x_pos = float(stage_label["X"])
             positions[str(i + 1)] = (y_pos, x_pos)
-        except StopIteration:
-            # No stage positions
-            pass
+        except (StopIteration, KeyError):
+            # No stage positions in metadata
+            positions[str(i + 1)] = (0, 0)
 
     return positions
 

diff --git a/tests/detection/__init__.py b/tests/detection/__init__.py
diff --git a/tests/detection/test_utils.py → tests/detection/test_detection_utils.py b/tests/detection/test_utils.py → tests/detection/test_detection_utils.py