mx-bluesky 0.3.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

mx_bluesky/{i24 → beamlines/i24}/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 3168
-y 118
+x 1062
+y 369
 w 650
 h 400
 font "arial-medium-r-18.0"
@@ -219,7 +219,7 @@ font "arial-medium-r-18.0"
 buttonLabel "Upload Parameters"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run upload_parameters '\{\"chipid\":\"oxford\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run upload_parameters '\{\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -2410,7 +2410,7 @@ font "helvetica-medium-r-18.0"
 buttonLabel "Define Chip In PMAC"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run define_current_chip '\{\"chipid\":\"oxford\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run define_current_chip '\{\"chipid\":\"oxford\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 

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

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 2970
-y 362
+x 830
+y 200
 w 900
 h 700
 font "arial-medium-r-18.0"
@@ -707,7 +707,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1off\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1off\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -749,7 +749,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1on\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1on\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -976,7 +976,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2off\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2off\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -1018,7 +1018,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2on\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2on\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -1334,7 +1334,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1burn\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser1burn\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 
@@ -1376,7 +1376,7 @@ botShadowColor index 14
 font "arial-medium-r-18.0"
 numCmds 1
 command {
-  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2burn\"\}'"
+  0 "blueapi -c CONFIG_LOCATION controller run laser_control '\{\"laser_setting\":\"laser2burn\",\"pmac\":\"pmac\"\}'"
 }
 endObjectProperties
 

mx_bluesky/{i24 → beamlines/i24}/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py

@@ -23,26 +23,29 @@ from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.zebra import Zebra
 
-from mx_bluesky.i24.serial import log
-from mx_bluesky.i24.serial.dcid import DCID
-from mx_bluesky.i24.serial.fixed_target.ft_utils import (
+from mx_bluesky.beamlines.i24.serial import log
+from mx_bluesky.beamlines.i24.serial.dcid import DCID
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,
     MappingType,
     PumpProbeSetting,
 )
-from mx_bluesky.i24.serial.parameters import (
+from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 import (
+    write_parameter_file,
+)
+from mx_bluesky.beamlines.i24.serial.parameters import (
     ChipDescription,
     FixedTargetParameters,
     SSXType,
 )
-from mx_bluesky.i24.serial.parameters.constants import (
+from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     LITEMAP_PATH,
     PARAM_FILE_NAME,
     PARAM_FILE_PATH_FT,
 )
-from mx_bluesky.i24.serial.setup_beamline import caget, cagetstring, caput, pv
-from mx_bluesky.i24.serial.setup_beamline import setup_beamline as sup
-from mx_bluesky.i24.serial.setup_beamline.setup_zebra_plans import (
+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 (
     SHUTTER_OPEN_TIME,
     arm_zebra,
     close_fast_shutter,
@@ -51,7 +54,7 @@ from mx_bluesky.i24.serial.setup_beamline.setup_zebra_plans import (
     reset_zebra_when_collection_done_plan,
     setup_zebra_for_fastchip_plan,
 )
-from mx_bluesky.i24.serial.write_nexus import call_nexgen
+from mx_bluesky.beamlines.i24.serial.write_nexus import call_nexgen
 
 ABORTED = False
 
@@ -59,7 +62,7 @@ logger = logging.getLogger("I24ssx.fixed_target")
 
 
 def setup_logging():
-    # Log should now change name daily.
+    # Log should now change name daily
     logfile = time.strftime("i24fixedtarget_%d%B%y.log").lower()
     log.config(logfile)
 
@@ -77,7 +80,10 @@ def calculate_collection_timeout(parameters: FixedTargetParameters) -> float:
     https://confluence.diamond.ac.uk/display/MXTech/Dynamics+and+fixed+targets.
 
     Args:
-        parameters (FixedTargerParameters): The collection paramelters
+        parameters (FixedTargerParameters): The collection parameters.
+
+    Returns:
+        The estimated collection time, in s.
     """
     buffer = 30
     pump_setting = parameters.pump_repeat
@@ -275,54 +281,42 @@ def load_motion_program_data(
 def get_prog_num(
     chip_type: ChipType, map_type: MappingType, pump_repeat: PumpProbeSetting
 ) -> int:
-    logger.info("Get Program Number")
-    if pump_repeat == PumpProbeSetting.NoPP:
-        if chip_type in [ChipType.Oxford, ChipType.OxfordInner]:
-            logger.info(
-                f"Pump_repeat: {str(pump_repeat)} \tOxford Chip: {str(chip_type)}"
-            )
-            if map_type == MappingType.NoMap:
-                logger.info("Map type 0 = None")
-                logger.info("Program number: 11")
-                return 11
-            elif map_type == MappingType.Lite:
-                logger.info("Map type 1 = Mapping Lite")
-                logger.info("Program number: 12")
-                return 12
-            elif map_type == MappingType.Full:
-                logger.info("Map type 2 = Full Mapping")
-                logger.info("Program number: 13")  # once fixed return 13
-                msg = "Mapping Type FULL is broken as of 11.09.17"
-                logger.error(msg)
-                raise ValueError(msg)
-            else:
-                logger.debug(f"Unknown Mapping Type; map_type = {map_type}")
-                return 0
-        elif chip_type == ChipType.Custom:
-            logger.info(
-                f"Pump_repeat: {str(pump_repeat)} \tCustom Chip: {str(chip_type)}"
-            )
-            logger.info("Program number: 11")
-            return 11
-        elif chip_type == ChipType.Minichip:
-            logger.info(
-                f"Pump_repeat: {str(pump_repeat)} \tMini Oxford Chip: {str(chip_type)}"
-            )
-            logger.info("Program number: 11")
-            return 11
-        else:
-            logger.debug(f"Unknown chip_type, chip_tpe = {chip_type}")
-            return 0
-    elif pump_repeat in [
-        pp.value for pp in PumpProbeSetting if pp != PumpProbeSetting.NoPP
-    ]:
-        logger.info(f"Pump_repeat: {str(pump_repeat)} \t Chip Type: {str(chip_type)}")
-        logger.info("Map Type = Mapping Lite with Pump Probe")
+    """Get the motion program number based on the experiment parameters set by \
+    the user.
+    Any pump probe experiment will return program number 14 (assumes lite mapping).
+    For non pump probe experiments, the program number depends on the chip and map type:
+        - Custom, Mini and PSI chips, as well as Oxford chips with no map return 11
+        - Oxford chips with lite mapping return 12
+        - Oxford chips with full mapping should return 13. Currently disabled, will \
+            raise an error.
+    """
+    logger.info("Get Program Number for the motion program.")
+    logger.info(f"Pump_repeat: {str(pump_repeat)} \t Chip Type: {str(chip_type)}")
+    if pump_repeat != PumpProbeSetting.NoPP:
+        logger.info("Assuming Map type = Mapping Lite.")
         logger.info("Program number: 14")
         return 14
-    else:
-        logger.warning(f"Unknown pump_repeat, pump_repeat = {pump_repeat}")
-        return 0
+
+    if chip_type not in [ChipType.Oxford, ChipType.OxfordInner]:
+        logger.info("Program number: 11")
+        return 11
+
+    if map_type == MappingType.NoMap:
+        logger.info(f"Map type: {str(map_type)}")
+        logger.info("Program number: 11")
+        return 11
+    if map_type == MappingType.Lite:
+        logger.info(f"Map type: {str(map_type)}")
+        logger.info("Program number: 12")
+        return 12
+    if map_type == MappingType.Full:
+        # TODO See https://github.com/DiamondLightSource/mx-bluesky/issues/515
+        logger.info(f"Map type: {str(map_type)}")
+        logger.info("Program number: 13")
+        # TODO once reinstated return 13
+        msg = "Full mapping is broken and currently disabled."
+        logger.error(msg)
+        raise ValueError(msg)
 
 
 @log.log_on_entry
@@ -475,7 +469,7 @@ def start_i24(
         caput(pv.pilat_acquire, "1")  # Arm pilatus
         yield from arm_zebra(zebra)
         caput(pv.pilat_filename, filename)
-        time.sleep(1.5)
+        sleep(1.5)
 
     elif parameters.detector_name == "eiger":
         logger.info("Using Eiger detector")
@@ -549,7 +543,7 @@ def start_i24(
             )
         yield from arm_zebra(zebra)
 
-        time.sleep(1.5)
+        sleep(1.5)
 
     else:
         msg = f"Unknown Detector Type, det_type = {parameters.detector_name}"
@@ -606,9 +600,7 @@ def run_aborted_plan(pmac: PMAC, dcid: DCID):
         P variable.
     """
     logger.warning("Data Collection Aborted")
-    yield from bps.abs_set(pmac.pmac_string, "A", wait=True)
-    yield from bps.sleep(1.0)
-    yield from bps.abs_set(pmac.pmac_string, "P2401=0", wait=True)
+    yield from bps.trigger(pmac.abort_program, wait=True)
 
     end_time = datetime.now()
     dcid.collection_complete(end_time, aborted=True)
@@ -658,10 +650,6 @@ def main_fixed_target_plan(
     yield from bps.trigger(pmac.to_xyz_zero)
     sleep(2.0)
 
-    prog_num = get_prog_num(
-        parameters.chip.chip_type, parameters.map_type, parameters.pump_repeat
-    )
-
     # Now ready for data collection. Open fast shutter (zebra gate)
     logger.info("Opening fast shutter.")
     yield from open_fast_shutter(zebra)
@@ -680,11 +668,30 @@ def main_fixed_target_plan(
             wavelength,
         )
 
-    timeout_time = calculate_collection_timeout(parameters)
-    logger.info(f"Run PMAC with program number {prog_num}")
-    yield from bps.abs_set(pmac.run_program, prog_num, timeout_time, wait=True)
+    yield from kickoff_and_complete_collection(pmac, parameters)
 
-    logger.debug("Collection completed without errors.")
+
+def kickoff_and_complete_collection(pmac: PMAC, parameters: FixedTargetParameters):
+    prog_num = get_prog_num(
+        parameters.chip.chip_type, parameters.map_type, parameters.pump_repeat
+    )
+    yield from bps.abs_set(pmac.program_number, prog_num, group="setup_pmac")
+    # Calculate approx collection time
+    total_collection_time = calculate_collection_timeout(parameters)
+    logger.info(f"Estimated collection time: {total_collection_time}s.")
+    yield from bps.abs_set(
+        pmac.collection_time, total_collection_time, group="setup_pmac"
+    )
+    yield from bps.wait(group="setup_pmac")  # Make sure the soft signals are set
+
+    @bpp.run_decorator(md={"subplan_name": "run_ft_collection"})
+    def run_collection():
+        logger.info(f"Kick off PMAC with program number {prog_num}.")
+        yield from bps.kickoff(pmac.run_program, wait=True)
+        yield from bps.complete(pmac.run_program, wait=True)
+        logger.info("Collection completed without errors.")
+
+    yield from run_collection()
 
 
 @log.log_on_entry
@@ -747,6 +754,9 @@ def run_fixed_target_plan(
 ) -> MsgGenerator:
     setup_logging()
 
+    # in the first instance, write params here
+    yield from write_parameter_file(detector_stage)
+
     logger.info("Getting parameters from file.")
     parameters = FixedTargetParameters.from_file(PARAM_FILE_PATH_FT / PARAM_FILE_NAME)
 

mx_bluesky/{i24 → beamlines/i24}/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -23,16 +23,20 @@ from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pmac import PMAC, EncReset, LaserSettings
 
-from mx_bluesky.i24.serial import log
-from mx_bluesky.i24.serial.fixed_target import i24ssx_Chip_Mapping_py3v1 as mapping
-from mx_bluesky.i24.serial.fixed_target import i24ssx_Chip_StartUp_py3v1 as startup
-from mx_bluesky.i24.serial.fixed_target.ft_utils import (
+from mx_bluesky.beamlines.i24.serial import log
+from mx_bluesky.beamlines.i24.serial.fixed_target import (
+    i24ssx_Chip_Mapping_py3v1 as mapping,
+)
+from mx_bluesky.beamlines.i24.serial.fixed_target import (
+    i24ssx_Chip_StartUp_py3v1 as startup,
+)
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,
     Fiducials,
     MappingType,
 )
-from mx_bluesky.i24.serial.parameters import get_chip_format
-from mx_bluesky.i24.serial.parameters.constants import (
+from mx_bluesky.beamlines.i24.serial.parameters import get_chip_format
+from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     CS_FILES_PATH,
     FULLMAP_PATH,
     LITEMAP_PATH,
@@ -40,8 +44,10 @@ from mx_bluesky.i24.serial.parameters.constants import (
     PARAM_FILE_PATH_FT,
     PVAR_FILE_PATH,
 )
-from mx_bluesky.i24.serial.setup_beamline import Pilatus, caget, caput, pv
-from mx_bluesky.i24.serial.setup_beamline.setup_detector import get_detector_type
+from mx_bluesky.beamlines.i24.serial.setup_beamline import Pilatus, caget, caput, pv
+from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
+    get_detector_type,
+)
 
 logger = logging.getLogger("I24ssx.chip_manager")
 
@@ -117,9 +123,8 @@ def initialise_stages(
 
 @log.log_on_entry
 def write_parameter_file(
-    detector_stage: DetectorMotion = inject("detector_motion"),
+    detector_stage: DetectorMotion,
 ) -> MsgGenerator:
-    setup_logging()
     param_path: Path = PARAM_FILE_PATH_FT
     # Create directory if it doesn't yet exist.
     param_path.mkdir(parents=True, exist_ok=True)
@@ -250,24 +255,18 @@ def save_screen_map() -> MsgGenerator:
 
 
 @log.log_on_entry
-def upload_parameters(
-    chipid: str = "oxford", pmac: PMAC = inject("pmac"), width: int | None = None
-) -> MsgGenerator:
+def upload_parameters(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     setup_logging()
-    logger.info("Uploading Parameters to the GeoBrick")
-    if chipid == "oxford":
-        caput(CHIPTYPE_PV, 0)
-        width = 8
-    else:
-        if width is None:
-            raise Exception("Supply a width if chipid is not oxford")
+    logger.info("Uploading Parameters for Oxford Chip to the GeoBrick")
+    caput(CHIPTYPE_PV, 0)
+    width = 8
 
     map_file: Path = LITEMAP_PATH / "currentchip.map"
     if not map_file.exists():
         raise FileNotFoundError(f"The file {map_file} has not yet been created")
 
     with open(map_file) as f:
-        logger.info(f"Chipid {chipid}")
+        logger.info(f"Chipid {ChipType.Oxford}")
         logger.info(f"width {width}")
         x = 1
         for line in f.readlines()[: width**2]:

mx_bluesky/{i24 → beamlines/i24}/serial/fixed_target/i24ssx_Chip_Mapping_py3v1.py

@@ -10,17 +10,17 @@ import time
 import numpy as np
 from matplotlib import pyplot as plt
 
-from mx_bluesky.i24.serial import log
-from mx_bluesky.i24.serial.fixed_target.ft_utils import ChipType
-from mx_bluesky.i24.serial.fixed_target.i24ssx_Chip_StartUp_py3v1 import (
+from mx_bluesky.beamlines.i24.serial import log
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
+from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_StartUp_py3v1 import (
     check_files,
     get_shot_order,
     get_xy,
     read_parameter_file,
     write_file,
 )
-from mx_bluesky.i24.serial.parameters import get_chip_format
-from mx_bluesky.i24.serial.parameters.constants import PARAM_FILE_PATH_FT
+from mx_bluesky.beamlines.i24.serial.parameters import get_chip_format
+from mx_bluesky.beamlines.i24.serial.parameters.constants import PARAM_FILE_PATH_FT
 
 logger = logging.getLogger("I24ssx.chip_mapping")
 

mx_bluesky/{i24 → beamlines/i24}/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py

@@ -10,10 +10,13 @@ from pathlib import Path
 
 import numpy as np
 
-from mx_bluesky.i24.serial import log
-from mx_bluesky.i24.serial.fixed_target.ft_utils import ChipType
-from mx_bluesky.i24.serial.parameters import FixedTargetParameters, get_chip_format
-from mx_bluesky.i24.serial.parameters.constants import (
+from mx_bluesky.beamlines.i24.serial import log
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
+from mx_bluesky.beamlines.i24.serial.parameters import (
+    FixedTargetParameters,
+    get_chip_format,
+)
+from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     HEADER_FILES_PATH,
     PARAM_FILE_NAME,
     PARAM_FILE_PATH_FT,

mx_bluesky/{i24 → beamlines/i24}/serial/fixed_target/i24ssx_moveonclick.py

@@ -4,6 +4,7 @@ Robin Owen 12 Jan 2021
 """
 
 import logging
+from collections.abc import Sequence
 
 import bluesky.plan_stubs as bps
 import cv2 as cv
@@ -12,16 +13,14 @@ from dodal.beamlines import i24
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.oav.oav_detector import OAV
 
-from mx_bluesky.i24.serial.fixed_target import i24ssx_Chip_Manager_py3v1 as manager
-from mx_bluesky.i24.serial.fixed_target.ft_utils import Fiducials
-from mx_bluesky.i24.serial.parameters.constants import OAV1_CAM
+from mx_bluesky.beamlines.i24.serial.fixed_target import (
+    i24ssx_Chip_Manager_py3v1 as manager,
+)
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import Fiducials
+from mx_bluesky.beamlines.i24.serial.parameters.constants import OAV1_CAM
 
 logger = logging.getLogger("I24ssx.moveonclick")
 
-# Set scale.
-# TODO See https://github.com/DiamondLightSource/mx_bluesky/issues/44
-zoomcalibrator = 6  # 8 seems to work well for zoom 2
-
 
 def _get_beam_centre(oav: OAV):
     """Extract the beam centre x/y positions from the display.configuration file.
@@ -32,20 +31,40 @@ def _get_beam_centre(oav: OAV):
     return oav.parameters.beam_centre_i, oav.parameters.beam_centre_j
 
 
+def _calculate_zoom_calibrator(oav: OAV):
+    """Set the scale for the zoom calibrator for the pmac moves."""
+    currentzoom = yield from bps.rd(oav.zoom_controller.percentage)
+    zoomcalibrator = 1.547 - (0.03 * currentzoom) + (0.0001634 * currentzoom**2)
+    return zoomcalibrator
+
+
+def _move_on_mouse_click_plan(
+    oav: OAV, pmac: PMAC, beam_centre: Sequence[int], clicked_position: Sequence[int]
+):
+    """A plan that calculates the zoom calibrator and moves to the clicked \
+        position coordinates.
+    """
+    zoomcalibrator = yield from _calculate_zoom_calibrator(oav)
+    beamX, beamY = beam_centre
+    x, y = clicked_position
+    xmove = -1 * (beamX - x) * zoomcalibrator
+    ymove = -1 * (beamY - y) * zoomcalibrator
+    logger.info(f"Moving X and Y {xmove} {ymove}")
+    xmovepmacstring = "#1J:" + str(xmove)
+    ymovepmacstring = "#2J:" + str(ymove)
+    yield from bps.abs_set(pmac.pmac_string, xmovepmacstring, wait=True)
+    yield from bps.abs_set(pmac.pmac_string, ymovepmacstring, wait=True)
+
+
 # Register clicks and move chip stages
 def onMouse(event, x, y, flags, param):
     if event == cv.EVENT_LBUTTONUP:
-        pmac = param[0]
-        oav = param[1]
+        RE = param[0]
+        pmac = param[1]
+        oav = param[2]
         beamX, beamY = _get_beam_centre(oav)
         logger.info(f"Clicked X and Y {x} {y}")
-        xmove = -1 * (beamX - x) * zoomcalibrator
-        ymove = -1 * (beamY - y) * zoomcalibrator
-        logger.info(f"Moving X and Y {xmove} {ymove}")
-        xmovepmacstring = "#1J:" + str(xmove)
-        ymovepmacstring = "#2J:" + str(ymove)
-        yield from bps.abs_set(pmac.pmac_string, xmovepmacstring, wait=True)
-        yield from bps.abs_set(pmac.pmac_string, ymovepmacstring, wait=True)
+        RE(_move_on_mouse_click_plan(oav, pmac, (beamX, beamY), (x, y)))
 
 
 def update_ui(oav, frame):
@@ -56,7 +75,6 @@ def update_ui(oav, frame):
     cv.ellipse(
         frame, (beamX, beamY), (12, 8), 0.0, 0.0, 360, (0, 255, 255), thickness=2
     )
-    # putText(frame,'text',bottomLeftCornerOfText, font, fontScale, fontColor, thickness, lineType)
     cv.putText(
         frame,
         "Key bindings",
@@ -130,16 +148,13 @@ def update_ui(oav, frame):
     cv.imshow("OAV1view", frame)
 
 
-def start_viewer(oav1: str = OAV1_CAM):
-    # Get devices out of dodal
-    oav: OAV = i24.oav()
-    pmac: PMAC = i24.pmac()
+def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
     # Create a video caputure from OAV1
     cap = cv.VideoCapture(oav1)
 
     # Create window named OAV1view and set onmouse to this
     cv.namedWindow("OAV1view")
-    cv.setMouseCallback("OAV1view", onMouse, param=[pmac, oav])  # type: ignore
+    cv.setMouseCallback("OAV1view", onMouse, param=[RE, pmac, oav])  # type: ignore
 
     logger.info("Showing camera feed. Press escape to close")
     # Read captured video and store them in success and frame
@@ -153,38 +168,40 @@ def start_viewer(oav1: str = OAV1_CAM):
 
         k = cv.waitKey(1)
         if k == 113:  # Q
-            yield from manager.moveto(Fiducials.zero, pmac)
+            RE(manager.moveto(Fiducials.zero, pmac))
         if k == 119:  # W
-            yield from manager.moveto(Fiducials.fid1, pmac)
+            RE(manager.moveto(Fiducials.fid1, pmac))
         if k == 101:  # E
-            yield from manager.moveto(Fiducials.fid2, pmac)
+            RE(manager.moveto(Fiducials.fid2, pmac))
         if k == 97:  # A
-            yield from bps.trigger(pmac.home, wait=True)
+            RE(bps.trigger(pmac.home, wait=True))
             print("Current position set as origin")
         if k == 115:  # S
-            yield from manager.fiducial(1)
+            RE(manager.fiducial(1))
         if k == 100:  # D
-            yield from manager.fiducial(2)
+            RE(manager.fiducial(2))
         if k == 99:  # C
-            yield from manager.cs_maker(pmac)
+            RE(manager.cs_maker(pmac))
         if k == 98:  # B
-            yield from manager.block_check()  # doesn't work well for blockcheck as image doesn't update
+            RE(
+                manager.block_check()
+            )  # doesn't work well for blockcheck as image doesn't update
         if k == 104:  # H
-            yield from bps.abs_set(pmac.pmac_string, "#2J:-10", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#2J:-10", wait=True))
         if k == 110:  # N
-            yield from bps.abs_set(pmac.pmac_string, "#2J:10", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#2J:10", wait=True))
         if k == 109:  # M
-            yield from bps.abs_set(pmac.pmac_string, "#1J:-10", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#1J:-10", wait=True))
         if k == 98:  # B
-            yield from bps.abs_set(pmac.pmac_string, "#1J:10", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#1J:10", wait=True))
         if k == 105:  # I
-            yield from bps.abs_set(pmac.pmac_string, "#3J:-150", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#3J:-150", wait=True))
         if k == 111:  # O
-            yield from bps.abs_set(pmac.pmac_string, "#3J:150", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#3J:150", wait=True))
         if k == 117:  # U
-            yield from bps.abs_set(pmac.pmac_string, "#3J:-1000", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#3J:-1000", wait=True))
         if k == 112:  # P
-            yield from bps.abs_set(pmac.pmac_string, "#3J:1000", wait=True)
+            RE(bps.abs_set(pmac.pmac_string, "#3J:1000", wait=True))
         if k == 0x1B:  # esc
             cv.destroyWindow("OAV1view")
             print("Pressed escape. Closing window")
@@ -196,4 +213,7 @@ def start_viewer(oav1: str = OAV1_CAM):
 
 if __name__ == "__main__":
     RE = RunEngine()
-    RE(start_viewer())
+    # Get devices out of dodal
+    oav: OAV = i24.oav()
+    pmac: PMAC = i24.pmac()
+    start_viewer(oav, pmac, RE)

mx_bluesky/{i24 → beamlines/i24}/serial/log.py

@@ -4,13 +4,12 @@ import logging.config
 from os import environ
 from pathlib import Path
 
-from bluesky.log import logger as bluesky_logger
 from dodal.log import (
     ERROR_LOG_BUFFER_LINES,
+    integrate_bluesky_and_ophyd_logging,
     set_up_all_logging_handlers,
 )
 from dodal.log import LOGGER as dodal_logger
-from ophyd_async.log import logger as ophyd_async_logger
 
 VISIT_PATH = Path("/dls_sw/i24/etc/ssx_current_visit.txt")
 
@@ -88,13 +87,6 @@ def _get_logging_file_path() -> Path:
     return logging_path
 
 
-def integrate_bluesky_and_ophyd_logging(parent_logger: logging.Logger):
-    """Integrate only bluesky and ophyd_async loggers."""
-    for logger in [bluesky_logger, ophyd_async_logger]:
-        logger.parent = parent_logger
-        logger.setLevel(logging.DEBUG)
-
-
 def default_logging_setup(dev_mode: bool = False):
     """ Default log setup for i24 serial.