fix: consider both scan rotation and stage rotation

delmic · Mar 1, 2024 · 35f67ca · 35f67ca
1 parent 018cab4
commit 35f67ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/odemis/dataio/test/tiff_test.py b/src/odemis/dataio/test/tiff_test.py
@@ -2369,7 +2369,7 @@ def test_convert_thermo_fisher_to_odemis_metadata(self):
             model.MD_PIXEL_SIZE: (2.69792e-07, 2.69792e-07),
             model.MD_DWELL_TIME: 1e-6,
             model.MD_POS: (0.000133417, -0.000717625),
-            model.MD_ROTATION: 0.0,
+            model.MD_ROTATION: 0.0 + numpy.pi,
             model.MD_EBEAM_VOLTAGE: 2000.0,
             model.MD_EBEAM_CURRENT: 1.41708e-11,
             model.MD_EBEAM_SPOT_DIAM: 5.181,

diff --git a/src/odemis/dataio/tiff.py b/src/odemis/dataio/tiff.py
@@ -2743,7 +2743,7 @@ def _convert_thermo_fisher_to_odemis_metadata(metadata: str) -> dict:
     try:
         # beam metadata
         beam_type = tfs_md["Beam"]["beam"]
-        md[model.MD_ROTATION] = float(tfs_md[beam_type]["scanrotation"])
+        md[model.MD_ROTATION] = float(tfs_md[beam_type]["scanrotation"]) + float(tfs_md["Stage"]["rotation"])
         md[model.MD_EBEAM_VOLTAGE] = float(tfs_md[beam_type]["hv"])
         md[model.MD_EBEAM_CURRENT] = float(tfs_md[beam_type]["beamcurrent"])