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

mx_bluesky/{I24 → i24}/serial/setup_beamline/setup_beamline.py

@@ -1,12 +1,50 @@
 import logging
 from time import sleep
 
-from mx_bluesky.I24.serial.setup_beamline import pv
-from mx_bluesky.I24.serial.setup_beamline.ca import caget, caput
+import bluesky.plan_stubs as bps
+from dodal.devices.i24.aperture import Aperture, AperturePositions
+from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
+from dodal.devices.i24.i24_detector_motion import DetectorMotion
+
+from mx_bluesky.i24.serial.setup_beamline import pv
+from mx_bluesky.i24.serial.setup_beamline.ca import caget, caput
 
 logger = logging.getLogger("I24ssx.sup")
 
 
+def setup_beamline_for_collection_plan(
+    aperture: Aperture,
+    backlight: DualBacklight,
+    beamstop: Beamstop,
+    group: str = "setup_beamline_collect",
+    wait: bool = True,
+):
+    logger.debug("Setup beamline: collect.")
+    yield from bps.abs_set(aperture.position, AperturePositions.IN, group=group)
+    yield from bps.abs_set(backlight, BacklightPositions.OUT, group=group)
+    yield from bps.sleep(3)  # Not sure needed - to test
+    yield from bps.abs_set(
+        beamstop.pos_select, BeamstopPositions.DATA_COLLECTION, group=group
+    )
+    yield from bps.abs_set(beamstop.y_rotation, 0, group=group)
+    yield from bps.sleep(4)  # Not sure needed - to test
+
+    if wait:
+        yield from bps.wait(group=group)
+
+
+def move_detector_stage_to_position_plan(
+    detector_stage: DetectorMotion,
+    detector_distance: float,
+):
+    logger.debug("Setup beamline: moving detector stage.")
+    logger.debug(
+        f"Waiting for detector move. Detector distance: {detector_distance} mm."
+    )
+    yield from bps.mv(detector_stage.z, detector_distance)
+
+
 def modechange(action):
     """Mode Change"""
     # Pin Hand Mount
@@ -88,7 +126,7 @@ def modechange(action):
         sleep(1)
         caput(pv.aptr1_mp_select, "Manual Mounting")
         caput(pv.bs_mp_select, "Tray Mount")
-        while caget(pv.ttab_x + ".RBV") > 3:
+        while float(caget(pv.ttab_x + ".RBV")) > 3:
             sleep(1)
         logger.debug("Tray Hand Mount Done")
 
@@ -153,8 +191,8 @@ def modechange(action):
         caput(pv.vgon_pinxs, 0)
         caput(pv.vgon_pinyh, 0)
         caput(pv.vgon_pinzs, 0)
-        while caget(pv.ttab_x + ".RBV") > 1:
-            logger.debug("moving ttab_x %s" % caget(pv.ttab_x))
+        while float(caget(pv.ttab_x + ".RBV")) > 1:
+            logger.debug(f"moving ttab_x {caget(pv.ttab_x)}")
             sleep(0.1)
         while caget(pv.fluo_out_limit) == "OFF":
             logger.debug("waiting on fluorescence detector")
@@ -164,7 +202,7 @@ def modechange(action):
             sleep(0.1)
         caput(pv.bs_mp_select, "Robot")
         caput(pv.bs_roty, 0)
-        while caget(pv.ptab_y + ".RBV") > -89.0:
+        while float(caget(pv.ptab_y + ".RBV")) > -89.0:
             sleep(1)
         logger.debug("Switch To Tray Done")
 
@@ -174,75 +212,24 @@ def modechange(action):
         # Supposed to absorb pin laser
         caput(pv.hgon_trayys, 0.0)
         caput(pv.hgon_trayzs, 0.0)
-        while caget(pv.ttab_x + ".RBV") > 1.0:
+        while float(caget(pv.ttab_x + ".RBV")) > 1.0:
             sleep(1)
         caput(pv.ptab_y, 0)
-        while caget(pv.ptab_y + ".RBV") < -1.0:
+        while float(caget(pv.ptab_y + ".RBV")) < -1.0:
             sleep(1)
         modechange("Pin_data_collection")
         logger.debug("Switch To Pin Done")
     else:
-        logger.debug("Unknown action: %s" % action)
+        logger.debug(f"Unknown action: {action}")
     return 1
 
 
-def beamline(action, args_list=None):
-    logger.debug("***** Entering Beamline")
-    logger.info("beamline - %s" % action)
-    if args_list:
-        for arg in args_list:
-            logger.debug("Argument: %s" % arg)
-
-    if action == "collect":
-        caput(pv.aptr1_mp_select, "In")
-        caput(pv.bl_mp_select, "Out")
-        sleep(3)
-        caput(pv.bs_mp_select, "Data Collection")
-        caput(pv.bs_roty, 0)
-        sleep(4)
-
-    elif action == "quickshot":
-        det_dist = args_list[0]
-        caput(pv.det_z, det_dist)
-        logger.info("Waiting on detector")
-        logger.debug("Detector distance: %s" % det_dist)
-        logger.debug("det_z: %s" % caget(pv.det_z + ".RBV"))
-        while str(int(float(caget(pv.det_z + ".RBV")))) != str(int(float(det_dist))):
-            caput(pv.det_z, det_dist)
-            sleep(0.2)
-
-    elif action == "zlayer":
-        det_dist = args_list[0]
-        caput(pv.det_z, det_dist)
-        caput(pv.fluo_trans, "IN")
-        caput(pv.bl_mp_select, "Out")
-        caput(pv.aptr1_mp_select, "In")
-        caput(pv.bs_mp_select, "Data Collection")
-        logger.info("Moving backlight out before rotating beamstop in")
-        sleep(3)
-        caput(pv.bs_roty, 0)
-        logger.info("Waiting on detector")
-        while str(int(caget(pv.det_z + ".RBV"))) != str(int(float(det_dist))):
-            caput(pv.det_z, det_dist)
-            sleep(0.2)
-        logger.info("Waiting for Fluorescence Detector")
-        while caget(pv.fluo_in_limit) != "OFF":
-            print(".", end=" ")
-            sleep(0.25)
-
-    else:
-        logger.warning("Unknown action for beamline method", action)
-    sleep(0.1)
-    logger.debug("***** leaving beamline\n")
-    return 1
-
-
-def pilatus(action, args_list=None):
+def pilatus(action, args_list):
     logger.debug("***** Entering Pilatus")
-    logger.info("pilatus - %s" % action)
+    logger.info(f"Setup pilatus - {action}")
     if args_list:
         for arg in args_list:
-            logger.debug("Argument: %s" % arg)
+            logger.debug(f"Argument: {arg}")
 
     # caput(pv.pilat_wavelength, caget(pv.dcm_lambda))
     caput(pv.pilat_detdist, caget(pv.det_z))
@@ -253,36 +240,17 @@ def pilatus(action, args_list=None):
     caput(pv.pilat_beamy, 1307)
     sleep(0.1)
 
-    if action == "zlayer":
-        [filepath, filename, total_numb_imgs, exptime] = args_list
-        rampath = filepath.replace("dls/i24/data", "ramdisk")
-        acqtime = exptime - 0.001
-        logger.info("Filepath was set as %s" % filepath)
-        logger.info("Rampath set as %s" % rampath)
-        logger.info("Filename set as %s" % filename)
-        logger.info("total_numb_imgs %s" % total_numb_imgs)
-        logger.info("Exposure time set as %s s" % exptime)
-        logger.info("Acquire time set as %s s" % acqtime)
-        caput(pv.pilat_filepath, rampath + filename + "/")
-        caput(pv.pilat_filename, filename)
-        caput(pv.pilat_numimages, str(total_numb_imgs))
-        caput(pv.pilat_acquiretime, str(acqtime))
-        caput(pv.pilat_acquireperiod, str(exptime))
-        caput(pv.pilat_imagemode, "Continuous")
-        caput(pv.pilat_triggermode, "Mult. Trigger")
-        caput(pv.pilat_delaytime, 0)
-
     # Fixed Target stage (very fast start and stop w/ triggering from GeoBrick
-    elif action == "fastchip":
+    if action == "fastchip":
         [filepath, filename, total_numb_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         acqtime = float(exptime) - 0.001
-        logger.info("Filepath was set as %s" % filepath)
-        logger.info("Rampath set as %s" % rampath)
-        logger.info("Filename set as %s" % filename)
-        logger.info("total_numb_imgs %s" % total_numb_imgs)
-        logger.info("Exposure time set as %s s" % exptime)
-        logger.info("Acquire time set as %s s" % acqtime)
+        logger.debug(f"Filepath was set as {filepath}")
+        logger.debug(f"Rampath set as {rampath}")
+        logger.debug(f"Filename set as {filename}")
+        logger.debug(f"total_numb_imgs {total_numb_imgs}")
+        logger.debug(f"Exposure time set as {exptime} s")
+        logger.debug(f"Acquire time set as {acqtime} s")
         caput(pv.pilat_startangle, 0.0)
         caput(pv.pilat_angleincr, 0.0)
         caput(pv.pilat_omegaincr, 0.0)
@@ -297,7 +265,7 @@ def pilatus(action, args_list=None):
 
     # Quick set of images no coordinated motion
     elif action == "quickshot":
-        print("quickshot")
+        logger.debug("quickshot")
         [filepath, filename, num_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         caput(pv.pilat_filepath, rampath)
@@ -307,13 +275,13 @@ def pilatus(action, args_list=None):
         acqtime = float(exptime) - 0.001
         caput(pv.pilat_acquiretime, str(acqtime))
         caput(pv.pilat_acquireperiod, str(exptime))
-        logger.info("Filepath was set as %s" % filepath)
-        logger.info("Rampath set as %s" % rampath)
-        logger.info("Filename set as %s" % filename)
-        logger.info("num_imgs %s" % num_imgs)
-        logger.info("Exposure time set as %s s" % exptime)
-        logger.info("Acquire time set as %s s" % acqtime)
-        logger.info("Pilatus takes time apprx 2sec")
+        logger.debug(f"Filepath was set as {filepath}")
+        logger.debug(f"Rampath set as {rampath}")
+        logger.debug(f"Filename set as {filename}")
+        logger.debug(f"num_imgs {num_imgs}")
+        logger.debug(f"Exposure time set as {exptime} s")
+        logger.debug(f"Acquire time set as {acqtime} s")
+        logger.debug("Pilatus takes time apprx 2sec")
         sleep(2)
         caput(pv.pilat_delaytime, 0.00)
         caput(pv.pilat_numimages, str(num_imgs))
@@ -322,7 +290,7 @@ def pilatus(action, args_list=None):
         sleep(0.2)
 
     elif action == "quickshot-internaltrig":
-        print("quickshot")
+        logger.debug("quickshot-internaltrig")
         [filepath, filename, num_imgs, exptime] = args_list
         rampath = filepath.replace("dls/i24/data", "ramdisk")
         caput(pv.pilat_filepath, rampath)
@@ -332,13 +300,13 @@ def pilatus(action, args_list=None):
         acqtime = float(exptime) - 0.001
         caput(pv.pilat_acquiretime, str(acqtime))
         caput(pv.pilat_acquireperiod, str(exptime))
-        logger.info("Filepath was set as %s" % filepath)
-        logger.info("Rampath set as %s" % rampath)
-        logger.info("Filename set as %s" % filename)
-        logger.info("num_imgs %s" % num_imgs)
-        logger.info("Exposure time set as %s s" % exptime)
-        logger.info("Acquire time set as %s s" % acqtime)
-        logger.info("Pilatus takes time apprx 2sec")
+        logger.debug(f"Filepath was set as {filepath}")
+        logger.debug(f"Rampath set as {rampath}")
+        logger.debug(f"Filename set as {filename}")
+        logger.debug(f"num_imgs {num_imgs}")
+        logger.debug(f"Exposure time set as {exptime} s")
+        logger.debug(f"Acquire time set as {acqtime} s")
+        logger.debug("Pilatus takes time apprx 2sec")
         sleep(2)
         caput(pv.pilat_delaytime, 0.00)
         caput(pv.pilat_numimages, str(num_imgs))
@@ -356,12 +324,12 @@ def pilatus(action, args_list=None):
     return 0
 
 
-def eiger(action, args_list=None):
+def eiger(action, args_list):
     logger.debug("***** Entering Eiger")
-    logger.info("eiger - %s" % action)
+    logger.info(f"Setup eiger - {action}")
     if args_list:
         for arg in args_list:
-            logger.debug("Argument: %s" % arg)
+            logger.debug(f"Argument: {arg}")
     # caput(pv.eiger_wavelength, caget(pv.dcm_lambda))
     caput(pv.eiger_detdist, str(float(caget(pv.det_z)) / 1000))
     logger.warning("WARNING: Have you set header info?")
@@ -386,7 +354,7 @@ def eiger(action, args_list=None):
     # Quick set of images no coordinated motion
     if action == "quickshot":
         # Sends a single trigger to start data collection
-        logger.info("Eiger quickshot")
+        logger.debug("Eiger quickshot")
         [filepath, filename, num_imgs, exptime] = args_list
         filename = filename + "_" + str(caget(pv.eiger_seqID))
         caput(pv.eiger_ODfilepath, filepath)
@@ -395,11 +363,11 @@ def eiger(action, args_list=None):
         sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
-        logger.info("Filepath was set as %s" % filepath)
-        logger.info("Filename set as %s" % filename)
-        logger.info("num_imgs %s" % num_imgs)
-        logger.info("Exposure time set as %s s" % exptime)
-        logger.info("Acquire time set as %s s" % acqtime)
+        logger.debug(f"Filepath was set as {filepath}")
+        logger.debug(f"Filename set as {filename}")
+        logger.debug(f"num_imgs {num_imgs}")
+        logger.debug(f"Exposure time set as {exptime} s")
+        logger.debug(f"Acquire time set as {acqtime} s")
         caput(pv.eiger_acquireperiod, str(exptime))
         caput(pv.eiger_numimages, str(num_imgs))
         caput(pv.eiger_imagemode, "Continuous")
@@ -437,11 +405,11 @@ def eiger(action, args_list=None):
         sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
-        logger.info("Filepath was set as %s" % filepath)
-        logger.info("Filename set as %s" % filename)
-        logger.info("num_imgs %s" % num_imgs)
-        logger.info("Exposure time set as %s s" % exptime)
-        logger.info("Acquire time set as %s s" % acqtime)
+        logger.debug(f"Filepath was set as {filepath}")
+        logger.debug(f"Filename set as {filename}")
+        logger.debug(f"num_imgs {num_imgs}")
+        logger.debug(f"Exposure time set as {exptime} s")
+        logger.debug(f"Acquire time set as {acqtime} s")
         caput(pv.eiger_acquireperiod, str(exptime))
         caput(pv.eiger_numimages, 1)
         caput(pv.eiger_imagemode, "Continuous")
@@ -477,12 +445,12 @@ def eiger(action, args_list=None):
     return 0
 
 
-def xspress3(action, args_list=None):
+def xspress3(action, args_list):
     logger.debug("***** Entering xspress3")
-    logger.info("xspress3 - %s" % action)
+    logger.info(f"xspress3 - {action}")
     if args_list:
         for arg in args_list:
-            logger.debug("Argument: %s" % arg)
+            logger.debug(f"Argument: {arg}")
 
     if action == "stop-and-start":
         [exp_time, lo, hi] = args_list
@@ -509,12 +477,6 @@ def xspress3(action, args_list=None):
         sleep(0.2)
         caput(pv.xsp3_erase, 0)
 
-    elif action == "zlayer":
-        [filepath, filename, total_numb_images] = args_list
-        caput(pv.xsp3_hdf5_filepath, filepath)
-        caput(pv.xsp3_hdf5_filename, filename)
-        caput(pv.xsp3_numimages, total_numb_images)
-
     elif action == "return-to-normal":
         caput(pv.xsp3_triggermode, "TTL Veto Only")
         caput(pv.xsp3_numimages, 1)
@@ -529,144 +491,3 @@ def xspress3(action, args_list=None):
     sleep(0.1)
     logger.debug("***** leaving xspress3")
     return 1
-
-
-def zebra1(action, args_list=None):
-    logger.debug("***** Entering zebra1")
-    logger.info("zebra1 - %s" % action)
-    if args_list:
-        for arg in args_list:
-            logger.debug("Argument: %s" % arg)
-
-    if action == "zlayer":
-        caput(pv.zebra1_soft_in_b2, "0")
-        caput(pv.zebra1_soft_in_b3, "0")
-        caput(pv.zebra1_pc_gate_sel, "External")
-        caput(pv.zebra1_pc_gate_inp, "62")
-        caput(pv.zebra1_pc_pulse_sel, "External")
-        caput(pv.zebra1_pc_pulse_inp, "1")
-        caput(pv.zebra1_and3_inp1, "29")
-        caput(pv.zebra1_and3_inp2, "1")
-        caput(pv.zebra1_out2_ttl, "34")
-        caput(pv.zebra1_out3_ttl, "52")
-        caput(pv.zebra1_out4_ttl, "35")
-
-    elif action == "quickshot":
-        [gate_start, gate_width] = args_list
-        # Trig Source is soft SOFT_IN2
-        caput(pv.zebra1_pc_arm_sel, "Soft")
-        caput(pv.zebra1_pc_gate_sel, "Time")
-        caput(pv.zebra1_pc_pulse_sel, "External")
-        caput(pv.zebra1_pc_gate_start, gate_start)
-        caput(pv.zebra1_pc_gate_width, gate_width)
-        caput(pv.zebra1_pc_gate_inp, "61")
-        sleep(0.1)
-        caput(pv.zebra1_pc_gate_inp, "61")
-        sleep(0.1)
-
-    elif action == "fastchip-pilatus":
-        [num_gates, n_exposures, exptime] = args_list
-        caput(pv.zebra1_soft_in_b0, "0")
-        caput(pv.zebra1_pc_gate_sel, "External")
-        caput(pv.zebra1_pc_pulse_sel, "Time")
-        caput(pv.zebra1_and3_inp1, "61")
-        caput(pv.zebra1_and3_inp2, "31")
-        caput(pv.zebra1_out2_ttl, "34")
-        caput(pv.zebra1_pc_gate_inp, "7")
-        caput(pv.zebra1_pc_gate_ngate, num_gates)
-        caput(pv.zebra1_pc_pulse_start, "0")
-        exptimestep = float(exptime) + 0.0001  # Miss some triggers if no 100us buffer
-        caput(pv.zebra1_pc_pulse_step, exptimestep)
-        pulse_width = float(exptime) / 2  # sawtooth. nb won't work for Eiger
-        caput(pv.zebra1_pc_pulse_width, pulse_width)
-        caput(pv.zebra1_pc_pulse_max, n_exposures)
-
-    elif action == "fastchip-eiger":
-        [num_gates, n_exposures, exptime] = args_list
-        caput(pv.zebra1_soft_in_b0, "0")
-        caput(pv.zebra1_pc_gate_sel, "External")
-        caput(pv.zebra1_pc_pulse_sel, "Time")
-        caput(pv.zebra1_and3_inp1, "61")
-        caput(pv.zebra1_and3_inp2, "31")
-        caput(pv.zebra1_out1_ttl, "34")
-        caput(pv.zebra1_pc_gate_inp, "7")
-        caput(pv.zebra1_pc_gate_ngate, num_gates)
-        caput(pv.zebra1_pc_pulse_start, "0")
-        exptimestep = float(exptime) + 0.0001  # Miss some triggers if no 100us buffer
-        caput(pv.zebra1_pc_pulse_step, exptimestep)
-        pulse_width = float(exptime) - 0.0001  # sawtooth with small drop for eiger
-        caput(pv.zebra1_pc_pulse_width, pulse_width)
-        caput(pv.zebra1_pc_pulse_max, n_exposures)
-
-    elif action == "return-to-normal":
-        caput(pv.zebra1_pc_disarm, 1)
-        sleep(0.1)
-        caput(pv.zebra1_reset_proc, 1)
-        sleep(0.5)
-        caput(pv.zebra1_pc_disarm, 1)
-        caput(pv.zebra1_pc_gate_sel, "Position")
-        caput(pv.zebra1_pc_pulse_sel, "Position")
-        caput(pv.zebra1_pc_gate_inp, "62")
-        caput(pv.zebra1_pc_gate_ngate, "1")
-        caput(pv.zebra1_pc_pulse_inp, "0")
-        caput(pv.zebra1_and3_inp1, "29")
-        caput(pv.zebra1_and3_inp2, "1")
-        caput(pv.zebra1_out2_ttl, "30")
-        caput(pv.zebra1_out3_ttl, "0")
-        caput(pv.zebra1_out4_ttl, "36")  # 61
-        caput(pv.zebra1_pc_enc, "Enc2")
-        caput(pv.zebra1_pc_dir, "Positive")
-        caput(pv.zebra1_pc_gate_start, "0.0")
-        caput(pv.zebra1_pc_pulse_width, "0.0")
-        caput(pv.zebra1_pc_pulse_step, "0.0")
-        # caput(pv.zebra1_out3_ttl, '30')
-        caput(pv.zebra1_pulse1_inp, "0")
-        caput(pv.zebra1_pulse2_inp, "0")
-
-    else:
-        logger.error("Unknown action for zebra1 method", action)
-        sleep(0.1)
-    logger.debug("***** leaving zebra1")
-    return 1
-
-
-def geobrick(action, args_list=None):
-    logger.debug("***** Entering Geobrick 10")
-    logger.info("geobrick - %s" % action)
-    if args_list:
-        for arg in args_list:
-            logger.debug("Argument: %s" % arg)
-
-    if action == "zlayer":
-        caput(pv.step10_pmac_str, "I5450 = 1")
-        # disable motors in normal coordinate system
-        caput(pv.step10_pmac_str, "&2#1-> 0")  # PINZ
-        caput(pv.step10_pmac_str, "&2#3-> 0")  # PINX
-        caput(pv.step10_pmac_str, "&2#2-> 0")  # omega
-        # disable killing of axes
-        caput(pv.step10_pmac_str, "P701 = 0")  # PINZ
-        caput(pv.step10_pmac_str, "P703 = 0")  # PINX
-        caput(pv.step10_pmac_str, "P709 = 0")  # PINY
-        caput(pv.step10_pmac_str, "#1J/")  # PINZ
-        caput(pv.step10_pmac_str, "#3J/")  # PINX
-        caput(pv.step10_pmac_str, "#9J/")  # PINY
-        # disable kinematic calculation
-        caput(pv.step10_pmac_str, "I5450 = 0")
-
-    elif action == "return-to-normal":
-        # disable fast grid scan motors
-        caput(pv.step10_pmac_str, "&4#1-> 0")  # PINZ
-        caput(pv.step10_pmac_str, "&4#3-> 0")  # PINX
-        caput(pv.step10_pmac_str, "&4#9-> 0")  # PINY
-        # enable normal coordinate system motors
-        caput(pv.step10_pmac_str, "&2#1-> I")  # PINZ
-        caput(pv.step10_pmac_str, "&2#3-> I")  # PINX
-        caput(pv.step10_pmac_str, "&2#2-> I")  # omega
-        # re-enable killing of axes
-        caput(pv.step10_pmac_str, "P701 = 2000")  # PINZ
-        caput(pv.step10_pmac_str, "P703 = 2000")  # PINX
-        caput(pv.step10_pmac_str, "P709 = 2000")  # PINY
-        # re-enable kinematic calculation
-        caput(pv.step10_pmac_str, "I5450 = 1")
-    logger.debug("***** leaving geobrick")
-    return 1

mx_bluesky/{I24 → i24}/serial/setup_beamline/setup_detector.py

@@ -1,21 +1,23 @@
 """
 Utilities for defining the detector in use, and moving the stage.
 """
-import argparse
+
 import logging
 import time
+from collections.abc import Generator
 from enum import IntEnum
 
 import bluesky.plan_stubs as bps
-from bluesky.run_engine import RunEngine
-from dodal.beamlines import i24
-from dodal.devices.i24.I24_detector_motion import DetectorMotion
-
-from mx_bluesky.I24.serial import log
-from mx_bluesky.I24.serial.parameters.constants import SSXType
-from mx_bluesky.I24.serial.setup_beamline import pv
-from mx_bluesky.I24.serial.setup_beamline.ca import caget
-from mx_bluesky.I24.serial.setup_beamline.pv_abstract import (
+from blueapi.core import MsgGenerator
+from bluesky.utils import Msg
+from dodal.common import inject
+from dodal.devices.i24.i24_detector_motion import DetectorMotion
+
+from mx_bluesky.i24.serial import log
+from mx_bluesky.i24.serial.parameters import SSXType
+from mx_bluesky.i24.serial.setup_beamline import pv
+from mx_bluesky.i24.serial.setup_beamline.ca import caget
+from mx_bluesky.i24.serial.setup_beamline.pv_abstract import (
     Detector,
     Eiger,
     Pilatus,
@@ -33,6 +35,9 @@ class DetRequest(IntEnum):
     eiger = 0
     pilatus = 1
 
+    def __str__(self) -> str:
+        return self.name
+
 
 def setup_logging():
     logfile = time.strftime("SSXdetectorOps_%d%B%y.log").lower()
@@ -43,8 +48,8 @@ class UnknownDetectorType(Exception):
     pass
 
 
-def get_detector_type() -> Detector:
-    det_y = caget(pv.det_y)
+def get_detector_type(detector_stage: DetectorMotion) -> Generator[Msg, None, Detector]:
+    det_y = yield from bps.rd(detector_stage.y)
     # DetectorMotion should also be used for this.
     # This should be part of https://github.com/DiamondLightSource/mx_bluesky/issues/51
     if float(det_y) < Eiger.det_y_threshold:
@@ -58,43 +63,45 @@ def get_detector_type() -> Detector:
         raise UnknownDetectorType("Detector not found.")
 
 
-def _move_detector_stage(detector_stage: DetectorMotion, target: float):
+def _move_detector_stage(detector_stage: DetectorMotion, target: float) -> MsgGenerator:
     logger.info(f"Moving detector stage to target position: {target}.")
-    yield from bps.abs_set(
-        detector_stage.y,
-        target,
-        wait=True,
-    )
+    yield from bps.mv(detector_stage.y, target)
+
+
+# Workaround in case the PV value has been set to the detector name
+def _get_requested_detector(det_type_pv: str) -> str:
+    """Get the requested detector name from the PV value.
+
+    Args:
+        det_type_pv (str): PV associated to the detector request. This is usually a \
+            general purpose PV set up for the serial collection which could contain \
+            a string or and int.
+
+    Returns:
+        str: The detector name as a string, currently "eiger" or "pilatus".
+    """
+    det_type = caget(det_type_pv)
+    if det_type in ["pilatus", "eiger"]:
+        return det_type
+    else:
+        try:
+            det_type = int(det_type)
+            return str(DetRequest(det_type))
+        except ValueError:
+            raise
 
 
-def setup_detector_stage(detector_stage: DetectorMotion, expt_type: SSXType):
+def setup_detector_stage(
+    expt_type: SSXType, detector_stage: DetectorMotion = inject("detector_motion")
+) -> MsgGenerator:
+    setup_logging()
     # Grab the correct PV depending on experiment
     # Its value is set with MUX on edm screen
     det_type_pv = EXPT_TYPE_DETECTOR_PVS[expt_type]
-    det_type = caget(det_type_pv)
-    requested_detector = (
-        Eiger.name if int(det_type) == DetRequest.eiger else Pilatus.name
-    )
+    requested_detector = _get_requested_detector(det_type_pv)
     logger.info(f"Requested detector: {requested_detector}.")
     det_y_target = (
         Eiger.det_y_target if requested_detector == "eiger" else Pilatus.det_y_target
     )
     yield from _move_detector_stage(detector_stage, det_y_target)
     logger.info("Detector setup done.")
-
-
-if __name__ == "__main__":
-    setup_logging()
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "expt",
-        type=str,
-        choices=[expt.value for expt in SSXType],
-        help="Type of serial experiment being run.",
-    )
-    args = parser.parse_args()
-    expt_type = SSXType(args.expt)
-    RE = RunEngine()
-    # Use dodal device for move
-    detector_stage = i24.detector_motion()
-    RE(setup_detector_stage(detector_stage, expt_type))