(#1327) Response to PR comments

DiamondLightSource · Jun 20, 2024 · 33cc2ed · 33cc2ed
1 parent 15313f8
commit 33cc2ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py b/src/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py
@@ -107,7 +107,6 @@ def activity_gated_start(self, doc: RunStart):
     def populate_axis_info_for_snapshot(
         self, data_collection_info: DataCollectionInfo, omega_start: float | None
     ):
-        # TODO in subsequent PR which depends on rotation snapshots 349
         pass
 
     def populate_info_for_update(

diff --git a/src/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py b/src/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py
@@ -166,9 +166,10 @@ def populate_axis_info_for_snapshot(
         self, data_collection_info: DataCollectionInfo, omega_start: float | None
     ):
         if omega_start is not None:
-            data_collection_info.omega_start = omega_start
-            data_collection_info.axis_start = omega_start
-            data_collection_info.axis_end = omega_start
+            omega_in_gda_space = -omega_start
+            data_collection_info.omega_start = omega_in_gda_space
+            data_collection_info.axis_start = omega_in_gda_space
+            data_collection_info.axis_end = omega_in_gda_space
             data_collection_info.axis_range = 0
 
     def populate_info_for_update(

diff --git a/tests/system_tests/external_interaction/test_ispyb_dev_connection.py b/tests/system_tests/external_interaction/test_ispyb_dev_connection.py
@@ -662,10 +662,10 @@ def test_ispyb_deposition_in_gridscan(
     assert position_id is None
     DC_EXPECTED_VALUES.update(
         {
-            "axisstart": -90.0,
-            "axisend": -90.0,
+            "axisstart": 90.0,
+            "axisend": 90.0,
             "datacollectionnumber": 2,
-            "omegastart": -90.0,
+            "omegastart": 90.0,
             "filetemplate": "file_name_2_master.h5",
             "numberofimages": 220,
         }

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
@@ -218,9 +218,9 @@ def test_activity_gated_event_oav_snapshot_triggered(self, mock_ispyb_conn):
                 "comments": "Hyperion: Xray centring - Diffraction grid scan of 40 by 10 "
                 "images in 100.0 um by 120.0 um steps. Top left (px): [50,0], "
                 "bottom right (px): [3250,800].",
-                "axisstart": -90,
-                "omegastart": -90,
-                "axisend": -90,
+                "axisstart": 90,
+                "omegastart": 90,
+                "axisend": 90,
                 "axisrange": 0,
             },
         )