Fix x & y switch in ROI tables

Co-authored-by: Jan Eglinger <jan.eglinger@fmi.ch>
fmi-faim · Nov 8, 2023 · 1461e91 · 1461e91
1 parent 692f88c
commit 1461e91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/faim_hcs/MontageUtils.py b/src/faim_hcs/MontageUtils.py
@@ -53,11 +53,11 @@ def montage_grid_image_YX(data):
         fov_rois.append(
             (
                 _stage_label(d[1]),
-                pos_y * step_y * d[1]["spatial-calibration-y"],
                 pos_x * step_x * d[1]["spatial-calibration-x"],
+                pos_y * step_y * d[1]["spatial-calibration-y"],
                 0.0,
-                step_y * d[1]["spatial-calibration-y"],
                 step_x * d[1]["spatial-calibration-x"],
+                step_y * d[1]["spatial-calibration-y"],
                 1.0,
             )
         )
@@ -159,11 +159,11 @@ def sort_key(d):
         fov_rois.append(
             (
                 _stage_label(d[1]),
-                pos_y * d[1]["spatial-calibration-y"],
                 pos_x * d[1]["spatial-calibration-x"],
+                pos_y * d[1]["spatial-calibration-y"],
                 0.0,
-                d[0].shape[0] * d[1]["spatial-calibration-y"],
                 d[0].shape[1] * d[1]["spatial-calibration-x"],
+                d[0].shape[0] * d[1]["spatial-calibration-y"],
                 1.0,
             )
         )

diff --git a/tests/test_MetaSeriesUtils.py b/tests/test_MetaSeriesUtils.py
@@ -104,7 +104,7 @@ def test_get_well_image_CYX_well_E07(files, roi_columns):
 
     assert list(roi_tables["FOV_ROI_table"].columns) == roi_columns
     assert len(roi_tables["FOV_ROI_table"]) == 2
-    target_values = [0.0, 699.8016, 0.0, 699.8016, 699.8016, 1.0]
+    target_values = [699.8016, 0.0, 0.0, 699.8016, 699.8016, 1.0]
     assert (
         roi_tables["FOV_ROI_table"].loc["Site 2"].values.flatten().tolist()
         == target_values
@@ -142,7 +142,7 @@ def test_get_well_image_ZCYX(files):
 
         assert list(roi_tables["FOV_ROI_table"].columns) == roi_columns
         assert len(roi_tables["FOV_ROI_table"]) == 2
-        target_values = [0.0, 699.8016, 0.0, 699.8016, 699.8016, z_len[well]]
+        target_values = [699.8016, 0.0, 0.0, 699.8016, 699.8016, z_len[well]]
         assert (
             roi_tables["FOV_ROI_table"].loc["Site 2"].values.flatten().tolist()
             == target_values

diff --git a/tests/test_Zarr.py b/tests/test_Zarr.py
@@ -245,9 +245,9 @@ def test_write_cyx_image_to_well(self):
         assert list(df_fov.columns) == roi_columns
         assert len(df_fov) == 2
         target_values = [
-            0.0,
             699.8015747070312,
             0.0,
+            0.0,
             699.8015747070312,
             699.8015747070312,
             1.0,
@@ -416,9 +416,9 @@ def test_write_czyx_image_to_well(self):
         assert list(df_fov.columns) == roi_columns
         assert len(df_fov) == 2
         target_values = [
-            0.0,
             699.8015747070312,
             0.0,
+            0.0,
             699.8015747070312,
             699.8015747070312,
             45.18000030517578,