(#1283) Adjust x- and y- mpp so that they are different in tests. bum…

…p dodal hash
DiamondLightSource · Apr 12, 2024 · 6b8f472 · 6b8f472
1 parent 881d95d
commit 6b8f472
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -35,7 +35,7 @@ install_requires =
     xarray
     doct
     databroker
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@7068bf2f0e75f8fffa83693136cb555b03ce8545
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@00388e4f77e0ac88c7847c0fba7aec391f1fb9d6
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
     pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103

diff --git a/tests/unit_tests/external_interaction/callbacks/conftest.py b/tests/unit_tests/external_interaction/callbacks/conftest.py
@@ -160,7 +160,7 @@ class TestData:
             "oav_snapshot_num_boxes_x": 40,
             "oav_snapshot_num_boxes_y": 20,
             "oav_snapshot_microns_per_pixel_x": 1.25,
-            "oav_snapshot_microns_per_pixel_y": 1.25,
+            "oav_snapshot_microns_per_pixel_y": 1.5,
             "oav_snapshot_box_width": 0.1 * 1000 / 1.25,  # size in pixels
             "oav_snapshot_last_path_full_overlay": "test_1_y",
             "oav_snapshot_last_path_outer": "test_2_y",
@@ -179,7 +179,7 @@ class TestData:
             "oav_snapshot_num_boxes_x": 40,
             "oav_snapshot_num_boxes_y": 10,
             "oav_snapshot_microns_per_pixel_x": 1.25,
-            "oav_snapshot_microns_per_pixel_y": 1.25,
+            "oav_snapshot_microns_per_pixel_y": 1.5,
             "oav_snapshot_box_width": 0.1 * 1000 / 1.25,  # size in pixels
             "oav_snapshot_last_path_full_overlay": "test_1_z",
             "oav_snapshot_last_path_outer": "test_2_z",

diff --git a/tests/unit_tests/external_interaction/callbacks/xray_centre/test_ispyb_callback.py b/tests/unit_tests/external_interaction/callbacks/xray_centre/test_ispyb_callback.py
@@ -253,7 +253,7 @@ def test_activity_gated_event_oav_snapshot_triggered(self, mock_ispyb_conn):
                 "xtal_snapshot2": "test_2_y",
                 "xtal_snapshot3": "test_3_y",
                 "comments": "Hyperion: Xray centring - Diffraction grid scan of 40 by 20 "
-                "images in 100.0 um by 100.0 um steps. Top left (px): [50,100], "
+                "images in 100.0 um by 120.0 um steps. Top left (px): [50,100], "
                 "bottom right (px): [3250,1700].",
             },
         )
@@ -268,7 +268,7 @@ def test_activity_gated_event_oav_snapshot_triggered(self, mock_ispyb_conn):
                 "xtal_snapshot2": "test_2_z",
                 "xtal_snapshot3": "test_3_z",
                 "comments": "Hyperion: Xray centring - Diffraction grid scan of 40 by 10 "
-                "images in 100.0 um by 100.0 um steps. Top left (px): [50,0], "
+                "images in 100.0 um by 120.0 um steps. Top left (px): [50,0], "
                 "bottom right (px): [3250,800].",
             },
         )
@@ -278,11 +278,11 @@ def test_activity_gated_event_oav_snapshot_triggered(self, mock_ispyb_conn):
             {
                 "parentid": TEST_DATA_COLLECTION_IDS[0],
                 "dxinmm": 0.1,
-                "dyinmm": 0.1,
+                "dyinmm": 0.12,
                 "stepsx": 40,
                 "stepsy": 20,
                 "micronsperpixelx": 1.25,
-                "micronsperpixely": 1.25,
+                "micronsperpixely": 1.5,
                 "snapshotoffsetxpixel": 50,
                 "snapshotoffsetypixel": 100,
                 "orientation": "horizontal",
@@ -295,11 +295,11 @@ def test_activity_gated_event_oav_snapshot_triggered(self, mock_ispyb_conn):
             {
                 "parentid": TEST_DATA_COLLECTION_IDS[1],
                 "dxinmm": 0.1,
-                "dyinmm": 0.1,
+                "dyinmm": 0.12,
                 "stepsx": 40,
                 "stepsy": 10,
                 "micronsperpixelx": 1.25,
-                "micronsperpixely": 1.25,
+                "micronsperpixely": 1.5,
                 "snapshotoffsetxpixel": 50,
                 "snapshotoffsetypixel": 0,
                 "orientation": "horizontal",