mx-bluesky 1.1.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

mx_bluesky/__init__.py

@@ -1,6 +1,11 @@
-from importlib.metadata import version
+"""Top level API.
 
-__version__ = version("mx_bluesky")
-del version
+.. data:: __version__
+    :type: str
+
+    Version number as calculated by https://github.com/pypa/setuptools_scm
+"""
+
+from ._version import __version__
 
 __all__ = ["__version__"]

mx_bluesky/__main__.py

@@ -1,19 +1,24 @@
-from argparse import ArgumentParser
+"""Interface for ``python -m mx_bluesky``."""
 
-from mx_bluesky.example import run_plan
+from argparse import ArgumentParser
+from collections.abc import Sequence
 
 from . import __version__
 
 __all__ = ["main"]
 
 
-def main(args=None):
+def main(args: Sequence[str] | None = None) -> None:
+    """Argument parser for the CLI."""
     parser = ArgumentParser()
-    parser.add_argument("-v", "--version", action="version", version=__version__)
-    args = parser.parse_args(args)
-    run_plan()
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        version=__version__,
+    )
+    parser.parse_args(args)
 
 
-# test with: python -m mx_bluesky
 if __name__ == "__main__":
     main()

mx_bluesky/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.0'
-__version_tuple__ = version_tuple = (1, 1, 0)
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)

mx_bluesky/beamlines/i04/callbacks/murko_callback.py

@@ -1,13 +1,16 @@
 import copy
 import json
+from datetime import timedelta
 
 from bluesky.callbacks import CallbackBase
 from dodal.log import LOGGER
-from event_model.documents import Event, RunStart
+from event_model.documents import Event, RunStart, RunStop
 from redis import StrictRedis
 
 
 class MurkoCallback(CallbackBase):
+    DATA_EXPIRY_DAYS = 7
+
     def __init__(self, redis_host: str, redis_password: str, redis_db: int = 0):
         self.redis_client = StrictRedis(
             host=redis_host, password=redis_password, db=redis_db
@@ -15,15 +18,17 @@ class MurkoCallback(CallbackBase):
         self.last_uuid = None
 
     def start(self, doc: RunStart) -> RunStart | None:
+        self.sample_id = doc.get("sample_id")
         self.murko_metadata = {
             "zoom_percentage": doc.get("zoom_percentage"),
             "microns_per_x_pixel": doc.get("microns_per_x_pixel"),
             "microns_per_y_pixel": doc.get("microns_per_y_pixel"),
             "beam_centre_i": doc.get("beam_centre_i"),
             "beam_centre_j": doc.get("beam_centre_j"),
-            "sample_id": doc.get("sample_id"),
+            "sample_id": self.sample_id,
         }
         self.last_uuid = None
+        LOGGER.info(f"Starting to stream metadata to murko under {self.sample_id}")
         return doc
 
     def event(self, doc: Event) -> Event:
@@ -40,6 +45,11 @@ class MurkoCallback(CallbackBase):
         metadata["uuid"] = uuid
 
         # Send metadata to REDIS and trigger murko
-        self.redis_client.hset("test-metadata", uuid, json.dumps(metadata))
+        redis_key = f"murko:{metadata['sample_id']}:metadata"
+        self.redis_client.hset(redis_key, uuid, json.dumps(metadata))
+        self.redis_client.expire(redis_key, timedelta(days=self.DATA_EXPIRY_DAYS))
         self.redis_client.publish("murko", json.dumps(metadata))
-        LOGGER.info("Metadata sent to redis")
+
+    def stop(self, doc: RunStop) -> RunStop | None:
+        LOGGER.info(f"Finished streaming {self.sample_id} to murko")
+        return doc

mx_bluesky/beamlines/i04/thawing_plan.py

@@ -1,3 +1,5 @@
+from collections.abc import Callable
+
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.preprocessors import run_decorator, subs_decorator
@@ -5,7 +7,7 @@ from dls_bluesky_core.core import MsgGenerator
 from dodal.beamlines.i04 import MURKO_REDIS_DB, REDIS_HOST, REDIS_PASSWORD
 from dodal.common import inject
 from dodal.devices.oav.oav_detector import OAV
-from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder
+from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder, Source
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon
 from dodal.devices.thawer import Thawer, ThawerStates
@@ -22,31 +24,62 @@ def thaw_and_stream_to_redis(
     oav: OAV = inject("oav"),
     oav_to_redis_forwarder: OAVToRedisForwarder = inject("oav_to_redis_forwarder"),
 ) -> MsgGenerator:
-    zoom_percentage = yield from bps.rd(oav.zoom_controller.percentage)
+    zoom_percentage = yield from bps.rd(oav.zoom_controller.percentage)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
     sample_id = yield from bps.rd(robot.sample_id)
 
-    yield from bps.abs_set(oav.zoom_controller.level, "1.0x", wait=True)
-    yield from bps.abs_set(oav_to_redis_forwarder.sample_id, sample_id)
+    sample_id = int(sample_id)
+    zoom_level_before_thawing = yield from bps.rd(oav.zoom_controller.level)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+
+    yield from bps.mv(oav.zoom_controller.level, "1.0x")  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+
+    def switch_forwarder_to_ROI() -> MsgGenerator:
+        yield from bps.complete(oav_to_redis_forwarder, wait=True)
+        yield from bps.mv(
+            # See: https://github.com/bluesky/bluesky/issues/1809
+            oav_to_redis_forwarder.selected_source,  # type: ignore
+            Source.ROI.value,  # type: ignore
+        )
+        yield from bps.kickoff(oav_to_redis_forwarder, wait=True)
+
+    microns_per_pixel_x = yield from bps.rd(oav.microns_per_pixel_x)
+    microns_per_pixel_y = yield from bps.rd(oav.microns_per_pixel_y)
+    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))
     @run_decorator(
         md={
-            "microns_per_x_pixel": oav.parameters.micronsPerXPixel,
-            "microns_per_y_pixel": oav.parameters.micronsPerYPixel,
-            "beam_centre_i": oav.parameters.beam_centre_i,
-            "beam_centre_j": oav.parameters.beam_centre_j,
+            "microns_per_x_pixel": microns_per_pixel_x,
+            "microns_per_y_pixel": microns_per_pixel_y,
+            "beam_centre_i": beam_centre_i,
+            "beam_centre_j": beam_centre_j,
             "zoom_percentage": zoom_percentage,
             "sample_id": sample_id,
         }
     )
     def _thaw_and_stream_to_redis():
+        yield from bps.mv(
+            oav_to_redis_forwarder.sample_id,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+            sample_id,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+            oav_to_redis_forwarder.selected_source,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+            Source.FULL_SCREEN.value,  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        )
+
         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(time_to_thaw, rotation, thawer, smargon)
+        yield from thaw(
+            time_to_thaw, rotation, thawer, smargon, switch_forwarder_to_ROI
+        )
         yield from bps.complete(oav_to_redis_forwarder)
 
-    yield from _thaw_and_stream_to_redis()
+    def cleanup():
+        yield from bps.mv(oav.zoom_controller.level, zoom_level_before_thawing)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+
+    yield from bpp.contingency_wrapper(
+        _thaw_and_stream_to_redis(),
+        final_plan=cleanup,
+    )
 
 
 def thaw(
@@ -54,6 +87,7 @@ def thaw(
     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.
 
@@ -64,6 +98,8 @@ def thaw(
         thawer (Thawer, optional): The thawing device. Defaults to inject("thawer").
         smargon (Smargon, optional): The smargon used to rotate.
                                      Defaults to inject("smargon")
+        plan_between_rotations (MsgGenerator, optional): A plan to run between rotations
+                                    of the smargon. Defaults to no plan.
     """
     inital_velocity = yield from bps.rd(smargon.omega.velocity)
     new_velocity = abs(rotation / time_to_thaw) * 2.0
@@ -72,6 +108,8 @@ def thaw(
         yield from bps.abs_set(smargon.omega.velocity, new_velocity, wait=True)
         yield from bps.abs_set(thawer.control, ThawerStates.ON, wait=True)
         yield from bps.rel_set(smargon.omega, rotation, wait=True)
+        if plan_between_rotations:
+            yield from plan_between_rotations()
         yield from bps.rel_set(smargon.omega, -rotation, wait=True)
 
     def cleanup():

mx_bluesky/beamlines/i24/serial/__init__.py

@@ -22,6 +22,7 @@ from .fixed_target.i24ssx_Chip_Manager_py3v1 import (
     upload_parameters,
     write_parameter_file,
 )
+from .log import clean_up_log_config_at_end, setup_collection_logs
 from .setup_beamline.setup_detector import setup_detector_stage
 
 __all__ = [
@@ -46,4 +47,6 @@ __all__ = [
     "save_screen_map",
     "upload_parameters",
     "write_parameter_file",
+    "setup_collection_logs",
+    "clean_up_log_config_at_end",
 ]

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

@@ -5,7 +5,6 @@ This version in python3 new Feb2021 by RLO
 """
 
 import json
-import logging
 import re
 import shutil
 import sys
@@ -27,8 +26,12 @@ from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.zebra import DISCONNECT, SOFT_IN3, Zebra
 
-from mx_bluesky.beamlines.i24.serial import log
 from mx_bluesky.beamlines.i24.serial.dcid import DCID
+from mx_bluesky.beamlines.i24.serial.log import (
+    SSX_LOGGER,
+    _read_visit_directory_from_file,
+    log_on_entry,
+)
 from mx_bluesky.beamlines.i24.serial.parameters import ExtruderParameters, SSXType
 from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     PARAM_FILE_NAME,
@@ -54,31 +57,22 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_zebra_plans import (
 )
 from mx_bluesky.beamlines.i24.serial.write_nexus import call_nexgen
 
-usage = "%(prog)s command [options]"
-logger = logging.getLogger("I24ssx.extruder")
-
 SAFE_DET_Z = 1480
 
 
-def setup_logging():
-    logfile = time.strftime("i24extruder_%d%B%y.log").lower()
-    log.config(logfile)
-
-
 def flush_print(text):
     sys.stdout.write(str(text))
     sys.stdout.flush()
 
 
-@log.log_on_entry
+@log_on_entry
 def initialise_extruder(
     detector_stage: DetectorMotion = inject("detector_motion"),
 ) -> MsgGenerator:
-    setup_logging()
-    logger.info("Initialise Parameters for extruder data collection on I24.")
+    SSX_LOGGER.info("Initialise Parameters for extruder data collection on I24.")
 
     visit = caget(pv.ioc12_gp1)
-    logger.info(f"Visit defined {visit}")
+    SSX_LOGGER.info(f"Visit defined {visit}")
 
     # Define detector in use
     det_type = yield from get_detector_type(detector_stage)
@@ -93,11 +87,11 @@ def initialise_extruder(
     caput(pv.ioc12_gp10, 0)
     caput(pv.ioc12_gp15, det_type.name)
     caput(pv.pilat_cbftemplate, 0)
-    logger.info("Initialisation complete.")
+    SSX_LOGGER.info("Initialisation complete.")
     yield from bps.null()
 
 
-@log.log_on_entry
+@log_on_entry
 def laser_check(
     mode: str,
     zebra: Zebra = inject("zebra"),
@@ -116,8 +110,7 @@ def laser_check(
     detector in use is the Eiger, the Pilatus cable is repurposed to trigger the light \
     source, and viceversa.
     """
-    setup_logging()
-    logger.debug(f"Laser check: {mode}")
+    SSX_LOGGER.debug(f"Laser check: {mode}")
 
     det_type = yield from get_detector_type(detector_stage)
 
@@ -131,24 +124,23 @@ def laser_check(
         yield from set_shutter_mode(zebra, "manual")
 
 
-@log.log_on_entry
+@log_on_entry
 def enter_hutch(
     detector_stage: DetectorMotion = inject("detector_motion"),
 ) -> MsgGenerator:
     """Move the detector stage before entering hutch."""
-    setup_logging()
-    yield from bps.mv(detector_stage.z, SAFE_DET_Z)
-    logger.debug("Detector moved.")
+    yield from bps.mv(detector_stage.z, SAFE_DET_Z)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    SSX_LOGGER.debug("Detector moved.")
 
 
-@log.log_on_entry
+@log_on_entry
 def write_parameter_file(detector_stage: DetectorMotion):
     """Writes a json parameter file that can later be parsed by the model."""
     param_file: Path = PARAM_FILE_PATH / PARAM_FILE_NAME
-    logger.debug(f"Writing Parameter File to: {param_file}\n")
+    SSX_LOGGER.debug(f"Writing Parameter File to: {param_file}\n")
 
     det_type = yield from get_detector_type(detector_stage)
-    logger.warning(f"DETECTOR TYPE: {det_type}")
+    SSX_LOGGER.warning(f"DETECTOR TYPE: {det_type}")
     filename = caget(pv.ioc12_gp3)
     # If file name ends in a digit this causes processing/pilatus pain.
     # Append an underscore
@@ -158,16 +150,16 @@ def write_parameter_file(detector_stage: DetectorMotion):
             # Note for future reference. Appending underscore causes more hassle and
             # high probability of users accidentally overwriting data. Use a dash
             filename = filename + "-"
-            logger.info(
+            SSX_LOGGER.info(
                 f"Requested filename ends in a number. Appended dash: {filename}"
             )
 
-    pump_status = bool(caget(pv.ioc12_gp6))
+    pump_status = bool(int(caget(pv.ioc12_gp6)))
     pump_exp = float(caget(pv.ioc12_gp9)) if pump_status else None
     pump_delay = float(caget(pv.ioc12_gp10)) if pump_status else None
 
     params_dict = {
-        "visit": log._read_visit_directory_from_file().as_posix(),  # noqa
+        "visit": _read_visit_directory_from_file().as_posix(),  # noqa
         "directory": caget(pv.ioc12_gp2),
         "filename": filename,
         "exposure_time_s": float(caget(pv.ioc12_gp5)),
@@ -181,12 +173,12 @@ def write_parameter_file(detector_stage: DetectorMotion):
     with open(param_file, "w") as f:
         json.dump(params_dict, f, indent=4)
 
-    logger.info("Parameters \n")
-    logger.info(pformat(params_dict))
+    SSX_LOGGER.info("Parameters \n")
+    SSX_LOGGER.info(pformat(params_dict))
     yield from bps.null()
 
 
-@log.log_on_entry
+@log_on_entry
 def main_extruder_plan(
     zebra: Zebra,
     aperture: Aperture,
@@ -200,7 +192,7 @@ def main_extruder_plan(
     start_time: datetime,
 ) -> MsgGenerator:
     # Setting up the beamline
-    logger.debug("Open hutch shutter")
+    SSX_LOGGER.info("Open hutch shutter")
     yield from bps.abs_set(shutter, ShutterDemand.OPEN, wait=True)
 
     yield from sup.setup_beamline_for_collection_plan(
@@ -213,25 +205,25 @@ def main_extruder_plan(
 
     # For pixel detector
     filepath = parameters.collection_directory.as_posix()
-    logger.debug(f"Filepath {filepath}")
-    logger.debug(f"Filename {parameters.filename}")
+    SSX_LOGGER.debug(f"Filepath {filepath}")
+    SSX_LOGGER.debug(f"Filename {parameters.filename}")
 
     if parameters.detector_name == "pilatus":
-        logger.info("Using pilatus mini cbf")
+        SSX_LOGGER.info("Using pilatus mini cbf")
         caput(pv.pilat_cbftemplate, 0)
-        logger.info(f"Pilatus quickshot setup: filepath {filepath}")
-        logger.info(f"Pilatus quickshot setup: filepath {parameters.filename}")
-        logger.info(
+        SSX_LOGGER.info(f"Pilatus quickshot setup: filepath {filepath}")
+        SSX_LOGGER.info(f"Pilatus quickshot setup: filepath {parameters.filename}")
+        SSX_LOGGER.info(
             f"Pilatus quickshot setup: number of images {parameters.num_images}"
         )
-        logger.info(
+        SSX_LOGGER.info(
             f"Pilatus quickshot setup: exposure time {parameters.exposure_time_s}"
         )
 
         if parameters.pump_status:
-            logger.info("Pump probe extruder data collection")
-            logger.info(f"Pump exposure time {parameters.laser_dwell_s}")
-            logger.info(f"Pump delay time {parameters.laser_delay_s}")
+            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(
                 "fastchip",
                 [
@@ -252,7 +244,7 @@ def main_extruder_plan(
                 wait=True,
             )
         else:
-            logger.info("Static experiment: no photoexcitation")
+            SSX_LOGGER.info("Static experiment: no photoexcitation")
             sup.pilatus(
                 "quickshot",
                 [
@@ -267,38 +259,25 @@ def main_extruder_plan(
             )
 
     elif parameters.detector_name == "eiger":
-        logger.info("Using Eiger detector")
-
-        logger.warning(
-            """TEMPORARY HACK!
-            Running a Single image pilatus data collection to create directory."""
-        )  # See https://github.com/DiamondLightSource/mx_bluesky/issues/45
-        num_shots = 1
-        sup.pilatus(
-            "quickshot-internaltrig",
-            [filepath, parameters.filename, num_shots, parameters.exposure_time_s],
-        )
-        logger.debug("Sleep 2s waiting for pilatus to arm")
-        sleep(2.5)
-        caput(pv.pilat_acquire, "0")  # Disarm pilatus
-        sleep(0.5)
-        caput(pv.pilat_acquire, "1")  # Arm pilatus
-        logger.debug("Pilatus data collection DONE")
-        sup.pilatus("return to normal", None)
-        logger.info("Pilatus back to normal. Single image pilatus data collection DONE")
+        SSX_LOGGER.info("Using Eiger detector")
+
+        SSX_LOGGER.debug(f"Creating the directory for the collection in {filepath}.")
+        Path(filepath).mkdir(parents=True)
 
         caput(pv.eiger_seqID, int(caget(pv.eiger_seqID)) + 1)
-        logger.info(f"Eiger quickshot setup: filepath {filepath}")
-        logger.info(f"Eiger quickshot setup: filepath {parameters.filename}")
-        logger.info(f"Eiger quickshot setup: number of images {parameters.num_images}")
-        logger.info(
+        SSX_LOGGER.info(f"Eiger quickshot setup: filepath {filepath}")
+        SSX_LOGGER.info(f"Eiger quickshot setup: filepath {parameters.filename}")
+        SSX_LOGGER.info(
+            f"Eiger quickshot setup: number of images {parameters.num_images}"
+        )
+        SSX_LOGGER.info(
             f"Eiger quickshot setup: exposure time {parameters.exposure_time_s}"
         )
 
         if parameters.pump_status:
-            logger.info("Pump probe extruder data collection")
-            logger.debug(f"Pump exposure time {parameters.laser_dwell_s}")
-            logger.debug(f"Pump delay time {parameters.laser_delay_s}")
+            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(
                 "triggered",
                 [
@@ -319,7 +298,7 @@ def main_extruder_plan(
                 wait=True,
             )
         else:
-            logger.info("Static experiment: no photoexcitation")
+            SSX_LOGGER.info("Static experiment: no photoexcitation")
             sup.eiger(
                 "quickshot",
                 [
@@ -334,7 +313,7 @@ def main_extruder_plan(
             )
     else:
         err = f"Unknown Detector Type, det_type = {parameters.detector_name}"
-        logger.error(err)
+        SSX_LOGGER.error(err)
         raise UnknownDetectorType(err)
 
     # Do DCID creation BEFORE arming the detector
@@ -350,20 +329,20 @@ def main_extruder_plan(
     )
 
     # Collect
-    logger.info("Fast shutter opening")
+    SSX_LOGGER.info("Fast shutter opening")
     yield from open_fast_shutter(zebra)
     if parameters.detector_name == "pilatus":
-        logger.info("Pilatus acquire ON")
+        SSX_LOGGER.info("Pilatus acquire ON")
         caput(pv.pilat_acquire, 1)
     elif parameters.detector_name == "eiger":
-        logger.info("Triggering Eiger NOW")
+        SSX_LOGGER.info("Triggering Eiger NOW")
         caput(pv.eiger_trigger, 1)
 
     dcid.notify_start()
 
     if parameters.detector_name == "eiger":
         wavelength = yield from bps.rd(dcm.wavelength_in_a)
-        logger.debug("Call nexgen server for nexus writing.")
+        SSX_LOGGER.debug("Call nexgen server for nexus writing.")
         call_nexgen(None, start_time, parameters, wavelength, "extruder")
 
     timeout_time = time.time() + parameters.num_images * parameters.exposure_time_s + 10
@@ -381,25 +360,25 @@ def main_extruder_plan(
         if zebra_arm_status == 0:  # not zebra.pc.is_armed():
             # As soon as zebra is disarmed, exit.
             # Epics updates this PV once the collection is done.
-            logger.info("Zebra disarmed - Collection done.")
+            SSX_LOGGER.info("Zebra disarmed - Collection done.")
             break
         if time.time() >= timeout_time:
-            logger.warning(
+            SSX_LOGGER.warning(
                 """
                 Something went wrong and data collection timed out. Aborting.
             """
             )
             raise TimeoutError("Data collection timed out.")
 
-    logger.debug("Collection completed without errors.")
+    SSX_LOGGER.info("Collection completed without errors.")
 
 
-@log.log_on_entry
+@log_on_entry
 def collection_aborted_plan(
     zebra: Zebra, detector_name: str, dcid: DCID
 ) -> MsgGenerator:
     """A plan to run in case the collection is aborted before the end."""
-    logger.warning("Data Collection Aborted")
+    SSX_LOGGER.warning("Data Collection Aborted")
     yield from disarm_zebra(zebra)  # If aborted/timed out zebra still armed
     if detector_name == "pilatus":
         caput(pv.pilat_acquire, 0)
@@ -410,7 +389,7 @@ def collection_aborted_plan(
     dcid.collection_complete(end_time, aborted=True)
 
 
-@log.log_on_entry
+@log_on_entry
 def tidy_up_at_collection_end_plan(
     zebra: Zebra,
     shutter: HutchShutter,
@@ -431,23 +410,23 @@ def tidy_up_at_collection_end_plan(
         sup.pilatus("return-to-normal", None)
     elif parameters.detector_name == "eiger":
         sup.eiger("return-to-normal", None)
-        logger.debug(f"{parameters.filename}_{caget(pv.eiger_seqID)}")
-    logger.debug("End of Run")
-    logger.debug("Close hutch shutter")
+        SSX_LOGGER.debug(f"{parameters.filename}_{caget(pv.eiger_seqID)}")
+    SSX_LOGGER.debug("End of Run")
+    SSX_LOGGER.info("Close hutch shutter")
     yield from bps.abs_set(shutter, ShutterDemand.CLOSE, wait=True)
 
     dcid.notify_end()
 
 
-@log.log_on_entry
+@log_on_entry
 def collection_complete_plan(
     collection_directory: Path, detector_name: str, dcid: DCID
 ) -> MsgGenerator:
     if detector_name == "pilatus":
-        logger.info("Pilatus Acquire STOP")
+        SSX_LOGGER.info("Pilatus Acquire STOP")
         caput(pv.pilat_acquire, 0)
     elif detector_name == "eiger":
-        logger.info("Eiger Acquire STOP")
+        SSX_LOGGER.info("Eiger Acquire STOP")
         caput(pv.eiger_acquire, 0)
         caput(pv.eiger_ODcapture, "Done")
 
@@ -455,7 +434,7 @@ def collection_complete_plan(
 
     end_time = datetime.now()
     dcid.collection_complete(end_time, aborted=False)
-    logger.info(f"End Time = {end_time.ctime()}")
+    SSX_LOGGER.info(f"End Time = {end_time.ctime()}")
 
     # Copy parameter file
     shutil.copy2(
@@ -474,9 +453,8 @@ def run_extruder_plan(
     shutter: HutchShutter = inject("shutter"),
     dcm: DCM = inject("dcm"),
 ) -> MsgGenerator:
-    setup_logging()
     start_time = datetime.now()
-    logger.info(f"Collection start time: {start_time.ctime()}")
+    SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
 
     yield from write_parameter_file(detector_stage)
     parameters = ExtruderParameters.from_file(PARAM_FILE_PATH / PARAM_FILE_NAME)

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

@@ -3862,7 +3862,7 @@ buttonLabel "Stages"
 numPvs 4
 numDsps 1
 displayFileName {
-  0 "/dls_sw/work/R3.14.12.3/ioc/ME14E/BL/data/ME14E-motors.edl"
+  0 "/dls_sw/work/R3.14.12.7/ioc/ME14E/BL/data/ME14E-motors.edl"
 }
 endObjectProperties