Merge pull request #483 from DiamondLightSource/zocalo-no-reverse

Zocalo no longer returns reversed coordinates
DiamondLightSource · Jan 25, 2023 · 2f55f39 · 2f55f39
2 parents 415c074 + e012ea9
commit 2f55f39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/artemis/external_interaction/unit_tests/test_zocalo_interaction.py b/src/artemis/external_interaction/unit_tests/test_zocalo_interaction.py
@@ -134,4 +134,4 @@ def test_when_message_recieved_from_zocalo_then_point_returned(
  return_value = future.result()
 
  assert type(return_value) == Point3D
- assert return_value == Point3D(*reversed(centre_of_mass_coords))
+ assert return_value == Point3D(*centre_of_mass_coords)
diff --git a/src/artemis/external_interaction/zocalo/zocalo_interaction.py b/src/artemis/external_interaction/zocalo/zocalo_interaction.py
@@ -99,7 +99,7 @@ def receive_result(
  transport.ack(header)
  received_group_id = recipe_parameters["dcgid"]
  if received_group_id == str(data_collection_group_id):
- result_received.put(Point3D(*reversed(message[0]["centre_of_mass"])))
+ result_received.put(Point3D(*message[0]["centre_of_mass"]))
  else:
  artemis.log.LOGGER.warning(
  f"Warning: results for {received_group_id} received but expected \