mx-bluesky 1.4.5__py3-none-any.whl → 1.4.7__py3-none-any.whl

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

@@ -4,7 +4,6 @@ Fixed target data collection
 
 from datetime import datetime
 from pathlib import Path
-from time import sleep
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
@@ -290,7 +289,9 @@ def get_prog_num(
 def set_datasize(
     parameters: FixedTargetParameters,
 ):
-    SSX_LOGGER.info("Setting PV to calculated total number of images")
+    SSX_LOGGER.info(
+        f"Setting PV to calculated total number of images: {parameters.total_num_images}"
+    )
 
     SSX_LOGGER.debug(f"Map type: {parameters.map_type}")
     SSX_LOGGER.debug(f"Chip type: {parameters.chip.chip_type}")
@@ -360,7 +361,7 @@ def start_i24(
             f"Fastchip Pilatus setup: exposure time {parameters.exposure_time_s}"
         )
 
-        sup.pilatus(
+        yield from sup.pilatus(
             "fastchip",
             [
                 filepath,
@@ -405,7 +406,7 @@ def start_i24(
         caput(pv.pilat_acquire, "1")  # Arm pilatus
         yield from arm_zebra(zebra)
         caput(pv.pilat_filename, filename)
-        sleep(1.5)
+        yield from bps.sleep(1.5)
 
     elif parameters.detector_name == "eiger":
         SSX_LOGGER.info("Using Eiger detector")
@@ -421,7 +422,7 @@ def start_i24(
             f"Triggered Eiger setup: exposure time {parameters.exposure_time_s}"
         )
 
-        sup.eiger(
+        yield from sup.eiger(
             "triggered",
             [
                 filepath,
@@ -433,7 +434,8 @@ def start_i24(
 
         # DCID process depends on detector PVs being set up already
         SSX_LOGGER.debug("Start DCID process")
-        filetemplate = f"{parameters.filename}.nxs"
+        complete_filename = cagetstring(pv.eiger_ODfilenameRBV)
+        filetemplate = f"{complete_filename}.nxs"
         dcid.generate_dcid(
             beam_settings=beam_settings,
             image_dir=filepath,
@@ -465,7 +467,7 @@ def start_i24(
             )
         yield from arm_zebra(zebra)
 
-        sleep(1.5)
+        yield from bps.sleep(1.5)
 
     else:
         msg = f"Unknown Detector Type, det_type = {parameters.detector_name}"
@@ -498,12 +500,12 @@ def finish_i24(
         SSX_LOGGER.debug("Finish I24 Pilatus")
         complete_filename = f"{parameters.filename}_{caget(pv.pilat_filenum)}"
         yield from reset_zebra_when_collection_done_plan(zebra)
-        sup.pilatus("return-to-normal", None)
-        sleep(0.2)
+        yield from sup.pilatus("return-to-normal", None)
+        yield from bps.sleep(0.2)
     elif parameters.detector_name == "eiger":
         SSX_LOGGER.debug("Finish I24 Eiger")
         yield from reset_zebra_when_collection_done_plan(zebra)
-        sup.eiger("return-to-normal", None)
+        yield from sup.eiger("return-to-normal", None)
         complete_filename = cagetstring(pv.eiger_ODfilenameRBV)  # type: ignore
     else:
         raise ValueError(f"{parameters.detector_name=} unrecognised")
@@ -592,7 +594,7 @@ def main_fixed_target_plan(
 
     SSX_LOGGER.info("Moving to Start")
     yield from bps.trigger(pmac.to_xyz_zero)
-    sleep(2.0)
+    yield from bps.sleep(2.0)
 
     # Now ready for data collection. Open fast shutter (zebra gate)
     SSX_LOGGER.info("Opening fast shutter.")
@@ -663,7 +665,7 @@ def tidy_up_after_collection_plan(
     """
     SSX_LOGGER.info("Closing fast shutter")
     yield from close_fast_shutter(zebra)
-    sleep(2.0)
+    yield from bps.sleep(2.0)
 
     # This probably should go in main then
     if parameters.detector_name == "pilatus":
@@ -673,7 +675,7 @@ def tidy_up_after_collection_plan(
         SSX_LOGGER.debug("Eiger Acquire STOP")
         caput(pv.eiger_acquire, 0)
         caput(pv.eiger_ODcapture, "Done")
-    sleep(0.5)
+    yield from bps.sleep(0.5)
 
     yield from finish_i24(zebra, pmac, shutter, dcm, parameters)
 
@@ -707,7 +709,7 @@ def run_fixed_target_plan(
     parameters.collection_directory.mkdir(parents=True, exist_ok=True)
 
     if parameters.chip_map:
-        upload_chip_map_to_geobrick(pmac, parameters.chip_map)
+        yield from upload_chip_map_to_geobrick(pmac, parameters.chip_map)
 
     beam_center_device = sup.get_beam_center_device(parameters.detector_name)
 

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

@@ -6,10 +6,8 @@ This version changed to python3 March2020 by RLO
 import json
 import re
 import sys
-import time
 from pathlib import Path
 from pprint import pformat
-from time import sleep
 
 import bluesky.plan_stubs as bps
 import numpy as np
@@ -100,7 +98,7 @@ def initialise_stages(
 
     caput(pv.pilat_cbftemplate, 0)
 
-    sleep(0.1)
+    yield from bps.sleep(0.1)
     SSX_LOGGER.info("Clearing General Purpose PVs 1-120")
     for i in range(4, 120):
         if i == 100:
@@ -259,7 +257,7 @@ def upload_chip_map_to_geobrick(pmac: PMAC, chip_map: list[int]) -> MsgGenerator
         SSX_LOGGER.debug(f"Set {pvar_str} for block {block}")
         yield from bps.abs_set(pmac.pmac_string, pvar_str, wait=True)
         # Wait for PMAC to be done processing PVAR string
-        sleep(0.02)
+        yield from bps.sleep(0.02)
     SSX_LOGGER.debug("Upload parameters done.")
 
 
@@ -548,11 +546,11 @@ def moveto(place: str = "origin", pmac: PMAC = inject("pmac")) -> MsgGenerator:
     chip_move = CHIP_MOVES[chip_type]
 
     if place == Fiducials.origin:
-        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0)
     if place == Fiducials.fid1:
-        yield from bps.mv(pmac.x, chip_move, pmac.y, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, chip_move, pmac.y, 0.0)
     if place == Fiducials.fid2:
-        yield from bps.mv(pmac.x, 0.0, pmac.y, chip_move)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 0.0, pmac.y, chip_move)
 
 
 @log_on_entry
@@ -580,7 +578,7 @@ def moveto_preset(
     elif place == "collect_position":
         SSX_LOGGER.info("collect position")
         caput(pv.me14e_filter, 20)
-        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0, pmac.z, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 0.0, pmac.y, 0.0, pmac.z, 0.0)
         yield from bps.abs_set(
             beamstop.pos_select, BeamstopPositions.DATA_COLLECTION, group=place
         )
@@ -589,7 +587,7 @@ def moveto_preset(
 
     elif place == "microdrop_position":
         SSX_LOGGER.info("microdrop align position")
-        yield from bps.mv(pmac.x, 6.0, pmac.y, -7.8, pmac.z, 0.0)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+        yield from bps.mv(pmac.x, 6.0, pmac.y, -7.8, pmac.z, 0.0)
 
 
 @log_on_entry
@@ -665,15 +663,15 @@ def fiducial(point: int = 1, pmac: PMAC = inject("pmac")) -> MsgGenerator:
     output_param_path.mkdir(parents=True, exist_ok=True)
     SSX_LOGGER.info(f"Writing Fiducial File {output_param_path}/fiducial_{point}.txt")
     SSX_LOGGER.info("MTR\tRBV\tRAW\tCorr\tf_value")
-    SSX_LOGGER.info(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:d}")
-    SSX_LOGGER.info(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:d}")
-    SSX_LOGGER.info(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:d}")
+    SSX_LOGGER.info(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:f}")
+    SSX_LOGGER.info(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:f}")
+    SSX_LOGGER.info(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:f}")
 
     with open(output_param_path / f"fiducial_{point}.txt", "w") as f:
         f.write("MTR\tRBV\tCorr\n")
-        f.write(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:d}\n")
-        f.write(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:d}\n")
-        f.write(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:d}")
+        f.write(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:f}\n")
+        f.write(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:f}\n")
+        f.write(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:f}")
     SSX_LOGGER.info(f"Fiducial {point} set.")
     yield from bps.null()
 
@@ -832,16 +830,16 @@ def cs_maker(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     SSX_LOGGER.info(f"{sqfact1:1.4f} \n {sqfact2:1.4f} \n {sqfact3:1.4f}")
     SSX_LOGGER.debug("Long wait, please be patient")
     yield from bps.trigger(pmac.to_xyz_zero)
-    sleep(2.5)
+    yield from bps.sleep(2.5)
     yield from set_pmac_strings_for_cs(pmac, {"cs1": cs1, "cs2": cs2, "cs3": cs3})
     yield from bps.trigger(pmac.to_xyz_zero)
-    sleep(2.5)
+    yield from bps.sleep(2.5)
     yield from bps.trigger(pmac.home, wait=True)
-    sleep(2.5)
+    yield from bps.sleep(2.5)
     SSX_LOGGER.debug(f"Chip_type is {chip_type}")
     if chip_type == 0:
         yield from bps.abs_set(pmac.pmac_string, "!x0.4y0.4", wait=True)
-        sleep(2.5)
+        yield from bps.sleep(2.5)
         yield from bps.trigger(pmac.home, wait=True)
     else:
         yield from bps.trigger(pmac.home, wait=True)
@@ -932,12 +930,12 @@ def block_check(pmac: PMAC = inject("pmac")) -> MsgGenerator:
             for entry in block_start_list:
                 if int(caget(pv.me14e_gp9)) != 0:
                     SSX_LOGGER.warning("Block Check Aborted")
-                    sleep(1.0)
+                    yield from bps.sleep(1.0)
                     break
                 block, x, y = entry
                 SSX_LOGGER.debug(f"Block: {block} -> (x={x} y={y})")
                 yield from bps.abs_set(pmac.pmac_string, f"!x{x}y{y}", wait=True)
-                time.sleep(0.4)
+                yield from bps.sleep(0.4)
         else:
             SSX_LOGGER.warning("Block Check Aborted due to GP 9 not equalling 0")
             break

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

@@ -33,8 +33,13 @@ def _get_beam_centre(oav: OAV):
 
 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)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
-    zoomcalibrator = 1.547 - (0.03 * currentzoom) + (0.0001634 * currentzoom**2)
+    currentzoom = yield from bps.rd(oav.zoom_controller.percentage)
+    zoomcalibrator = (
+        1.285
+        - (0.02866 * currentzoom)
+        + (0.00025 * currentzoom**2)
+        - (0.0000008151 * currentzoom**3)
+    )
     return zoomcalibrator
 
 
@@ -49,8 +54,10 @@ def _move_on_mouse_click_plan(
     zoomcalibrator = yield from _calculate_zoom_calibrator(oav)
     beamX, beamY = yield from _get_beam_centre(oav)
     x, y = clicked_position
-    xmove = -1 * (beamX - x) * zoomcalibrator
-    ymove = 1 * (beamY - y) * zoomcalibrator
+    xmove = -10 * (beamX - x) * zoomcalibrator
+    ymove = 10 * (beamY - y) * zoomcalibrator
+    SSX_LOGGER.info(f"Zoom calibrator {zoomcalibrator}")
+    SSX_LOGGER.info(f"Beam centre {beamX} {beamY}")
     SSX_LOGGER.info(f"Moving X and Y {xmove} {ymove}")
     xmovepmacstring = "#1J:" + str(xmove)
     ymovepmacstring = "#2J:" + str(ymove)

mx_bluesky/beamlines/i24/serial/parameters/constants.py

@@ -25,7 +25,7 @@ BEAM_CENTER_LUT_FILES = {
 
 
 OAV_CONFIG_FILES = {
-    "zoom_params_file": "/dls_sw/i24/software/gda_versions/gda_9_34/config/xml/jCameraManZoomLevels.xml",
+    "zoom_params_file": "/dls_sw/i24/software/gda_versions/gda_9_36/config/xml/jCameraManZoomLevels.xml",
     "oav_config_json": "/dls_sw/i24/software/daq_configuration/json/OAVCentring.json",
     "display_config": "/dls_sw/i24/software/gda_versions/var/display.configuration",
 }

mx_bluesky/beamlines/i24/serial/set_visit_directory.sh

@@ -35,7 +35,7 @@ if [[ "${visit: -1}" != "/" ]]; then
     visit="${visit}/"
 fi
 
-ex_pv=BL24I-EA-IOC-12:GP1
+ex_pv=BL24I-MO-IOC-13:GP1
 ft_pv=ME14E-MO-IOC-01:GP100
 
 shopt -s nocasematch

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

@@ -258,22 +258,22 @@ step09_pmac_response = "BL24I-MO-IOC-09:ASYN9.AINP"
 step10_pmac_response = "BL24I-MO-IOC-10:ASYN10.AINP"
 step11_pmac_response = "BL24I-MO-IOC-11:ASYN11.AINP"
 step12_pmac_response = "BL24I-MO-IOC-12:ASYN12.AINP"
-# General Purpose PV
-ioc12_gp1 = "BL24I-EA-IOC-12:GP1"
-ioc12_gp2 = "BL24I-EA-IOC-12:GP2"
-ioc12_gp3 = "BL24I-EA-IOC-12:GP3"
-ioc12_gp4 = "BL24I-EA-IOC-12:GP4"
-ioc12_gp5 = "BL24I-EA-IOC-12:GP5"
-ioc12_gp6 = "BL24I-EA-IOC-12:GP6"
-ioc12_gp7 = "BL24I-EA-IOC-12:GP7"
-ioc12_gp8 = "BL24I-EA-IOC-12:GP8"
-ioc12_gp9 = "BL24I-EA-IOC-12:GP9"
-ioc12_gp10 = "BL24I-EA-IOC-12:GP10"
-ioc12_gp11 = "BL24I-EA-IOC-12:GP11"
-ioc12_gp12 = "BL24I-EA-IOC-12:GP12"
-ioc12_gp13 = "BL24I-EA-IOC-12:GP13"
-ioc12_gp14 = "BL24I-EA-IOC-12:GP14"
-ioc12_gp15 = "BL24I-EA-IOC-12:GP15"
+# General Purpose PV. Now use STEP13
+ioc13_gp1 = "BL24I-MO-IOC-13:GP1"
+ioc13_gp2 = "BL24I-MO-IOC-13:GP2"
+ioc13_gp3 = "BL24I-MO-IOC-13:GP3"
+ioc13_gp4 = "BL24I-MO-IOC-13:GP4"
+ioc13_gp5 = "BL24I-MO-IOC-13:GP5"
+ioc13_gp6 = "BL24I-MO-IOC-13:GP6"
+ioc13_gp7 = "BL24I-MO-IOC-13:GP7"
+ioc13_gp8 = "BL24I-MO-IOC-13:GP8"
+ioc13_gp9 = "BL24I-MO-IOC-13:GP9"
+ioc13_gp10 = "BL24I-MO-IOC-13:GP10"
+ioc13_gp11 = "BL24I-MO-IOC-13:GP11"
+ioc13_gp12 = "BL24I-MO-IOC-13:GP12"
+ioc13_gp13 = "BL24I-MO-IOC-13:GP13"
+ioc13_gp14 = "BL24I-MO-IOC-13:GP14"
+ioc13_gp15 = "BL24I-MO-IOC-13:GP15"
 # ME14E
 me14e_pmac_str = "ME14E-MO-CHIP-01:PMAC_STRING"
 me14e_stage_x = "ME14E-MO-CHIP-01:X"

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

@@ -1,5 +1,4 @@
 from pathlib import Path
-from time import sleep
 
 import bluesky.plan_stubs as bps
 from dodal.beamlines import i24
@@ -84,7 +83,7 @@ def move_detector_stage_to_position_plan(
     SSX_LOGGER.debug(
         f"Waiting for detector move. Detector distance: {detector_distance} mm."
     )
-    yield from bps.mv(detector_stage.z, detector_distance)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(detector_stage.z, detector_distance)
 
 
 def set_detector_beam_center_plan(
@@ -149,9 +148,9 @@ def modechange(action):
         caput(pv.vgon_pinzs, 0)
         caput(pv.fluo_trans, "OUT")
         caput(pv.bs_roty, 0)
-        sleep(0.5)
+        yield from bps.sleep(0.5)
         caput(pv.bs_mp_select, "Data Collection")
-        sleep(2.3)
+        yield from bps.sleep(2.3)
         caput(pv.bl_mp_select, "In")
         SSX_LOGGER.debug("Pin Data Collection Done")
 
@@ -168,9 +167,9 @@ def modechange(action):
         caput(pv.vgon_pinyh, 0)
         caput(pv.vgon_pinzs, 0)
         caput(pv.fluo_trans, "OUT")
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         caput(pv.bs_roty, 0)
-        sleep(2.6)
+        yield from bps.sleep(2.6)
         caput(pv.bl_mp_select, "In")
         caput(pv.bs_mp_select, "Data Collection")
         SSX_LOGGER.debug("RT Data Collection Done")
@@ -182,11 +181,11 @@ def modechange(action):
         caput(pv.hgon_omega, 0.0)
         caput(pv.fluo_trans, "OUT")
         caput(pv.bl_mp_select, "Out")
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.aptr1_mp_select, "Manual Mounting")
         caput(pv.bs_mp_select, "Tray Mount")
         while float(caget(pv.ttab_x + ".RBV")) > 3:
-            sleep(1)
+            yield from bps.sleep(1)
         SSX_LOGGER.debug("Tray Hand Mount Done")
 
     # Tray Robot Load. This action needs to be reviewed and revised
@@ -199,15 +198,15 @@ def modechange(action):
         caput(pv.fluo_trans, "OUT")
         caput(pv.aptr1_mp_select, "In")
         caput(pv.bl_mp_select, "Out")
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_roty, 0)
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_mp_select, "Robot")
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_mp_select, "Data Collection Far")
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_roty, 0)
-        sleep(4)
+        yield from bps.sleep(4)
         caput(pv.bl_mp_select, "In")
         SSX_LOGGER.debug("Tray Robot Mount Done")
 
@@ -220,15 +219,15 @@ def modechange(action):
         caput(pv.aptr1_mp_select, "In")
         caput(pv.fluo_trans, "OUT")
         caput(pv.bl_mp_select, "Out")
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_roty, 0)
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_mp_select, "Robot")
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_mp_select, "Data Collection")
-        sleep(1)
+        yield from bps.sleep(1)
         caput(pv.bs_roty, 0)
-        sleep(4)
+        yield from bps.sleep(4)
         caput(pv.bl_mp_select, "In")
         SSX_LOGGER.debug("Tray Data Collection Done")
 
@@ -252,17 +251,17 @@ def modechange(action):
         caput(pv.vgon_pinzs, 0)
         while float(caget(pv.ttab_x + ".RBV")) > 1:
             SSX_LOGGER.debug(f"moving ttab_x {caget(pv.ttab_x)}")
-            sleep(0.1)
+            yield from bps.sleep(0.1)
         while caget(pv.fluo_out_limit) == "OFF":
             SSX_LOGGER.debug("waiting on fluorescence detector")
-            sleep(0.1)
+            yield from bps.sleep(0.1)
         while caget(pv.bl_mp_select) != "Out":
             SSX_LOGGER.debug("waiting on back light to move to out")
-            sleep(0.1)
+            yield from bps.sleep(0.1)
         caput(pv.bs_mp_select, "Robot")
         caput(pv.bs_roty, 0)
         while float(caget(pv.ptab_y + ".RBV")) > -89.0:
-            sleep(1)
+            yield from bps.sleep(1)
         SSX_LOGGER.debug("Switch To Tray Done")
 
     # Tray Switch to Pin
@@ -272,11 +271,11 @@ def modechange(action):
         caput(pv.hgon_trayys, 0.0)
         caput(pv.hgon_trayzs, 0.0)
         while float(caget(pv.ttab_x + ".RBV")) > 1.0:
-            sleep(1)
+            yield from bps.sleep(1)
         caput(pv.ptab_y, 0)
         while float(caget(pv.ptab_y + ".RBV")) < -1.0:
-            sleep(1)
-        modechange("Pin_data_collection")
+            yield from bps.sleep(1)
+        yield from modechange("Pin_data_collection")
         SSX_LOGGER.debug("Switch To Pin Done")
     else:
         SSX_LOGGER.debug(f"Unknown action: {action}")
@@ -323,9 +322,9 @@ def pilatus(action, args_list):
         [filepath, filename, num_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         caput(pv.pilat_filepath, rampath)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         caput(pv.pilat_filename, filename)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         acqtime = float(exptime) - 0.001
         caput(pv.pilat_acquiretime, str(acqtime))
         caput(pv.pilat_acquireperiod, str(exptime))
@@ -336,21 +335,21 @@ def pilatus(action, args_list):
         SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
         SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
         SSX_LOGGER.debug("Pilatus takes time apprx 2sec")
-        sleep(2)
+        yield from bps.sleep(2)
         caput(pv.pilat_delaytime, 0.00)
         caput(pv.pilat_numimages, str(num_imgs))
         caput(pv.pilat_imagemode, "Continuous")
         caput(pv.pilat_triggermode, "Ext. Trigger")
-        sleep(0.2)
+        yield from bps.sleep(0.2)
 
     elif action == "quickshot-internaltrig":
         SSX_LOGGER.debug("quickshot-internaltrig")
         [filepath, filename, num_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         caput(pv.pilat_filepath, rampath)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         caput(pv.pilat_filename, filename)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         acqtime = float(exptime) - 0.001
         caput(pv.pilat_acquiretime, str(acqtime))
         caput(pv.pilat_acquireperiod, str(exptime))
@@ -361,12 +360,12 @@ def pilatus(action, args_list):
         SSX_LOGGER.debug(f"Exposure time set as {exptime} s")
         SSX_LOGGER.debug(f"Acquire time set as {acqtime} s")
         SSX_LOGGER.debug("Pilatus takes time apprx 2sec")
-        sleep(2)
+        yield from bps.sleep(2)
         caput(pv.pilat_delaytime, 0.00)
         caput(pv.pilat_numimages, str(num_imgs))
         caput(pv.pilat_imagemode, "Continuous")
         caput(pv.pilat_triggermode, "Internal")
-        sleep(0.2)
+        yield from bps.sleep(0.2)
 
     # Put it all back to GDA acceptable defaults
     elif action == "return to normal":
@@ -374,7 +373,7 @@ def pilatus(action, args_list):
         caput(pv.pilat_triggermode, "Ext. Trigger")
         caput(pv.pilat_numexpimage, 1)
     SSX_LOGGER.debug("***** leaving pilatus")
-    sleep(0.1)
+    yield from bps.sleep(0.1)
     return 0
 
 
@@ -388,7 +387,7 @@ def eiger(action, args_list):
     caput(pv.eiger_detdist, str(float(caget(pv.det_z)) / 1000))
     caput(pv.eiger_wavelength, caget(pv.dcm_lambda))
     caput(pv.eiger_omegaincr, 0.0)
-    sleep(0.1)
+    yield from bps.sleep(0.1)
     # Setup common to all collections ###
     caput(pv.eiger_filewriter, "No")
     caput(pv.eiger_stream, "Yes")
@@ -409,9 +408,9 @@ def eiger(action, args_list):
         [filepath, filename, num_imgs, exptime] = args_list
         filename = filename + "_" + str(caget(pv.eiger_seqID))
         caput(pv.eiger_ODfilepath, filepath)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         caput(pv.eiger_ODfilename, filename)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
         SSX_LOGGER.debug(f"Filepath was set as {filepath}")
@@ -425,7 +424,7 @@ def eiger(action, args_list):
         caput(pv.eiger_triggermode, "Internal Series")
         caput(pv.eiger_numtriggers, 1)
         caput(pv.eiger_manualtrigger, "Yes")
-        sleep(1.0)
+        yield from bps.sleep(1.0)
         # ODIN setup
         SSX_LOGGER.info("Setting up Odin")
         caput(pv.eiger_ODfilename, filename)
@@ -435,7 +434,7 @@ def eiger(action, args_list):
         eigerbdrbv = "UInt" + str(caget(pv.eiger_bitdepthrbv))
         caput(pv.eiger_ODdatatype, eigerbdrbv)
         caput(pv.eiger_ODcompress, "BSL24")
-        sleep(1.0)
+        yield from bps.sleep(1.0)
         # All done. Now get Odin to wait for data and start Eiger
         SSX_LOGGER.info("Done: Odin waiting for data")
         caput(pv.eiger_ODcapture, "Capture")
@@ -451,9 +450,9 @@ def eiger(action, args_list):
         [filepath, filename, num_imgs, exptime] = args_list
         filename = filename + "_" + str(caget(pv.eiger_seqID))
         caput(pv.eiger_ODfilepath, filepath)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         caput(pv.eiger_ODfilename, filename)
-        sleep(0.1)
+        yield from bps.sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
         SSX_LOGGER.debug(f"Filepath was set as {filepath}")
@@ -467,7 +466,7 @@ def eiger(action, args_list):
         caput(pv.eiger_triggermode, "External Enable")
         caput(pv.eiger_numtriggers, str(num_imgs))
         caput(pv.eiger_manualtrigger, "Yes")
-        sleep(1.0)
+        yield from bps.sleep(1.0)
         # ODIN setup #
         SSX_LOGGER.info("Setting up Odin")
         caput(pv.eiger_ODfilename, filename)
@@ -477,7 +476,7 @@ def eiger(action, args_list):
         eigerbdrbv = "UInt" + str(caget(pv.eiger_bitdepthrbv))
         caput(pv.eiger_ODdatatype, eigerbdrbv)
         caput(pv.eiger_ODcompress, "BSL24")
-        sleep(1.0)
+        yield from bps.sleep(1.0)
         # All done. Now get Odin to wait for data and start Eiger
         SSX_LOGGER.info("Done: Odin waiting for data")
         caput(pv.eiger_ODcapture, "Capture")
@@ -492,7 +491,7 @@ def eiger(action, args_list):
         caput(pv.eiger_manualtrigger, "No")
         # caput(pv.eiger_seqID, int(caget(pv.eiger_seqID))+1)
     SSX_LOGGER.debug("***** leaving Eiger")
-    sleep(0.1)
+    yield from bps.sleep(0.1)
     return 0
 
 
@@ -510,10 +509,10 @@ def xspress3(action, args_list):
         caput(pv.xsp3_acquiretime, exp_time)
         caput(pv.xsp3_c1_mca_roi1_llm, lo)
         caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        sleep(0.2)
+        yield from bps.sleep(0.2)
         caput(pv.xsp3_c1_mca_roi1_llm, lo)
         caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        sleep(0.2)
+        yield from bps.sleep(0.2)
         caput(pv.xsp3_erase, 0)
 
     elif action == "on-the-fly":
@@ -522,10 +521,10 @@ def xspress3(action, args_list):
         caput(pv.xsp3_numimages, num_frms)
         caput(pv.xsp3_c1_mca_roi1_llm, lo)
         caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        sleep(0.2)
+        yield from bps.sleep(0.2)
         caput(pv.xsp3_c1_mca_roi1_llm, lo)
         caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        sleep(0.2)
+        yield from bps.sleep(0.2)
         caput(pv.xsp3_erase, 0)
 
     elif action == "return-to-normal":
@@ -539,6 +538,6 @@ def xspress3(action, args_list):
     else:
         SSX_LOGGER.error("Unknown action for xspress3 method:", action)
 
-    sleep(0.1)
+    yield from bps.sleep(0.1)
     SSX_LOGGER.debug("***** leaving xspress3")
     return 1

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

@@ -22,7 +22,7 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.pv_abstract import (
 
 EXPT_TYPE_DETECTOR_PVS = {
     SSXType.FIXED: pv.me14e_gp101,
-    SSXType.EXTRUDER: pv.ioc12_gp15,
+    SSXType.EXTRUDER: pv.ioc13_gp15,
 }
 
 
@@ -55,7 +55,7 @@ def get_detector_type(detector_stage: DetectorMotion) -> Generator[Msg, None, De
 
 def _move_detector_stage(detector_stage: DetectorMotion, target: float) -> MsgGenerator:
     SSX_LOGGER.info(f"Moving detector stage to target position: {target}.")
-    yield from bps.mv(detector_stage.y, target)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
+    yield from bps.mv(detector_stage.y, target)
 
 
 # Workaround in case the PV value has been set to the detector name