Migrate detector LUT to use config server

src/mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 
 import bluesky.plan_stubs as bps
+from daq_config_server.models.lookup_tables import DetectorXYLookupTable
+from dodal.common.beamlines.beamline_utils import get_config_client
 from dodal.devices.beamlines.i24.aperture import Aperture, AperturePositions
 from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
 from dodal.devices.beamlines.i24.beamstop import Beamstop, BeamstopPositions
@@ -10,7 +12,6 @@
 from dodal.devices.motors import YZStage
 from dodal.devices.util.lookup_tables import (
     linear_interpolation_lut,
-    parse_lookup_table,
 )
 
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
@@ -26,17 +27,19 @@ def compute_beam_center_position_from_lut(
     """Calculate the beam center position for the detector distance \
     using the values in the lookup table for the conversion.
     """
-    lut_values = parse_lookup_table(lut_path.as_posix())
+    lut_columns = (
+        get_config_client().get_file_contents(lut_path, DetectorXYLookupTable).columns
+    )
 
-    calc_x = linear_interpolation_lut(lut_values[0], lut_values[1])
+    calc_x = linear_interpolation_lut(lut_columns[0], lut_columns[1])
     beam_x_mm = calc_x(detector_distance_mm)
     beam_x = (
         beam_x_mm
         * det_size_constants.det_size_pixels.width
         / det_size_constants.det_dimension.width
     )
 
-    calc_y = linear_interpolation_lut(lut_values[0], lut_values[2])
+    calc_y = linear_interpolation_lut(lut_columns[0], lut_columns[2])
     beam_y_mm = calc_y(detector_distance_mm)
     beam_y = (
         beam_y_mm

tests/test_data/test_daq_configuration/lookup/test_det_dist_converter.txt

@@ -1,7 +1,7 @@
-#Table giving position of beam X and Y as a function of detector distance
-#Units mm mm mm
-# Eiger values
-# distance beamY beamX (values from mosflm)
-Units mm mm mm
-200 119.78 127.0
-1500 119.4 126.9
+{
+    "column_names": ["detector_distances_mm", "beam_centre_x_mm", "beam_centre_y_mm"],
+    "rows": [
+        [200.0, 119.78, 127.0],
+        [1500.0, 119.4, 126.9]
+    ]
+}

tests/test_data/test_det_dist_converter.txt

@@ -1,7 +1,7 @@
-#Table giving position of beam X and Y as a function of detector distance
-#Units mm mm mm
-# Eiger values
-# distance beamY beamX (values from mosflm)
-Units mm mm mm
-200 153.61 162.45
-500 153.57 159.96
+{
+    "column_names": ["detector_distances_mm", "beam_centre_x_mm", "beam_centre_y_mm"],
+    "rows": [
+        [200.0,  153.61, 162.45],
+        [500.0, 153.57, 159.96]
+    ]
+}

tests/test_data/test_lookup_table.txt

@@ -1,5 +1,6 @@
-# Beam converter lookup table for testing
-
-Units det_dist beam_x beam_y
-100.0 150.0 160.0
-200.0 151.0 165.0
+{
+    "rows": [
+        [100.0, 150.0, 160.0],
+        [200.0, 151.0, 165.0]
+    ]
+}