From b19c29174bb40480c97ab4827a16cf450d27b295 Mon Sep 17 00:00:00 2001 From: Phil Blowey Date: Wed, 21 Oct 2026 14:43:57 +0100 Subject: [PATCH 1/2] Unswap beam centre values --- src/dlstbx/wrapper/autoPROC.py | 5 ++--- src/dlstbx/wrapper/fast_dp.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/dlstbx/wrapper/autoPROC.py b/src/dlstbx/wrapper/autoPROC.py index 998a378d9..143e643a2 100644 --- a/src/dlstbx/wrapper/autoPROC.py +++ b/src/dlstbx/wrapper/autoPROC.py @@ -401,9 +401,8 @@ def send_results_to_ispyb( "rot_axis_x": int_result["rotationAxisX"], "rot_axis_y": int_result["rotationAxisY"], "rot_axis_z": int_result["rotationAxisZ"], - # autoPROC swaps X and Y compared to what we expect - "refined_xbeam": int_result["refinedYBeam"], - "refined_ybeam": int_result["refinedXBeam"], + "refined_xbeam": int_result["refinedXBeam"], + "refined_ybeam": int_result["refinedYBeam"], "refined_detector_dist": int_result["refinedDetectorDistance"], } diff --git a/src/dlstbx/wrapper/fast_dp.py b/src/dlstbx/wrapper/fast_dp.py index cc07a5d22..cfedab15c 100644 --- a/src/dlstbx/wrapper/fast_dp.py +++ b/src/dlstbx/wrapper/fast_dp.py @@ -71,8 +71,8 @@ def send_results_to_ispyb(self, z, xtriage_results=None): "cell_alpha": z["unit_cell"][3], "cell_beta": z["unit_cell"][4], "cell_gamma": z["unit_cell"][5], - "refined_xbeam": z["refined_beam"][0], - "refined_ybeam": z["refined_beam"][1], + "refined_xbeam": z["refined_beam"][1], + "refined_ybeam": z["refined_beam"][0], } ispyb_command_list.append(integration) From a602ad4564c0ab48707b4ae8b50d6d01fdb555e5 Mon Sep 17 00:00:00 2001 From: Phil Blowey Date: Wed, 21 Oct 2026 15:34:54 +0100 Subject: [PATCH 2/2] Add comment --- src/dlstbx/wrapper/fast_dp.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dlstbx/wrapper/fast_dp.py b/src/dlstbx/wrapper/fast_dp.py index cfedab15c..15216cda1 100644 --- a/src/dlstbx/wrapper/fast_dp.py +++ b/src/dlstbx/wrapper/fast_dp.py @@ -71,6 +71,7 @@ def send_results_to_ispyb(self, z, xtriage_results=None): "cell_alpha": z["unit_cell"][3], "cell_beta": z["unit_cell"][4], "cell_gamma": z["unit_cell"][5], + # fast_dp refined_beam is in (y, x) order. "refined_xbeam": z["refined_beam"][1], "refined_ybeam": z["refined_beam"][0], }