mx-bluesky 1.4.2__tar.gz → 1.4.4__tar.gz

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/.gitignore

@@ -172,3 +172,6 @@ edm_serial/
 **/parameters/fixed_target/*/*.map
 # idea project files
 .idea/
+
+# Generated PlantUML diagrams
+docs/developer/hyperion/reference/param_hierarchy.puml

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mx-bluesky
-Version: 1.4.2
+Version: 1.4.4
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -226,7 +226,7 @@ Requires-Dist: opencv-python
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp
 Requires-Dist: pydantic
-Requires-Dist: pydantic-extra-types
+Requires-Dist: pydantic-extra-types>=2.10.1
 Requires-Dist: pyepics
 Requires-Dist: pyzmq
 Requires-Dist: requests
@@ -238,8 +238,8 @@ Requires-Dist: blueapi>=0.5.0
 Requires-Dist: daq-config-server>=0.1.1
 Requires-Dist: ophyd==1.9.0
 Requires-Dist: ophyd-async>=0.8a5
-Requires-Dist: bluesky>=1.13.0a4
-Requires-Dist: dls-dodal==1.36.3
+Requires-Dist: bluesky>=1.13
+Requires-Dist: dls-dodal==1.39.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"
@@ -250,6 +250,7 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
+Requires-Dist: plantweb; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
 Requires-Dist: pyright; extra == "dev"
@@ -260,7 +261,6 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: sphinx-autobuild; extra == "dev"
 Requires-Dist: sphinx-copybutton; extra == "dev"
-Requires-Dist: sphinxcontrib-plantuml; extra == "dev"
 Requires-Dist: sphinx-design; extra == "dev"
 Requires-Dist: tox-direct; extra == "dev"
 Requires-Dist: tox; extra == "dev"

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/docs/conf.py

@@ -49,6 +49,8 @@ extensions = [
     "sphinx_design",
     # For markdown
     "myst_parser",
+    # For plantUML diagrams
+    "plantweb.directive",
 ]
 
 myst_enable_extensions = [

mx_bluesky-1.4.4/docs/developer/hyperion/reference/gridscan.puml

@@ -0,0 +1,109 @@
+@startuml
+title Gridscan Parameter Relationships
+
+class DiffractionExperiment
+class DiffractionExperimentWithSample
+class GridCommon {
+    grid_width_um
+    exposure_time_s
+}
+class GridScanWithEdgeDetect {
+    box_size_um
+}
+class HyperionGridCommon {
+    enable_dev_shm
+}
+class HyperionThreeDGridScan {
+    x_step_size_um
+    y_step_size_um
+    z_step_size_um
+    y2_start_um
+    z2_start_um
+    --
+    grid_1_spec
+    grid_2_spec
+    scan_indices
+    scan_spec
+    scan_points
+    scan_points_first_grid
+    scan_points_second_grid
+    num_images
+    FGS_Params
+    panda_FGS_Params
+}
+class MxBlueSkyParameters
+class SpecifiedGrid
+class XyzStarts {
+    x_start_um
+    y_start_um
+    z_start_um
+}
+class OptionalXYZStarts {
+    x_start_um
+    y_start_um
+    z_start_um
+}
+class RotationScanPerSweep
+
+MxBlueSkyParameters <|-- DiffractionExperiment
+DiffractionExperiment <|-- DiffractionExperimentWithSample
+DiffractionExperimentWithSample <|-- GridCommon
+GridCommon <|-- GridScanWithEdgeDetect
+GridCommon <|-- HyperionGridCommon
+HyperionGridCommon <|-- HyperionThreeDGridScan
+SpecifiedGrid <|-- HyperionThreeDGridScan
+XyzStarts <|-- SpecifiedGrid
+OptionalXYZStarts <|-- RotationScanPerSweep
+class GridParamUpdate {
+    x_start_um
+    y_start_um
+    y2_start_um
+    z_start_um
+    z2_start_um
+    x_steps
+    y_steps
+    z_steps
+    x_step_size_um
+    y_step_size_um
+    z_step_size_um
+}
+
+class GridDetectionCallback {
+    get_grid_parameters() -> GridParamUpdate
+}
+    
+GridDetectionCallback --> GridParamUpdate : generates from event. Adds 0.5 to get box-centres
+GridParamUpdate --> HyperionThreeDGridScan : combines with GridScanWithEdgeDetect
+
+class experiment_plans {
+    grid_detect_then_xray_centre()
+    flyscan_xray_centre_no_move()
+    create_parameters_for_flyscan_xray_centre(GridScanWithEdgeDetect, GridParamUpdate) -> HyperionThreeDGridScan
+}
+
+class AbstractExperimentBase
+class AbstractExperimentWithBeamParams
+class GridScanParamsCommon {
+    x_steps
+    y_steps
+    z_steps
+    x_step_size_mm
+    y_step_size_mm
+    z_step_size_mm
+    x_start_mm
+    y1_start_mm
+    y2_start_mm
+    z1_start_mm
+    z2_start_mm
+}
+class PandAGridScanParams
+class ZebraGridScanParams
+
+AbstractExperimentBase <|-- AbstractExperimentWithBeamParams
+AbstractExperimentWithBeamParams <|-- GridScanParamsCommon
+GridScanParamsCommon <|-- PandAGridScanParams
+GridScanParamsCommon <|-- ZebraGridScanParams
+
+HyperionThreeDGridScan --> ZebraGridScanParams : generates
+HyperionThreeDGridScan --> PandAGridScanParams : generates
+@enduml

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/docs/developer/hyperion/reference/param-hierarchy.rst

@@ -1,4 +1,4 @@
 Hyperion Parameter class hierarchy
 ==================================
 
-TODO: automate including the param hierarchy here
+.. uml:: param_hierarchy.puml

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/pyproject.toml

@@ -25,11 +25,11 @@ dependencies = [
     "matplotlib",
     "nexgen",
     "numpy",
-    "opencv-python",               # Needed for I24 ssx moveonclick. To be changed to headless once this is moved to separate ui.
+    "opencv-python",                  # Needed for I24 ssx moveonclick. To be changed to headless once this is moved to separate ui.
     "opentelemetry-distro",
     "opentelemetry-exporter-otlp",
     "pydantic",
-    "pydantic-extra-types",
+    "pydantic-extra-types >= 2.10.1",
     "pyepics",
     "pyzmq",
     "requests",
@@ -45,8 +45,8 @@ dependencies = [
     "daq-config-server >= 0.1.1",
     "ophyd == 1.9.0",
     "ophyd-async >= 0.8a5",
-    "bluesky >= 1.13.0a4",
-    "dls-dodal == 1.36.3",
+    "bluesky >= 1.13",
+    "dls-dodal == 1.39.0",
 ]
 
 
@@ -68,6 +68,7 @@ dev = [
     "mypy",
     "myst-parser",
     "pipdeptree",
+    "plantweb",
     "pre-commit",
     "pydata-sphinx-theme>=0.12",
     "pyright",
@@ -78,7 +79,6 @@ dev = [
     "ruff",
     "sphinx-autobuild",
     "sphinx-copybutton",
-    "sphinxcontrib-plantuml",
     "sphinx-design",
     "tox-direct",
     "tox",
@@ -180,6 +180,9 @@ commands =
     type-checking: pyright src tests {posargs}
     tests: pytest --cov=mx_bluesky --cov-report term --cov-report xml:cov.xml {posargs}
     docs: sphinx-{posargs:build -EW --keep-going} -T docs build/html
+commands_pre =
+    docs: /usr/bin/bash -c "{toxinidir}/utility_scripts/generate_plantuml.py > \
+        docs/developer/hyperion/reference/param_hierarchy.puml"
 """
 
 [tool.ruff]

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.2'
-__version_tuple__ = version_tuple = (1, 4, 2)
+__version__ = version = '1.4.4'
+__version_tuple__ = version_tuple = (1, 4, 4)

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/dcid.py

@@ -4,7 +4,6 @@ import math
 import os
 import subprocess
 from functools import lru_cache
-from typing import Literal
 
 import bluesky.plan_stubs as bps
 import requests
@@ -18,6 +17,7 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import PumpProbeSetti
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
 from mx_bluesky.beamlines.i24.serial.parameters import (
     BeamSettings,
+    DetectorName,
     ExtruderParameters,
     FixedTargetParameters,
 )
@@ -50,7 +50,7 @@ def read_beam_info_from_hardware(
     dcm: DCM,
     mirrors: FocusMirrorsMode,
     beam_center: DetectorBeamCenter,
-    detector_name: Literal["eiger", "pilatus"],
+    detector_name: DetectorName,
 ):
     """ Read the beam information from hardware.
 
@@ -59,7 +59,7 @@ def read_beam_info_from_hardware(
         mirrors (FocusMirrorMode): The device describing the focus mirror mode settings.
         beam_center (DetectorBeamCenter): A device to set and read the beam center on \
             the detector.
-        detector_name (Literal["eiger", "pilatus"]): The detector currently in use.
+        detector_name (DetectorName): The detector currently in use.
 
     Returns:
         BeamSettings parameter model.

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py

@@ -16,7 +16,7 @@ import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.attenuator import ReadOnlyAttenuator
+from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
 from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
 from dodal.devices.i24.aperture import Aperture
 from dodal.devices.i24.beam_center import DetectorBeamCenter
@@ -25,7 +25,7 @@ from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
-from dodal.devices.zebra import DISCONNECT, SOFT_IN3, Zebra
+from dodal.devices.zebra.zebra import Zebra
 
 from mx_bluesky.beamlines.i24.serial.dcid import (
     DCID,
@@ -38,6 +38,7 @@ from mx_bluesky.beamlines.i24.serial.log import (
     log_on_entry,
 )
 from mx_bluesky.beamlines.i24.serial.parameters import ExtruderParameters
+from mx_bluesky.beamlines.i24.serial.parameters.constants import BEAM_CENTER_LUT_FILES
 from mx_bluesky.beamlines.i24.serial.setup_beamline import Pilatus, caget, caput, pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline import setup_beamline as sup
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
@@ -46,8 +47,6 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
 )
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_zebra_plans import (
     GATE_START,
-    TTL_EIGER,
-    TTL_PILATUS,
     arm_zebra,
     disarm_zebra,
     open_fast_shutter,
@@ -115,13 +114,22 @@ def laser_check(
 
     det_type = yield from get_detector_type(detector_stage)
 
-    LASER_TTL = TTL_EIGER if isinstance(det_type, Pilatus) else TTL_PILATUS
+    LASER_TTL = (
+        zebra.mapping.outputs.TTL_EIGER
+        if isinstance(det_type, Pilatus)
+        else zebra.mapping.outputs.TTL_PILATUS
+    )
+
     if mode == "laseron":
-        yield from bps.abs_set(zebra.output.out_pvs[LASER_TTL], SOFT_IN3)
+        yield from bps.abs_set(
+            zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.SOFT_IN3
+        )
         yield from set_shutter_mode(zebra, "auto")
 
     if mode == "laseroff":
-        yield from bps.abs_set(zebra.output.out_pvs[LASER_TTL], DISCONNECT)
+        yield from bps.abs_set(
+            zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.DISCONNECT
+        )
         yield from set_shutter_mode(zebra, "manual")
 
 
@@ -206,8 +214,14 @@ def main_extruder_plan(
     dcid: DCID,
     start_time: datetime,
 ) -> MsgGenerator:
+    beam_center_pixels = sup.compute_beam_center_position_from_lut(
+        BEAM_CENTER_LUT_FILES[parameters.detector_name],
+        parameters.detector_distance_mm,
+        parameters.detector_size_constants,
+    )
     yield from sup.set_detector_beam_center_plan(
-        beam_center_device, parameters.detector_name
+        beam_center_device,
+        beam_center_pixels,
     )
 
     # Setting up the beamline
@@ -281,7 +295,6 @@ def main_extruder_plan(
         SSX_LOGGER.info("Using Eiger detector")
 
         SSX_LOGGER.debug(f"Creating the directory for the collection in {filepath}.")
-        Path(filepath).mkdir(parents=True, exist_ok=True)
 
         caput(pv.eiger_seqID, int(caget(pv.eiger_seqID)) + 1)
         SSX_LOGGER.info(f"Eiger quickshot setup: filepath {filepath}")
@@ -488,6 +501,8 @@ def run_extruder_plan(
     parameters: ExtruderParameters = yield from read_parameters(
         detector_stage, attenuator
     )
+    # Create collection directory
+    parameters.collection_directory.mkdir(parents=True, exist_ok=True)
 
     beam_center_device = sup.get_beam_center_device(parameters.detector_name)
 

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py

@@ -10,7 +10,7 @@ import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.attenuator import ReadOnlyAttenuator
+from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
 from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
 from dodal.devices.i24.aperture import Aperture
 from dodal.devices.i24.beam_center import DetectorBeamCenter
@@ -20,7 +20,7 @@ from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pmac import PMAC
-from dodal.devices.zebra import Zebra
+from dodal.devices.zebra.zebra import Zebra
 
 from mx_bluesky.beamlines.i24.serial.dcid import (
     DCID,
@@ -38,6 +38,7 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 impo
 )
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
 from mx_bluesky.beamlines.i24.serial.parameters import FixedTargetParameters
+from mx_bluesky.beamlines.i24.serial.parameters.constants import BEAM_CENTER_LUT_FILES
 from mx_bluesky.beamlines.i24.serial.setup_beamline import caget, cagetstring, caput, pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline import setup_beamline as sup
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_zebra_plans import (
@@ -410,7 +411,6 @@ def start_i24(
         SSX_LOGGER.info("Using Eiger detector")
 
         SSX_LOGGER.debug(f"Creating the directory for the collection in {filepath}.")
-        Path(filepath).mkdir(parents=True, exist_ok=True)
 
         SSX_LOGGER.info(f"Triggered Eiger setup: filepath {filepath}")
         SSX_LOGGER.info(f"Triggered Eiger setup: filename {filename}")
@@ -547,8 +547,14 @@ def main_fixed_target_plan(
 ) -> MsgGenerator:
     SSX_LOGGER.info("Running a chip collection on I24")
 
+    beam_center_pixels = sup.compute_beam_center_position_from_lut(
+        BEAM_CENTER_LUT_FILES[parameters.detector_name],
+        parameters.detector_distance_mm,
+        parameters.detector_size_constants,
+    )
     yield from sup.set_detector_beam_center_plan(
-        beam_center_device, parameters.detector_name
+        beam_center_device,
+        beam_center_pixels,
     )
 
     SSX_LOGGER.info("Getting Program Dictionary")
@@ -697,6 +703,9 @@ def run_fixed_target_plan(
         detector_stage, attenuator
     )
 
+    # Create collection directory
+    parameters.collection_directory.mkdir(parents=True, exist_ok=True)
+
     if parameters.chip_map:
         upload_chip_map_to_geobrick(pmac, parameters.chip_map)
 

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -15,7 +15,7 @@ import bluesky.plan_stubs as bps
 import numpy as np
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.attenuator import ReadOnlyAttenuator
+from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
 from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/parameters/__init__.py

@@ -1,4 +1,4 @@
-from mx_bluesky.beamlines.i24.serial.parameters.constants import SSXType
+from mx_bluesky.beamlines.i24.serial.parameters.constants import DetectorName, SSXType
 from mx_bluesky.beamlines.i24.serial.parameters.experiment_parameters import (
     BeamSettings,
     ChipDescription,
@@ -13,6 +13,7 @@ from mx_bluesky.beamlines.i24.serial.parameters.utils import (
 
 __all__ = [
     "SSXType",
+    "DetectorName",
     "BeamSettings",
     "ExtruderParameters",
     "ChipDescription",

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/parameters/constants.py

@@ -1,18 +1,26 @@
-from enum import Enum
+from enum import StrEnum
 from os import environ
 from pathlib import Path
 
 from mx_bluesky.beamlines.i24.serial.log import _read_visit_directory_from_file
 
 
-class SSXType(Enum):
+class SSXType(StrEnum):
     FIXED = "Serial Fixed"
     EXTRUDER = "Serial Jet"
 
 
-BEAM_CENTER_POS: dict[str, list] = {
-    "eiger": [1600.0, 1697.4],
-    "pilatus": [1284.7, 1308.6],
+class DetectorName(StrEnum):
+    EIGER = "eiger"
+    PILATUS = "pilatus"
+
+
+# TODO figue sth out for tests
+LUT_FILES_PATH = Path("/dls_sw/i24/software/daq_configuration/lookup")
+
+BEAM_CENTER_LUT_FILES = {
+    DetectorName.EIGER: LUT_FILES_PATH / "DetDistToBeamXYConverterE9M.txt",
+    DetectorName.PILATUS: LUT_FILES_PATH / "DetDistToBeamXYConverterP6M.txt",
 }
 
 

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py

@@ -1,9 +1,13 @@
 import json
 from abc import abstractmethod
 from pathlib import Path
-from typing import Literal
 
 import numpy as np
+from dodal.devices.detector.det_dim_constants import (
+    EIGER2_X_9M_SIZE,
+    PILATUS_6M_SIZE,
+    DetectorSizeConstants,
+)
 from pydantic import BaseModel, ConfigDict, computed_field, field_validator
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
@@ -11,7 +15,10 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     MappingType,
     PumpProbeSetting,
 )
-from mx_bluesky.beamlines.i24.serial.parameters.constants import SSXType
+from mx_bluesky.beamlines.i24.serial.parameters.constants import (
+    DetectorName,
+    SSXType,
+)
 
 
 class SerialExperiment(BaseModel):
@@ -22,7 +29,7 @@ class SerialExperiment(BaseModel):
     filename: str
     exposure_time_s: float
     detector_distance_mm: float
-    detector_name: Literal["eiger", "pilatus"]
+    detector_name: DetectorName
     transmission: float
 
     @field_validator("visit", mode="before")
@@ -34,7 +41,16 @@ class SerialExperiment(BaseModel):
 
     @property
     def collection_directory(self) -> Path:
-        return Path(self.visit) / self.directory
+        directory = Path(self.visit) / self.directory
+        return directory
+
+    @property
+    def detector_size_constants(self) -> DetectorSizeConstants:
+        return (
+            EIGER2_X_9M_SIZE
+            if self.detector_name is DetectorName.EIGER
+            else PILATUS_6M_SIZE
+        )
 
 
 class LaserExperiment(BaseModel):

{mx_bluesky-1.4.2 → mx_bluesky-1.4.4}/src/mx_bluesky/beamlines/i24/serial/setup_beamline/setup_beamline.py

@@ -1,15 +1,20 @@
+from pathlib import Path
 from time import sleep
 
 import bluesky.plan_stubs as bps
 from dodal.beamlines import i24
+from dodal.devices.detector.det_dim_constants import DetectorSizeConstants
 from dodal.devices.i24.aperture import Aperture, AperturePositions
 from dodal.devices.i24.beam_center import DetectorBeamCenter
 from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
+from dodal.devices.util.lookup_tables import (
+    linear_interpolation_lut,
+    parse_lookup_table,
+)
 
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
-from mx_bluesky.beamlines.i24.serial.parameters.constants import BEAM_CENTER_POS
 from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caget, caput
 
@@ -21,6 +26,35 @@ def get_beam_center_device(detector_in_use: str) -> DetectorBeamCenter:
         return i24.pilatus_beam_center()
 
 
+def compute_beam_center_position_from_lut(
+    lut_path: Path,
+    detector_distance_mm: float,
+    det_size_constants: DetectorSizeConstants,
+) -> tuple[float, float]:
+    """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())
+
+    calc_x = linear_interpolation_lut(lut_values[0], lut_values[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])
+    beam_y_mm = calc_y(detector_distance_mm)
+    beam_y = (
+        beam_y_mm
+        * det_size_constants.det_size_pixels.height
+        / det_size_constants.det_dimension.height
+    )
+
+    return beam_x, beam_y
+
+
 def setup_beamline_for_collection_plan(
     aperture: Aperture,
     backlight: DualBacklight,
@@ -55,22 +89,17 @@ def move_detector_stage_to_position_plan(
 
 def set_detector_beam_center_plan(
     beam_center_device: DetectorBeamCenter,
-    detector_name: str,
+    beam_center_pixels: tuple[float, float],
     group: str = "set_beamcenter",
     wait: bool = True,
 ):
     """A small temporary plan to set up the beam center on the detector in use."""
     # NOTE This will be removed once the detectors are using ophyd_async devices
     # See https://github.com/DiamondLightSource/mx-bluesky/issues/62
-    SSX_LOGGER.debug(
-        f"Set beam center on {detector_name} detector: {BEAM_CENTER_POS[detector_name]}"
-    )
-    yield from bps.abs_set(
-        beam_center_device.beam_x, BEAM_CENTER_POS[detector_name][0], group=group
-    )
-    yield from bps.abs_set(
-        beam_center_device.beam_y, BEAM_CENTER_POS[detector_name][1], group=group
-    )
+    beam_position_x, beam_position_y = beam_center_pixels
+    SSX_LOGGER.info(f"Setting beam center to: {beam_position_x}, {beam_position_y}")
+    yield from bps.abs_set(beam_center_device.beam_x, beam_position_x, group=group)
+    yield from bps.abs_set(beam_center_device.beam_y, beam_position_y, group=group)
     if wait:
         yield from bps.wait(group=group)