mx-bluesky 1.4.2__py3-none-any.whl → 1.4.4__py3-none-any.whl

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/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/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/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/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/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/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/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/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)
 

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

@@ -10,20 +10,7 @@ schematics corresponds to soft_in_2 in the code.
 """
 
 import bluesky.plan_stubs as bps
-from dodal.devices.zebra import (
-    AND3,
-    AND4,
-    DISCONNECT,
-    IN1_TTL,
-    IN3_TTL,
-    OR1,
-    PC_ARM,
-    PC_GATE,
-    PC_PULSE,
-    PULSE1,
-    PULSE2,
-    SOFT_IN2,
-    SOFT_IN3,
+from dodal.devices.zebra.zebra import (
     ArmDemand,
     ArmSource,
     I24Axes,
@@ -131,7 +118,9 @@ def setup_zebra_for_quickshot_plan(
     yield from bps.abs_set(zebra.pc.gate_start, GATE_START, group=group)
     yield from bps.abs_set(zebra.pc.gate_width, gate_width, group=group)
 
-    yield from bps.abs_set(zebra.pc.gate_input, SOFT_IN2, group=group)
+    yield from bps.abs_set(
+        zebra.pc.gate_input, zebra.mapping.sources.SOFT_IN2, group=group
+    )
     yield from bps.sleep(0.1)
 
     if wait:
@@ -144,17 +133,25 @@ def set_logic_gates_for_porto_triggering(
 ):
     # To OUT2_TTL
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[3].sources[1], SOFT_IN2, group=group
+        zebra.logic_gates.and_gates[3].sources[1],
+        zebra.mapping.sources.SOFT_IN2,
+        group=group,
     )
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[3].sources[2], PULSE1, group=group
+        zebra.logic_gates.and_gates[3].sources[2],
+        zebra.mapping.sources.PULSE1,
+        group=group,
     )
     # To OUT1_TTL
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[4].sources[1], SOFT_IN2, group=group
+        zebra.logic_gates.and_gates[4].sources[1],
+        zebra.mapping.sources.SOFT_IN2,
+        group=group,
     )
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[4].sources[2], PULSE2, group=group
+        zebra.logic_gates.and_gates[4].sources[2],
+        zebra.mapping.sources.PULSE2,
+        group=group,
     )
     yield from bps.wait(group=group)
 
@@ -215,10 +212,16 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
     # Set TTL out depending on detector type
     DET_TTL = TTL_EIGER if det_type == "eiger" else TTL_PILATUS
     LASER_TTL = TTL_PILATUS if det_type == "eiger" else TTL_EIGER
-    yield from bps.abs_set(zebra.output.out_pvs[DET_TTL], AND4, group=group)
-    yield from bps.abs_set(zebra.output.out_pvs[LASER_TTL], AND3, group=group)
+    yield from bps.abs_set(
+        zebra.output.out_pvs[DET_TTL], zebra.mapping.sources.AND4, group=group
+    )
+    yield from bps.abs_set(
+        zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.AND3, group=group
+    )
 
-    yield from bps.abs_set(zebra.pc.gate_input, SOFT_IN2, group=group)
+    yield from bps.abs_set(
+        zebra.pc.gate_input, zebra.mapping.sources.SOFT_IN2, group=group
+    )
 
     assert pump_exp and pump_delay, "Must supply pump_exp and pump_delay!"
     gate_width, gate_step = get_zebra_settings_for_extruder(
@@ -242,7 +245,9 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
     SSX_LOGGER.info(
         f"Pulse1 starting at {pulse1_delay} with width set to laser dwell {pump_exp}."
     )
-    yield from bps.abs_set(zebra.output.pulse_1.input, PC_GATE, group=group)
+    yield from bps.abs_set(
+        zebra.output.pulse_1.input, zebra.mapping.sources.PC_GATE, group=group
+    )
     yield from bps.abs_set(zebra.output.pulse_1.delay, pulse1_delay, group=group)
     yield from bps.abs_set(zebra.output.pulse_1.width, pump_exp, group=group)
     SSX_LOGGER.info(
@@ -251,7 +256,9 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
         exposure time {exp_time}.
         """
     )
-    yield from bps.abs_set(zebra.output.pulse_2.input, PC_GATE, group=group)
+    yield from bps.abs_set(
+        zebra.output.pulse_2.input, zebra.mapping.sources.PC_GATE, group=group
+    )
     yield from bps.abs_set(zebra.output.pulse_2.delay, pump_delay, group=group)
     yield from bps.abs_set(zebra.output.pulse_2.width, exp_time, group=group)
 
@@ -308,20 +315,30 @@ def setup_zebra_for_fastchip_plan(
 
     # Logic Gates
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[3].sources[1], SOFT_IN2, group=group
+        zebra.logic_gates.and_gates[3].sources[1],
+        zebra.mapping.sources.SOFT_IN2,
+        group=group,
     )
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[3].sources[2], PC_PULSE, group=group
+        zebra.logic_gates.and_gates[3].sources[2],
+        zebra.mapping.sources.PC_PULSE,
+        group=group,
     )
 
-    yield from bps.abs_set(zebra.pc.gate_input, IN3_TTL, group=group)
+    yield from bps.abs_set(
+        zebra.pc.gate_input, zebra.mapping.sources.IN3_TTL, group=group
+    )
 
     # Set TTL out depending on detector type
     # And calculate some of the other settings
     if det_type == "eiger":
-        yield from bps.abs_set(zebra.output.out_pvs[TTL_EIGER], AND3, group=group)
+        yield from bps.abs_set(
+            zebra.output.out_pvs[TTL_EIGER], zebra.mapping.sources.AND3, group=group
+        )
     if det_type == "pilatus":
-        yield from bps.abs_set(zebra.output.out_pvs[TTL_PILATUS], AND3, group=group)
+        yield from bps.abs_set(
+            zebra.output.out_pvs[TTL_PILATUS], zebra.mapping.sources.AND3, group=group
+        )
 
     # Square wave - needs a small drop to make it work for eiger
     pulse_width = exposure_time - 0.0001 if det_type == "eiger" else exposure_time / 2
@@ -374,13 +391,19 @@ def open_fast_shutter_at_each_position_plan(
     )
     SSX_LOGGER.debug("Controlling the fast shutter on PULSE2.")
     # Output panel pulse_2 settings
-    yield from bps.abs_set(zebra.output.pulse_2.input, PC_GATE, group=group)
+    yield from bps.abs_set(
+        zebra.output.pulse_2.input, zebra.mapping.sources.PC_GATE, group=group
+    )
     yield from bps.abs_set(zebra.output.pulse_2.delay, 0.0, group=group)
     pulse2_width = num_exposures * exposure_time + SHUTTER_OPEN_TIME
     yield from bps.abs_set(zebra.output.pulse_2.width, pulse2_width, group=group)
 
     # Fast shutter
-    yield from bps.abs_set(zebra.output.out_pvs[TTL_FAST_SHUTTER], PULSE2, group=group)
+    yield from bps.abs_set(
+        zebra.output.out_pvs[TTL_FAST_SHUTTER],
+        zebra.mapping.sources.PULSE2,
+        group=group,
+    )
 
     if wait:
         yield from bps.wait(group=group)
@@ -396,12 +419,22 @@ def reset_pc_gate_and_pulse(zebra: Zebra, group: str = "reset_pc"):
 
 def reset_output_panel(zebra: Zebra, group: str = "reset_zebra_outputs"):
     # Reset TTL out
-    yield from bps.abs_set(zebra.output.out_pvs[2], PC_GATE, group=group)
-    yield from bps.abs_set(zebra.output.out_pvs[3], DISCONNECT, group=group)
-    yield from bps.abs_set(zebra.output.out_pvs[4], OR1, group=group)
+    yield from bps.abs_set(
+        zebra.output.out_pvs[2], zebra.mapping.sources.PC_GATE, group=group
+    )
+    yield from bps.abs_set(
+        zebra.output.out_pvs[3], zebra.mapping.sources.DISCONNECT, group=group
+    )
+    yield from bps.abs_set(
+        zebra.output.out_pvs[4], zebra.mapping.sources.OR1, group=group
+    )
 
-    yield from bps.abs_set(zebra.output.pulse_1.input, DISCONNECT, group=group)
-    yield from bps.abs_set(zebra.output.pulse_2.input, DISCONNECT, group=group)
+    yield from bps.abs_set(
+        zebra.output.pulse_1.input, zebra.mapping.sources.DISCONNECT, group=group
+    )
+    yield from bps.abs_set(
+        zebra.output.pulse_2.input, zebra.mapping.sources.DISCONNECT, group=group
+    )
 
     yield from bps.wait(group=group)
 
@@ -418,16 +451,24 @@ def zebra_return_to_normal_plan(
     # Reset PC_GATE and PC_SOURCE to "Position"
     yield from setup_pc_sources(zebra, TrigSource.POSITION, TrigSource.POSITION)
 
-    yield from bps.abs_set(zebra.pc.gate_input, SOFT_IN3, group=group)
+    yield from bps.abs_set(
+        zebra.pc.gate_input, zebra.mapping.sources.SOFT_IN3, group=group
+    )
     yield from bps.abs_set(zebra.pc.num_gates, 1, group=group)
-    yield from bps.abs_set(zebra.pc.pulse_input, DISCONNECT, group=group)
+    yield from bps.abs_set(
+        zebra.pc.pulse_input, zebra.mapping.sources.DISCONNECT, group=group
+    )
 
     # Logic Gates
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[3].sources[1], PC_ARM, group=group
+        zebra.logic_gates.and_gates[3].sources[1],
+        zebra.mapping.sources.PC_ARM,
+        group=group,
     )
     yield from bps.abs_set(
-        zebra.logic_gates.and_gates[3].sources[2], IN1_TTL, group=group
+        zebra.logic_gates.and_gates[3].sources[2],
+        zebra.mapping.sources.IN1_TTL,
+        group=group,
     )
 
     # Reset TTL out

mx_bluesky/{hyperion/external_interaction/callbacks → common/external_interaction/callbacks/common}/aperture_change_callback.py

@@ -1,7 +1,7 @@
 from bluesky.callbacks import CallbackBase
 from event_model.documents.run_start import RunStart
 
-from mx_bluesky.hyperion.log import LOGGER
+from mx_bluesky.common.utils.log import LOGGER
 
 from .logging_callback import format_doc_for_log
 

mx_bluesky/{hyperion/external_interaction/callbacks → common/external_interaction/callbacks/common}/grid_detection_callback.py

@@ -5,10 +5,28 @@ from bluesky.callbacks import CallbackBase
 from dodal.devices.oav.utils import calculate_x_y_z_of_pixel
 from event_model.documents import Event
 
-from mx_bluesky.hyperion.log import LOGGER
+from mx_bluesky.common.utils.log import LOGGER
 
 
 class GridParamUpdate(TypedDict):
+    """
+    Grid parameters extracted from the grid detection.
+    Positions are in motor-space.
+
+    Attributes:
+        x_start_um: x position of the centre of the first xy-gridscan box in microns
+        y_start_um: y position of the centre of the first xy-gridscan box in microns
+        y2_start_um: y position of the centre of the first xz-gridscan box in microns
+        z_start_um: z position of the centre of the first xy-gridscan box in microns
+        z2_start_um: z position of the centre of the first xz-gridscan box in microns
+        x_steps: Number of grid boxes in x-direction for xy- and xz- gridscans
+        y_steps: Number of grid boxes in y-direction for xy-gridscan
+        z_steps: Number of grid boxes in z-direction for xz-gridscan
+        x_step_size_um: x-dimension of the grid box
+        y_step_size_um: y-dimension of the grid box
+        z_step_size_um: z-dimension of the grid box
+    """
+
     x_start_um: float
     y_start_um: float
     y2_start_um: float