mx-bluesky 1.4.6__py3-none-any.whl → 1.4.8__py3-none-any.whl

mx_bluesky/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.6'
-__version_tuple__ = version_tuple = (1, 4, 6)
+__version__ = version = '1.4.8'
+__version_tuple__ = version_tuple = (1, 4, 8)

mx_bluesky/beamlines/aithre_lasershaping/__init__.py

@@ -0,0 +1,13 @@
+from mx_bluesky.beamlines.aithre_lasershaping.check_goniometer_performance import (
+    check_omega_performance,
+)
+from mx_bluesky.beamlines.aithre_lasershaping.goniometer_controls import (
+    change_goniometer_turn_speed,
+    rotate_goniometer_relative,
+)
+
+__all__ = [
+    "check_omega_performance",
+    "change_goniometer_turn_speed",
+    "rotate_goniometer_relative",
+]

mx_bluesky/beamlines/aithre_lasershaping/check_goniometer_performance.py

@@ -0,0 +1,29 @@
+import bluesky.plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+
+DEFAULT_VELOCITIES = [5.0, 10.0, 20.0, 40.0, 80.0, 90.0]
+DEFAULT_POSITIONS = [
+    300.0,
+    -300.0,
+    600.0,
+    -600.0,
+    1200.0,
+    -1200.0,
+    2400.0,
+    -2400.0,
+    3600.0,
+    -3600.0,
+]
+
+
+def check_omega_performance(
+    goniometer: Goniometer,
+    velocities: list[float] = DEFAULT_VELOCITIES,
+    values: list[float] = DEFAULT_POSITIONS,
+) -> MsgGenerator:
+    """Move the goniometer from positive to negative to check omega performance"""
+    for omega_velocity in velocities:
+        yield from bps.abs_set(goniometer.omega.velocity, omega_velocity, wait=True)
+        for omega_value in values:
+            yield from bps.abs_set(goniometer.omega, omega_value, wait=True)

mx_bluesky/beamlines/aithre_lasershaping/goniometer_controls.py

@@ -0,0 +1,18 @@
+import bluesky.plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.common import inject
+from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+
+
+def rotate_goniometer_relative(
+    value: float, goniometer: Goniometer = inject("goniometer")
+) -> MsgGenerator:
+    """Adjust the goniometer position incrementally"""
+    yield from bps.rel_set(goniometer.omega, value, wait=True)
+
+
+def change_goniometer_turn_speed(
+    velocity: float, goniometer: Goniometer = inject("goniometer")
+) -> MsgGenerator:
+    """Set the velocity of the goniometer"""
+    yield from bps.mv(goniometer.omega.velocity, velocity)

mx_bluesky/beamlines/i04/redis_to_murko_forwarder.py

@@ -1,11 +1,12 @@
 import io
 import json
 import pickle
+from datetime import timedelta
 from typing import TypedDict
 
 import numpy as np
 import zmq
-from dodal.beamlines.i04 import MURKO_REDIS_DB, REDIS_HOST, REDIS_PASSWORD
+from dodal.devices.i04.constants import RedisConstants
 from numpy.typing import NDArray
 from PIL import Image
 from redis import StrictRedis
@@ -14,13 +15,20 @@ from mx_bluesky.common.utils.log import LOGGER
 
 MURKO_ADDRESS = "tcp://i04-murko-prod.diamond.ac.uk:8008"
 
+MurkoResult = dict
+FullMurkoResults = dict[str, list[MurkoResult]]
+
 
 class MurkoRequest(TypedDict):
+    """See https://github.com/MartinSavko/murko#usage for more information."""
+
     to_predict: NDArray
     model_img_size: tuple[int, int]
     save: bool
     min_size: int
     description: list
+
+    # The identifier for each image
     prefix: list[str]
 
 
@@ -29,32 +37,26 @@ def get_image_size(image: NDArray) -> tuple[int, int]:
     return image.shape[1], image.shape[0]
 
 
-def send_to_murko_and_get_results(request: MurkoRequest) -> dict:
+def send_to_murko_and_get_results(request: MurkoRequest) -> FullMurkoResults:
     LOGGER.info(f"Sending {request['prefix']} to murko")
     context = zmq.Context()
     socket = context.socket(zmq.REQ)
     socket.connect(MURKO_ADDRESS)
     socket.send(pickle.dumps(request))
     raw_results = socket.recv()
+    assert isinstance(raw_results, bytes)
     results = pickle.loads(raw_results)
     LOGGER.info(f"Got {len(results['descriptions'])} results")
     return results
 
 
-def correlate_results_to_uuids(request: MurkoRequest, murko_results: dict) -> list:
-    results = []
-    uuids = request["prefix"]
-
-    width, height = get_image_size(request["to_predict"][0])
-
-    for uuid, prediction in zip(uuids, murko_results["descriptions"], strict=False):
-        coords = prediction["most_likely_click"]
-        y_coord = coords[0] * height
-        x_coord = coords[1] * width
-        results.append(
-            {"uuid": uuid, "x_pixel_coord": x_coord, "y_pixel_coord": y_coord}
-        )
-    return results
+def _correlate_results_to_uuids(
+    request: MurkoRequest, murko_results: FullMurkoResults
+) -> list[tuple[str, MurkoResult]]:
+    """We send a batch of images to murko, with each having a 'prefix' of the uuid that
+    we're using to keep track of the image. Murko sends back an ordered list of these,
+    which we match to the supplied prefix here."""
+    return list(zip(request["prefix"], murko_results["descriptions"], strict=False))
 
 
 class BatchMurkoForwarder:
@@ -94,16 +96,20 @@ class BatchMurkoForwarder:
             ],
             "prefix": uuids,
         }
-        predictions = send_to_murko_and_get_results(request_arguments)
-        results = correlate_results_to_uuids(request_arguments, predictions)
-        self._send_murko_results_to_redis(sample_id, results)
-
-    def _send_murko_results_to_redis(self, sample_id: str, results: list):
-        for result in results:
-            self.redis_client.hset(
-                f"murko:{sample_id}:results", result["uuid"], json.dumps(result)
-            )
-        self.redis_client.publish("murko-results", json.dumps(results))
+        results = send_to_murko_and_get_results(request_arguments)
+        results_with_uuids = _correlate_results_to_uuids(request_arguments, results)
+        self._send_murko_results_to_redis(sample_id, results_with_uuids)
+
+    def _send_murko_results_to_redis(
+        self, sample_id: str, results: list[tuple[str, MurkoResult]]
+    ):
+        """Stores the results into a redis hash (for longer term storage) and publishes
+        them as well so that downstream clients can get notified."""
+        for uuid, result in results:
+            redis_key = f"murko:{sample_id}:results"
+            self.redis_client.hset(redis_key, uuid, str(pickle.dumps(result)))
+            self.redis_client.expire(redis_key, timedelta(days=7))
+        self.redis_client.publish("murko-results", pickle.dumps(results))
 
     def add(self, sample_id: str, uuid: str, image: NDArray):
         """Add an image to the batch to send to murko."""
@@ -133,9 +139,9 @@ class RedisListener:
 
     def __init__(
         self,
-        redis_host=REDIS_HOST,
-        redis_password=REDIS_PASSWORD,
-        db=MURKO_REDIS_DB,
+        redis_host=RedisConstants.REDIS_HOST,
+        redis_password=RedisConstants.REDIS_PASSWORD,
+        db=RedisConstants.MURKO_REDIS_DB,
         redis_channel="murko",
     ):
         self.redis_client = StrictRedis(

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -4,8 +4,8 @@ import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.preprocessors import run_decorator, subs_decorator
 from bluesky.utils import MsgGenerator
-from dodal.beamlines.i04 import MURKO_REDIS_DB, REDIS_HOST, REDIS_PASSWORD
 from dodal.common import inject
+from dodal.devices.i04.constants import RedisConstants
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder, Source
 from dodal.devices.robot import BartRobot
@@ -42,7 +42,13 @@ def thaw_and_stream_to_redis(
     beam_centre_i = yield from bps.rd(oav.beam_centre_i)
     beam_centre_j = yield from bps.rd(oav.beam_centre_j)
 
-    @subs_decorator(MurkoCallback(REDIS_HOST, REDIS_PASSWORD, MURKO_REDIS_DB))
+    @subs_decorator(
+        MurkoCallback(
+            RedisConstants.REDIS_HOST,
+            RedisConstants.REDIS_PASSWORD,
+            RedisConstants.MURKO_REDIS_DB,
+        )
+    )
     @run_decorator(
         md={
             "microns_per_x_pixel": microns_per_pixel_x,
@@ -64,7 +70,7 @@ def thaw_and_stream_to_redis(
         yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
         yield from bps.monitor(smargon.omega.user_readback, name="smargon")
         yield from bps.monitor(oav_to_redis_forwarder.uuid, name="oav")
-        yield from thaw(
+        yield from _thaw(
             time_to_thaw, rotation, thawer, smargon, switch_forwarder_to_ROI
         )
         yield from bps.complete(oav_to_redis_forwarder)
@@ -83,6 +89,15 @@ def thaw(
     rotation: float = 360,
     thawer: Thawer = inject("thawer"),
     smargon: Smargon = inject("smargon"),
+) -> MsgGenerator:
+    yield from _thaw(time_to_thaw, rotation, thawer, smargon)
+
+
+def _thaw(
+    time_to_thaw: float,
+    rotation: float = 360,
+    thawer: Thawer = inject("thawer"),
+    smargon: Smargon = inject("smargon"),
     plan_between_rotations: Callable[[], MsgGenerator] | None = None,
 ) -> MsgGenerator:
     """Rotates the sample and thaws it at the same time.

mx_bluesky/beamlines/i23/__init__.py

@@ -0,0 +1,3 @@
+from mx_bluesky.beamlines.i23.serial import serial_collection
+
+__all__ = ["serial_collection"]

mx_bluesky/beamlines/i23/serial.py

@@ -0,0 +1,71 @@
+from functools import partial
+
+from bluesky import plan_stubs as bps
+from bluesky.plans import rel_grid_scan
+from bluesky.utils import short_uid
+from dodal.beamlines.i23 import I23DetectorPositions
+from dodal.common import inject
+from dodal.devices.motors import SixAxisGonio
+from dodal.devices.positioner import Positioner1D
+from ophyd_async.epics.motor import Motor
+
+
+def set_axis_to_max_velocity(axis: Motor):
+    max_vel = yield from bps.rd(axis.max_velocity)
+    yield from bps.mv(axis.velocity, max_vel)
+
+
+def one_nd_step(
+    detectors,
+    step,
+    pos_cache,
+    omega_axis: Motor,
+    omega_rotation: float,
+    omega_velocity: float,
+):
+    def move():
+        yield from bps.checkpoint()
+        grp = short_uid("set")
+        for motor, pos in step.items():
+            yield from bps.abs_set(motor, pos, group=grp)
+        yield from set_axis_to_max_velocity(omega_axis)
+        yield from bps.abs_set(omega_axis, 0, group=grp)
+        yield from bps.wait(group=grp)
+
+    yield from move()
+    yield from bps.mv(omega_axis.velocity, omega_velocity)
+    yield from bps.mv(omega_axis, omega_rotation)
+
+
+def serial_collection(
+    x_steps: int,
+    y_steps: int,
+    x_step_size: float,
+    y_step_size: float,
+    omega_rotation: float,
+    omega_velocity: float,
+    detector_motion: Positioner1D = inject("detector_motion"),
+    gonio: SixAxisGonio = inject("gonio"),
+):
+    """This plan runs a software controlled serial collection. i.e it moves in a snaked
+    grid and does a small rotation collection at each point."""
+
+    yield from bps.mv(detector_motion.stage_position, I23DetectorPositions.IN)
+    yield from rel_grid_scan(
+        [],
+        gonio.y,
+        0,
+        y_step_size * (y_steps - 1),
+        y_steps,
+        gonio.x,
+        0,
+        x_step_size * (x_steps - 1),
+        x_steps,
+        per_step=partial(  # type: ignore
+            one_nd_step,
+            omega_axis=gonio.omega,
+            omega_rotation=omega_rotation,
+            omega_velocity=omega_velocity,
+        ),
+        snake_axes=True,
+    )

mx_bluesky/beamlines/i24/serial/__init__.py

@@ -1,5 +1,6 @@
 from mx_bluesky.beamlines.i24.serial.web_gui_plans.general_plans import (
     gui_gonio_move_on_click,
+    gui_move_backlight,
     gui_move_detector,
     gui_set_parameters,
     gui_sleep,
@@ -57,4 +58,5 @@ __all__ = [
     "gui_sleep",
     "gui_move_detector",
     "gui_set_parameters",
+    "gui_move_backlight",
 ]

mx_bluesky/beamlines/i24/serial/extruder/EX-gui-edm/DiamondExtruder-I24-py3v1.edl

@@ -34,8 +34,8 @@ h 308
 lineColor index 26
 fill
 fillColor index 25
-alarmPv "BL24I-EA-IOC-12:GP6"
-visPv "BL24I-EA-IOC-12:GP6"
+alarmPv "BL24I-MO-IOC-13:GP6"
+visPv "BL24I-MO-IOC-13:GP6"
 visMin "1"
 visMax "10"
 endObjectProperties
@@ -65,7 +65,7 @@ x 145
 y 328
 w 97
 h 30
-controlPv "BL24I-EA-IOC-12:GP9"
+controlPv "BL24I-MO-IOC-13:GP9"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -83,7 +83,7 @@ x 145
 y 366
 w 97
 h 30
-controlPv "BL24I-EA-IOC-12:GP10"
+controlPv "BL24I-MO-IOC-13:GP10"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -192,7 +192,7 @@ x 394
 y 124
 w 273
 h 30
-controlPv "BL24I-EA-IOC-12:GP2"
+controlPv "BL24I-MO-IOC-13:GP2"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -210,7 +210,7 @@ x 394
 y 163
 w 273
 h 30
-controlPv "BL24I-EA-IOC-12:GP3"
+controlPv "BL24I-MO-IOC-13:GP3"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -268,7 +268,7 @@ x 449
 y 200
 w 125
 h 30
-controlPv "BL24I-EA-IOC-12:GP4"
+controlPv "BL24I-MO-IOC-13:GP4"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -286,7 +286,7 @@ x 448
 y 237
 w 125
 h 30
-controlPv "BL24I-EA-IOC-12:GP5"
+controlPv "BL24I-MO-IOC-13:GP5"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -636,7 +636,7 @@ x 448
 y 315
 w 125
 h 30
-controlPv "BL24I-EA-IOC-12:GP7"
+controlPv "BL24I-MO-IOC-13:GP7"
 fgColor index 25
 fgAlarm
 bgColor index 3
@@ -1374,7 +1374,7 @@ x 393
 y 99
 w 253
 h 18
-controlPv "BL24I-EA-IOC-12:GP1"
+controlPv "BL24I-MO-IOC-13:GP1"
 format "decimal"
 font "arial-medium-r-16.0"
 fgColor index 25
@@ -1896,7 +1896,7 @@ x 430
 y 662
 w 86
 h 18
-controlPv "BL24I-EA-IOC-12:GP15"
+controlPv "BL24I-MO-IOC-13:GP15"
 format "decimal"
 font "arial-medium-r-16.0"
 fgColor index 16
@@ -1963,7 +1963,7 @@ fgColor index 14
 bgColor index 3
 topShadowColor index 1
 botShadowColor index 8
-controlPv "BL24I-EA-IOC-12:GP6"
+controlPv "BL24I-MO-IOC-13:GP6"
 font "arial-medium-r-18.0"
 numItems 2
 symbolTag {

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

@@ -10,7 +10,6 @@ import time
 from datetime import datetime
 from pathlib import Path
 from pprint import pformat
-from time import sleep
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
@@ -71,21 +70,21 @@ def initialise_extruder(
 ) -> MsgGenerator:
     SSX_LOGGER.info("Initialise Parameters for extruder data collection on I24.")
 
-    visit = caget(pv.ioc12_gp1)
+    visit = caget(pv.ioc13_gp1)
     SSX_LOGGER.info(f"Visit defined {visit}")
 
     # Define detector in use
     det_type = yield from get_detector_type(detector_stage)
 
-    caput(pv.ioc12_gp2, "test")
-    caput(pv.ioc12_gp3, "testrun")
-    caput(pv.ioc12_gp4, "100")
-    caput(pv.ioc12_gp5, "0.01")
-    caput(pv.ioc12_gp6, 0)
-    caput(pv.ioc12_gp8, 0)  # status PV do not reuse gp8 for something else
-    caput(pv.ioc12_gp9, 0)
-    caput(pv.ioc12_gp10, 0)
-    caput(pv.ioc12_gp15, det_type.name)
+    caput(pv.ioc13_gp2, "test")
+    caput(pv.ioc13_gp3, "testrun")
+    caput(pv.ioc13_gp4, "100")
+    caput(pv.ioc13_gp5, "0.01")
+    caput(pv.ioc13_gp6, 0)
+    caput(pv.ioc13_gp8, 0)  # status PV do not reuse gp8 for something else
+    caput(pv.ioc13_gp9, 0)
+    caput(pv.ioc13_gp10, 0)
+    caput(pv.ioc13_gp15, det_type.name)
     caput(pv.pilat_cbftemplate, 0)
     SSX_LOGGER.info("Initialisation complete.")
     yield from bps.null()
@@ -160,7 +159,7 @@ def read_parameters(detector_stage: DetectorMotion, attenuator: ReadOnlyAttenuat
 
     det_type = yield from get_detector_type(detector_stage)
     SSX_LOGGER.warning(f"DETECTOR TYPE: {det_type}")
-    filename = caget(pv.ioc12_gp3)
+    filename = caget(pv.ioc13_gp3)
     # If file name ends in a digit this causes processing/pilatus pain.
     # Append an underscore
     if det_type.name == "pilatus":
@@ -175,19 +174,19 @@ def read_parameters(detector_stage: DetectorMotion, attenuator: ReadOnlyAttenuat
 
     transmission = yield from bps.rd(attenuator.actual_transmission)
 
-    pump_status = bool(int(caget(pv.ioc12_gp6)))
-    pump_exp = float(caget(pv.ioc12_gp9)) if pump_status else 0.0
-    pump_delay = float(caget(pv.ioc12_gp10)) if pump_status else 0.0
+    pump_status = bool(int(caget(pv.ioc13_gp6)))
+    pump_exp = float(caget(pv.ioc13_gp9)) if pump_status else 0.0
+    pump_delay = float(caget(pv.ioc13_gp10)) if pump_status else 0.0
 
     params_dict = {
         "visit": _read_visit_directory_from_file().as_posix(),  # noqa
-        "directory": caget(pv.ioc12_gp2),
+        "directory": caget(pv.ioc13_gp2),
         "filename": filename,
-        "exposure_time_s": float(caget(pv.ioc12_gp5)),
-        "detector_distance_mm": float(caget(pv.ioc12_gp7)),
+        "exposure_time_s": float(caget(pv.ioc13_gp5)),
+        "detector_distance_mm": float(caget(pv.ioc13_gp7)),
         "detector_name": str(det_type),
         "transmission": transmission,
-        "num_images": int(caget(pv.ioc12_gp4)),
+        "num_images": int(caget(pv.ioc13_gp4)),
         "pump_status": pump_status,
         "laser_dwell_s": pump_exp,
         "laser_delay_s": pump_delay,
@@ -257,7 +256,7 @@ def main_extruder_plan(
             SSX_LOGGER.info("Pump probe extruder data collection")
             SSX_LOGGER.info(f"Pump exposure time {parameters.laser_dwell_s}")
             SSX_LOGGER.info(f"Pump delay time {parameters.laser_delay_s}")
-            sup.pilatus(
+            yield from sup.pilatus(
                 "fastchip",
                 [
                     filepath,
@@ -278,7 +277,7 @@ def main_extruder_plan(
             )
         else:
             SSX_LOGGER.info("Static experiment: no photoexcitation")
-            sup.pilatus(
+            yield from sup.pilatus(
                 "quickshot",
                 [
                     filepath,
@@ -310,7 +309,7 @@ def main_extruder_plan(
             SSX_LOGGER.info("Pump probe extruder data collection")
             SSX_LOGGER.debug(f"Pump exposure time {parameters.laser_dwell_s}")
             SSX_LOGGER.debug(f"Pump delay time {parameters.laser_delay_s}")
-            sup.eiger(
+            yield from sup.eiger(
                 "triggered",
                 [
                     filepath,
@@ -318,6 +317,7 @@ def main_extruder_plan(
                     parameters.num_images,
                     parameters.exposure_time_s,
                 ],
+                dcm,
             )
             yield from setup_zebra_for_extruder_with_pump_probe_plan(
                 zebra,
@@ -331,7 +331,7 @@ def main_extruder_plan(
             )
         else:
             SSX_LOGGER.info("Static experiment: no photoexcitation")
-            sup.eiger(
+            yield from sup.eiger(
                 "quickshot",
                 [
                     filepath,
@@ -339,6 +339,7 @@ def main_extruder_plan(
                     parameters.num_images,
                     parameters.exposure_time_s,
                 ],
+                dcm,
             )
             yield from setup_zebra_for_quickshot_plan(
                 zebra, parameters.exposure_time_s, parameters.num_images, wait=True
@@ -393,13 +394,15 @@ def main_extruder_plan(
     timeout_time = time.time() + parameters.num_images * parameters.exposure_time_s + 10
 
     yield from arm_zebra(zebra)
-    sleep(GATE_START)  # Sleep for the same length of gate_start, hard coded to 1
+    yield from bps.sleep(
+        GATE_START
+    )  # bps.sleep for the same length of gate_start, hard coded to 1
     i = 0
     text_list = ["|", "/", "-", "\\"]
     while True:
         line_of_text = "\r\t\t\t Waiting   " + 30 * (f"{text_list[i % 4]}")
         flush_print(line_of_text)
-        sleep(0.5)
+        yield from bps.sleep(0.5)
         i += 1
         zebra_arm_status = yield from bps.rd(zebra.pc.arm.armed)
         if zebra_arm_status == 0:  # not zebra.pc.is_armed():
@@ -429,7 +432,7 @@ def collection_aborted_plan(
         caput(pv.pilat_acquire, 0)
     elif detector_name == "eiger":
         caput(pv.eiger_acquire, 0)
-    sleep(0.5)
+    yield from bps.sleep(0.5)
     end_time = datetime.now()
     dcid.collection_complete(end_time, aborted=True)
 
@@ -440,6 +443,7 @@ def tidy_up_at_collection_end_plan(
     shutter: HutchShutter,
     parameters: ExtruderParameters,
     dcid: DCID,
+    dcm: DCM,
 ) -> MsgGenerator:
     """A plan to tidy up at the end of a collection, successful or aborted.
 
@@ -452,9 +456,9 @@ def tidy_up_at_collection_end_plan(
 
     # Clean Up
     if parameters.detector_name == "pilatus":
-        sup.pilatus("return-to-normal", None)
+        yield from sup.pilatus("return-to-normal", None)
     elif parameters.detector_name == "eiger":
-        sup.eiger("return-to-normal", None)
+        yield from sup.eiger("return-to-normal", None, dcm)
         SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seqID)}")
     SSX_LOGGER.debug("End of Run")
     SSX_LOGGER.info("Close hutch shutter")
@@ -475,7 +479,7 @@ def collection_complete_plan(
         caput(pv.eiger_acquire, 0)
         caput(pv.eiger_ODcapture, "Done")
 
-    sleep(0.5)
+    yield from bps.sleep(0.5)
 
     end_time = datetime.now()
     dcid.collection_complete(end_time, aborted=False)
@@ -533,7 +537,9 @@ def run_extruder_plan(
             )
         ),
         final_plan=lambda: (
-            yield from tidy_up_at_collection_end_plan(zebra, shutter, parameters, dcid)
+            yield from tidy_up_at_collection_end_plan(
+                zebra, shutter, parameters, dcid, dcm
+            )
         ),
         auto_raise=False,
     )

mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/pumpprobe-py3v1.edl

@@ -1521,7 +1521,7 @@ x 275
 y 111
 w 175
 h 139
-file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short1-laser.png"
+file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/s1l.png"
 endObjectProperties
 
 # (PNG Image)
@@ -1534,7 +1534,7 @@ x 486
 y 111
 w 172
 h 139
-file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short2-laser.png"
+file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/s2l.png"
 endObjectProperties
 
 # (Static Text)
@@ -1600,7 +1600,7 @@ x 695
 y 111
 w 175
 h 139
-file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short1-laser.png"
+file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/s1l.png"
 endObjectProperties
 
 # (Static Text)