From e012ea934f903268030572cfe7d8f643b1d4ea08 Mon Sep 17 00:00:00 2001 From: Richard Gildea Date: Mon, 23 Jan 2023 13:05:31 +0000 Subject: [PATCH] Zocalo no longer returns reversed coords See python-dlstbx#196 --- .../external_interaction/unit_tests/test_zocalo_interaction.py | 2 +- src/artemis/external_interaction/zocalo/zocalo_interaction.py | 2 +- 2 files changed, 2 insertions(+), 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 index ac1c6d9a0..74ecfe3cd 100644 --- 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 index 2b4eee46a..b644ee59a 100644 --- 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 \