mx-bluesky 1.5.15__py3-none-any.whl → 1.6.3__py3-none-any.whl

mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/do_darks.py

@@ -2,7 +2,7 @@ import bluesky.preprocessors as bpp
 from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
 from ophyd_async.fastcs.jungfrau import (
     AcquisitionType,
     GainMode,
@@ -13,7 +13,6 @@ from pydantic import PositiveInt
 
 from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils import (
     fly_jungfrau,
-    override_file_path,
 )
 from mx_bluesky.common.utils.log import LOGGER
 
@@ -25,8 +24,8 @@ def do_pedestal_darks(
     exp_time_s: float = 0.001,
     pedestal_frames: PositiveInt = 20,
     pedestal_loops: PositiveInt = 200,
+    filename: str = "pedestal_darks",
     jungfrau: CommissioningJungfrau = inject("jungfrau"),
-    path_of_output_file: str | None = None,
 ) -> MsgGenerator:
     """Acquire darks in pedestal mode, using dynamic gain mode. This calibrates the offsets
     for the jungfrau, and must be performed before acquiring real data in dynamic gain mode.
@@ -46,18 +45,19 @@ def do_pedestal_darks(
         exp_time_s: Length of detector exposure for each frame.
         pedestal_frames: Number of frames acquired per pedestal loop.
         pedestal_loops: Number of times to acquire a set of pedestal_frames
+        filename: Name of output file
         jungfrau: Jungfrau device
-        path_of_output_file: Absolute path of the detector file output, including file name. If None, then use the PathProvider
-            set during Jungfrau device instantiation
     """
 
     @bpp.set_run_key_decorator(PEDESTAL_DARKS_RUN)
-    @bpp.run_decorator(md={"subplan_name": PEDESTAL_DARKS_RUN})
+    @bpp.run_decorator(
+        md={
+            "subplan_name": PEDESTAL_DARKS_RUN,
+            "detector_file_template": filename,
+        }
+    )
     @bpp.stage_decorator([jungfrau])
     def _do_decorated_plan():
-        if path_of_output_file:
-            override_file_path(jungfrau, path_of_output_file)
-
         trigger_info = create_jungfrau_pedestal_triggering_info(
             exp_time_s, pedestal_frames, pedestal_loops
         )
@@ -67,12 +67,11 @@ def do_pedestal_darks(
         yield from bps.mv(
             jungfrau.drv.acquisition_type,
             AcquisitionType.PEDESTAL,
-            jungfrau.drv.gain_mode,
-            GainMode.DYNAMIC,
         )
         yield from fly_jungfrau(
             jungfrau,
             trigger_info,
+            GainMode.DYNAMIC,
             wait=True,
             log_on_percentage_prefix="Jungfrau pedestal dynamic gain mode darks triggers received",
         )
@@ -84,8 +83,8 @@ def do_non_pedestal_darks(
     gain_mode: GainMode,
     exp_time_s: float = 0.001,
     total_triggers: PositiveInt = 1000,
+    filename: str = "darks",
     jungfrau: CommissioningJungfrau = inject("jungfrau"),
-    path_of_output_file: str | None = None,
 ) -> MsgGenerator:
     """Internally take a set of images at a given gain mode.
 
@@ -96,26 +95,26 @@ def do_non_pedestal_darks(
         exp_time_s: Length of detector exposure for each trigger.
         total_triggers: Total triggers for the dark scan.
         jungfrau: Jungfrau device
-        path_of_output_file: Absolute path of the detector file output, including file name. If None, then use the PathProvider
-            set during Jungfrau device instantiation
+        filename: Name of output file
     """
 
     @bpp.set_run_key_decorator(STANDARD_DARKS_RUN)
-    @bpp.run_decorator(md={"subplan_name": STANDARD_DARKS_RUN})
+    @bpp.run_decorator(
+        md={
+            "subplan_name": STANDARD_DARKS_RUN,
+            "detector_file_template": filename,
+        }
+    )
     @bpp.stage_decorator([jungfrau])
     def _do_decorated_plan():
-        if path_of_output_file:
-            override_file_path(jungfrau, path_of_output_file)
-
         trigger_info = create_jungfrau_internal_triggering_info(
             total_triggers, exp_time_s
         )
 
-        yield from bps.mv(jungfrau.drv.gain_mode, gain_mode)
-
         yield from fly_jungfrau(
             jungfrau,
             trigger_info,
+            gain_mode,
             wait=True,
             log_on_percentage_prefix=f"Jungfrau {gain_mode} gain mode darks triggers received",
         )

mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/rotation_scan_plan.py

@@ -0,0 +1,292 @@
+from functools import partial
+
+import bluesky.plan_stubs as bps
+import bluesky.preprocessors as bpp
+from bluesky.preprocessors import run_decorator
+from bluesky.utils import MsgGenerator
+from dodal.devices.beamlines.i24.aperture import AperturePositions
+from dodal.devices.beamlines.i24.beamstop import BeamstopPositions
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.dual_backlight import BacklightPositions
+from dodal.devices.hutch_shutter import ShutterState
+from dodal.devices.zebra.zebra import ArmDemand, I24Axes, Zebra
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
+from ophyd_async.fastcs.jungfrau import (
+    GainMode,
+    create_jungfrau_external_triggering_info,
+)
+from pydantic import BaseModel, field_validator
+
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.callbacks.metadata_writer import (
+    JsonMetadataWriter,
+)
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.composites import (
+    RotationScanComposite,
+)
+from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils import (
+    JF_COMPLETE_GROUP,
+    fly_jungfrau,
+)
+from mx_bluesky.beamlines.i24.parameters.constants import (
+    PlanNameConstants,
+)
+from mx_bluesky.common.device_setup_plans.setup_zebra_and_shutter import (
+    setup_zebra_for_rotation,
+    tidy_up_zebra_after_rotation_scan,
+)
+from mx_bluesky.common.experiment_plans.inner_plans.read_hardware import (
+    read_hardware_plan,
+)
+from mx_bluesky.common.experiment_plans.rotation.rotation_utils import (
+    RotationMotionProfile,
+    calculate_motion_profile,
+)
+from mx_bluesky.common.parameters.components import PARAMETER_VERSION
+from mx_bluesky.common.parameters.constants import (
+    USE_NUMTRACKER,
+    PlanGroupCheckpointConstants,
+)
+from mx_bluesky.common.parameters.rotation import (
+    SingleRotationScan,
+)
+from mx_bluesky.common.utils.log import LOGGER
+
+READING_DUMP_FILENAME = "collection_info.json"
+
+# Should be read from config file, see
+# https://github.com/DiamondLightSource/mx-bluesky/issues/1502
+JF_DET_STAGE_Y_POSITION_MM = 730
+DEFAULT_DETECTOR_DISTANCE_MM = 200
+
+
+class ExternalRotationScanParams(BaseModel):
+    transmission_fractions: list[float]
+    exposure_time_s: float
+    omega_start_deg: float = 0
+    rotation_increment_per_image_deg: float = 0.1
+    filename: str = "rotations"
+    detector_distance_mm: float = DEFAULT_DETECTOR_DISTANCE_MM
+    sample_id: int
+
+    @field_validator("transmission_fractions")
+    @classmethod
+    def validate_transmission_fractions(cls, values):
+        for v in values:
+            if not 0 <= v <= 1:
+                raise ValueError(
+                    f"All transmission fractions must be between 0 and 1; got {v}"
+                )
+        return values
+
+
+def _get_internal_rotation_params(
+    entry_params: ExternalRotationScanParams, transmission: float
+) -> SingleRotationScan:
+    return SingleRotationScan(
+        sample_id=entry_params.sample_id,
+        visit=USE_NUMTRACKER,  # See https://github.com/DiamondLightSource/mx-bluesky/issues/1527
+        parameter_model_version=PARAMETER_VERSION,
+        file_name=entry_params.filename,
+        transmission_frac=transmission,
+        exposure_time_s=entry_params.exposure_time_s,
+        storage_directory=USE_NUMTRACKER,
+    )
+
+
+class HutchClosedError(Exception): ...
+
+
+def rotation_scan_plan(
+    composite: RotationScanComposite, params: ExternalRotationScanParams
+) -> MsgGenerator:
+    """BlueAPI entry point for i24 JF rotation scans"""
+
+    for transmission in params.transmission_fractions:
+        rotation_params = _get_internal_rotation_params(params, transmission)
+        yield from single_rotation_plan(composite, rotation_params)
+
+
+def set_up_beamline_for_rotation(
+    composite: RotationScanComposite,
+    det_z_mm: float,
+    transmission_frac: float,
+):
+    """Check hutch is open, then, in parallel, move backlight in,
+    move aperture in, move beamstop out and move det stages in. Wait for this parallel
+    move to finish."""
+
+    hutch_shutter_state: ShutterState = yield from bps.rd(
+        composite.hutch_shutter.status
+    )
+    LOGGER.info(f"Hutch shutter: {hutch_shutter_state}")
+    if hutch_shutter_state != ShutterState.OPEN:
+        LOGGER.error(f"Hutch shutter is not open! State is {hutch_shutter_state}")
+        raise HutchClosedError(
+            f"Hutch shutter is not open! State is {hutch_shutter_state}"
+        )
+
+    LOGGER.info(
+        "Making sure aperture and beamstop are in, detector stages are in position, backlight is out, and transmission is set..."
+    )
+    yield from bps.mv(
+        composite.aperture.position,
+        AperturePositions.IN,
+        composite.beamstop.pos_select,
+        BeamstopPositions.DATA_COLLECTION,
+        composite.det_stage.y,
+        JF_DET_STAGE_Y_POSITION_MM,
+        composite.backlight.backlight_position,
+        BacklightPositions.OUT,
+        composite.det_stage.z,
+        det_z_mm,
+        composite.attenuator,
+        transmission_frac,
+    )
+
+
+def single_rotation_plan(
+    composite: RotationScanComposite,
+    params: SingleRotationScan,
+):
+    """A stub plan to collect diffraction images from a sample continuously rotating
+    about a fixed axis - for now this axis is limited to omega.
+    Needs additional setup of the sample environment and a wrapper to clean up."""
+
+    @bpp.set_run_key_decorator(PlanNameConstants.SINGLE_ROTATION_SCAN)
+    @run_decorator()
+    def _plan_in_run_decorator():
+        if not params.detector_distance_mm:
+            LOGGER.info(
+                f"Using default detector distance of  {DEFAULT_DETECTOR_DISTANCE_MM} mm"
+            )
+            params.detector_distance_mm = DEFAULT_DETECTOR_DISTANCE_MM
+
+        yield from set_up_beamline_for_rotation(
+            composite, params.detector_distance_mm, params.transmission_frac
+        )
+
+        # This value isn't actually used, see https://github.com/DiamondLightSource/mx-bluesky/issues/1224
+        _motor_time_to_speed = 1
+        _max_velocity_deg_s = yield from bps.rd(composite.gonio.omega.max_velocity)
+
+        motion_values = calculate_motion_profile(
+            params, _motor_time_to_speed, _max_velocity_deg_s
+        )
+
+        # Callback which intercepts read documents and writes to json file,
+        # used for saving device metadata
+        metadata_writer = JsonMetadataWriter()
+
+        @bpp.subs_decorator([metadata_writer])
+        @bpp.set_run_key_decorator(PlanNameConstants.ROTATION_MAIN)
+        @bpp.run_decorator(
+            md={
+                "subplan_name": PlanNameConstants.ROTATION_MAIN,
+                "scan_points": [params.scan_points],
+                "rotation_scan_params": params.model_dump_json(),
+                "detector_file_template": params.file_name,
+            }
+        )
+        def _rotation_scan_plan(
+            motion_values: RotationMotionProfile,
+            composite: RotationScanComposite,
+        ):
+            _jf_trigger_info = create_jungfrau_external_triggering_info(
+                params.num_images, params.detector_params.exposure_time_s
+            )
+
+            axis = composite.gonio.omega
+
+            # can move to start as fast as possible
+            yield from bps.abs_set(
+                axis.velocity, motion_values.max_velocity_deg_s, wait=True
+            )
+            LOGGER.info(f"Moving omega to start value, {motion_values.start_scan_deg=}")
+            yield from bps.abs_set(
+                axis,
+                motion_values.start_motion_deg,
+                group=PlanGroupCheckpointConstants.ROTATION_READY_FOR_DC,
+            )
+
+            yield from setup_zebra_for_rotation(
+                composite.zebra,
+                composite.sample_shutter,
+                axis=I24Axes.OMEGA,
+                start_angle=motion_values.start_scan_deg,
+                scan_width=motion_values.scan_width_deg,
+                direction=motion_values.direction,
+                shutter_opening_deg=motion_values.shutter_opening_deg,
+                shutter_opening_s=motion_values.shutter_time_s,
+            )
+
+            yield from bps.wait(PlanGroupCheckpointConstants.ROTATION_READY_FOR_DC)
+
+            # Get ready for the actual scan
+            yield from bps.abs_set(
+                axis.velocity, motion_values.speed_for_rotation_deg_s, wait=True
+            )
+            yield from bps.abs_set(composite.zebra.pc.arm, ArmDemand.ARM, wait=True)
+
+            # Should check topup gate here, but not yet implemented,
+            # see https://github.com/DiamondLightSource/mx-bluesky/issues/1501
+
+            # Read hardware after preparing jungfrau so that device metadata output from callback is correct
+            # Whilst metadata is being written in bluesky we need to access the private writer here
+            read_hardware_partial = partial(
+                read_hardware_plan,
+                [
+                    composite.dcm.energy_in_keV,
+                    composite.dcm.wavelength_in_a,
+                    composite.det_stage.z,
+                    composite.jungfrau._writer.file_path,  # noqa: SLF001 N
+                ],
+                PlanNameConstants.ROTATION_DEVICE_READ,
+            )
+
+            yield from fly_jungfrau(
+                composite.jungfrau,
+                _jf_trigger_info,
+                GainMode.DYNAMIC,
+                wait=False,
+                log_on_percentage_prefix="Jungfrau rotation scan triggers received",
+                read_hardware_after_prepare_plan=read_hardware_partial,
+            )
+
+            LOGGER.info("Executing rotation scan")
+            yield from bps.rel_set(
+                axis,
+                motion_values.distance_to_move_deg,
+                wait=False,
+                group=JF_COMPLETE_GROUP,
+            )
+
+            LOGGER.info(
+                "Waiting for omega to finish moving and for Jungfrau to receive correct number of triggers"
+            )
+            yield from bps.wait(group=JF_COMPLETE_GROUP)
+
+        yield from bpp.finalize_wrapper(
+            _rotation_scan_plan(motion_values, composite),
+            final_plan=partial(
+                _cleanup_plan,
+                composite.zebra,
+                composite.jungfrau,
+                composite.sample_shutter,
+            ),
+        )
+
+    yield from _plan_in_run_decorator()
+
+
+def _cleanup_plan(
+    zebra: Zebra,
+    jf: CommissioningJungfrau,
+    zebra_shutter: ZebraShutter,
+    group="rotation cleanup",
+):
+    LOGGER.info("Tidying up Zebra and Jungfrau...")
+    yield from bps.unstage(jf, group=group)
+    yield from tidy_up_zebra_after_rotation_scan(
+        zebra, zebra_shutter, group=group, wait=False
+    )
+    yield from bps.wait(group=group)

mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_external_acquisition.py

@@ -1,24 +1,24 @@
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
 from ophyd_async.core import (
     WatchableAsyncStatus,
 )
 from ophyd_async.fastcs.jungfrau import (
+    GainMode,
     create_jungfrau_external_triggering_info,
 )
 from pydantic import PositiveInt
 
 from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils import (
     fly_jungfrau,
-    override_file_path,
 )
 
 
 def do_external_acquisition(
     exp_time_s: float,
+    gain_mode: GainMode,
     total_triggers: PositiveInt = 1,
-    output_file_path: str | None = None,
     wait: bool = False,
     jungfrau: CommissioningJungfrau = inject("commissioning_jungfrau"),
 ) -> MsgGenerator[WatchableAsyncStatus]:
@@ -32,14 +32,9 @@ def do_external_acquisition(
         exp_time_s: Length of detector exposure for each frame.
         total_triggers: Number of external triggers received before acquisition is marked as complete.
         jungfrau: Jungfrau device
-        output_file_name: Absolute path of the detector file output, including file name. If None, then use the PathProvider
-            set during jungfrau device instantiation
         wait: Optionally block until data collection is complete.
     """
 
-    if output_file_path:
-        override_file_path(jungfrau, output_file_path)
-
     trigger_info = create_jungfrau_external_triggering_info(total_triggers, exp_time_s)
-    status = yield from fly_jungfrau(jungfrau, trigger_info, wait=wait)
+    status = yield from fly_jungfrau(jungfrau, trigger_info, gain_mode, wait=wait)
     return status

mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/do_internal_acquisition.py

@@ -5,18 +5,19 @@ from ophyd_async.core import (
     WatchableAsyncStatus,
 )
 from ophyd_async.fastcs.jungfrau import (
+    GainMode,
     create_jungfrau_internal_triggering_info,
 )
 from pydantic import PositiveInt
 
 from mx_bluesky.beamlines.i24.jungfrau_commissioning.plan_stubs.plan_utils import (
     fly_jungfrau,
-    override_file_path,
 )
 
 
 def do_internal_acquisition(
     exp_time_s: float,
+    gain_mode: GainMode,
     total_frames: PositiveInt = 1,
     jungfrau: CommissioningJungfrau = inject("jungfrau"),
     path_of_output_file: str | None = None,
@@ -31,6 +32,7 @@ def do_internal_acquisition(
 
     Args:
         exp_time_s: Length of detector exposure for each frame.
+        gain_mode: Which gain mode to put the Jungfrau into before starting the acquisition.
         total_frames: Number of frames taken after being internally triggered.
         period_between_frames_s: Time between each detector frame, including deadtime. Not needed if frames_per_triggers is 1.
         jungfrau: Jungfrau device
@@ -39,9 +41,6 @@ def do_internal_acquisition(
         wait: Optionally block until data collection is complete.
     """
 
-    if path_of_output_file:
-        override_file_path(jungfrau, path_of_output_file)
-
     trigger_info = create_jungfrau_internal_triggering_info(total_frames, exp_time_s)
-    status = yield from fly_jungfrau(jungfrau, trigger_info, wait=wait)
+    status = yield from fly_jungfrau(jungfrau, trigger_info, gain_mode, wait=wait)
     return status

mx_bluesky/beamlines/i24/jungfrau_commissioning/plan_stubs/plan_utils.py

@@ -1,16 +1,15 @@
-from pathlib import PurePath
+from collections.abc import Callable
 from typing import cast
 
 import bluesky.plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.common.watcher_utils import log_on_percentage_complete
-from dodal.devices.i24.commissioning_jungfrau import CommissioningJungfrau
+from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
 from ophyd_async.core import (
-    AutoIncrementingPathProvider,
-    StaticFilenameProvider,
     TriggerInfo,
     WatchableAsyncStatus,
 )
+from ophyd_async.fastcs.jungfrau import GainMode
 
 from mx_bluesky.common.utils.log import LOGGER
 
@@ -20,8 +19,11 @@ JF_COMPLETE_GROUP = "JF complete"
 def fly_jungfrau(
     jungfrau: CommissioningJungfrau,
     trigger_info: TriggerInfo,
+    gain_mode: GainMode,
     wait: bool = False,
     log_on_percentage_prefix="Jungfrau data collection triggers received",
+    read_hardware_after_prepare_plan: Callable[..., MsgGenerator]
+    | None = None,  # Param needs refactor: https://github.com/DiamondLightSource/mx-bluesky/issues/819
 ) -> MsgGenerator[WatchableAsyncStatus]:
     """Stage, prepare, and kickoff Jungfrau with a configured TriggerInfo. Optionally wait
     for completion.
@@ -32,13 +34,21 @@ def fly_jungfrau(
     Args:
     jungfrau: Jungfrau device.
     trigger_info: TriggerInfo which should be acquired using jungfrau util functions.
+    gain_mode: Which gain mode to put the Jungfrau into before starting the acquisition.
     wait: Optionally block until data collection is complete.
     log_on_percentage_prefix: String that will be appended to the "percentage completion" logging message.
+    read_hardware_after_prepare_plan: Optionally add a plan which will be ran in between preparing the jungfrau and starting
+    acquisition. This is useful for reading devices after they have been prepared, especially since the file writing path
+    is calculated during prepare.
     """
 
+    LOGGER.info(f"Setting Jungfrau to gain mode {gain_mode}")
+    yield from bps.mv(jungfrau.drv.gain_mode, gain_mode)
     LOGGER.info("Preparing detector...")
     yield from bps.prepare(jungfrau, trigger_info, wait=True)
-    LOGGER.info("Detector prepared. Starting acquisition")
+    LOGGER.info("Detector prepared")
+    if read_hardware_after_prepare_plan:
+        yield from read_hardware_after_prepare_plan()
     yield from bps.kickoff(jungfrau, wait=True)
     LOGGER.info("Waiting for acquisition to complete...")
     status = yield from bps.complete(jungfrau, group=JF_COMPLETE_GROUP)
@@ -50,17 +60,3 @@ def fly_jungfrau(
     if wait:
         yield from bps.wait(JF_COMPLETE_GROUP)
     return status
-
-
-def override_file_path(jungfrau: CommissioningJungfrau, path_of_output_file: str):
-    """While we should generally use device instantiation to set the path,
-    during commissioning, it is useful to be able to explicitly set the filename
-    and path.
-
-    This function must be called before the Jungfrau is prepared.
-    """
-    _file_path = PurePath(path_of_output_file)
-    _new_filename_provider = StaticFilenameProvider(_file_path.name)
-    jungfrau._writer._path_info = AutoIncrementingPathProvider(  # noqa: SLF001
-        _new_filename_provider, _file_path.parent
-    )

mx_bluesky/beamlines/i24/parameters/constants.py

@@ -0,0 +1,9 @@
+from pydantic.dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class PlanNameConstants:
+    ROTATION_DEVICE_READ = "ROTATION DEVICE READ"
+    SINGLE_ROTATION_SCAN = "OUTER SINGLE ROTATION SCAN"
+    MULTI_ROTATION_SCAN = "OUTER MULTI ROTATION SCAN"
+    ROTATION_MAIN = "ROTATION MAIN"

mx_bluesky/beamlines/i24/serial/dcid.py

@@ -8,9 +8,9 @@ from functools import lru_cache
 import bluesky.plan_stubs as bps
 import requests
 from bluesky.utils import MsgGenerator
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.dcm import DCM
-from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import PumpProbeSetting
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER

mx_bluesky/beamlines/i24/serial/extruder/i24ssx_extruder_collect_py3v2.py

@@ -15,13 +15,13 @@ import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
+from dodal.devices.beamlines.i24.aperture import Aperture
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.beamstop import Beamstop
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import DualBacklight
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
-from dodal.devices.i24.aperture import Aperture
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.beamstop import Beamstop
-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.motors import YZStage
 from dodal.devices.zebra.zebra import Zebra
 
@@ -113,7 +113,7 @@ def laser_check(
     """
     SSX_LOGGER.debug(f"Laser check: {mode}")
 
-    laser_ttl = zebra.mapping.outputs.TTL_PILATUS  # Update with dodal changes
+    laser_ttl = zebra.mapping.outputs.TTL_JUNGFRAU
 
     if mode == "laseron":
         yield from bps.abs_set(

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_collect_py3v1.py

@@ -11,14 +11,14 @@ import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.attenuator.attenuator import ReadOnlyAttenuator
+from dodal.devices.beamlines.i24.aperture import Aperture
+from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
+from dodal.devices.beamlines.i24.beamstop import Beamstop
+from dodal.devices.beamlines.i24.dcm import DCM
+from dodal.devices.beamlines.i24.dual_backlight import DualBacklight
+from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
+from dodal.devices.beamlines.i24.pmac import PMAC
 from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
-from dodal.devices.i24.aperture import Aperture
-from dodal.devices.i24.beam_center import DetectorBeamCenter
-from dodal.devices.i24.beamstop import Beamstop
-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.pmac import PMAC
 from dodal.devices.motors import YZStage
 from dodal.devices.zebra.zebra import Zebra
 

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_chip_manager_py3v1.py

@@ -13,9 +13,9 @@ import numpy as np
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 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.pmac import CS_STR, PMAC, EncReset, LaserSettings
+from dodal.devices.beamlines.i24.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.beamlines.i24.dual_backlight import BacklightPositions, DualBacklight
+from dodal.devices.beamlines.i24.pmac import CS_STR, PMAC, EncReset, LaserSettings
 from dodal.devices.motors import YZStage
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py

@@ -9,7 +9,7 @@ import bluesky.plan_stubs as bps
 import cv2 as cv
 from bluesky.run_engine import RunEngine
 from dodal.beamlines import i24
-from dodal.devices.i24.pmac import PMAC
+from dodal.devices.beamlines.i24.pmac import PMAC
 from dodal.devices.oav.oav_detector import OAV
 
 from mx_bluesky.beamlines.i24.serial.fixed_target import (
@@ -222,6 +222,6 @@ def start_viewer(oav: OAV, pmac: PMAC, run_engine: RunEngine, oav1: str = OAV1_C
 if __name__ == "__main__":
     run_engine = RunEngine(call_returns_result=True)
     # Get devices out of dodal
-    oav: OAV = i24.oav(connect_immediately=True)
-    pmac: PMAC = i24.pmac(connect_immediately=True)
+    oav: OAV = i24.oav.build(connect_immediately=True)
+    pmac: PMAC = i24.pmac.build(connect_immediately=True)
     start_viewer(oav, pmac, run_engine)