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

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
@@ -7,6 +6,7 @@ from dodal.devices.detector.det_dim_constants import DetectorSizeConstants
 from dodal.devices.i24.aperture import Aperture, AperturePositions
 from dodal.devices.i24.beam_center import DetectorBeamCenter
 from dodal.devices.i24.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import BacklightPositions, DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.util.lookup_tables import (
@@ -149,9 +149,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 +168,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 +182,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 +199,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 +220,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 +252,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 +272,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}")
@@ -290,7 +290,6 @@ def pilatus(action, args_list):
         for arg in args_list:
             SSX_LOGGER.debug(f"Argument: {arg}")
 
-    # caput(pv.pilat_wavelength, caget(pv.dcm_lambda))
     caput(pv.pilat_detdist, caget(pv.det_z))
     caput(pv.pilat_filtertrasm, caget(pv.attn_match))
 
@@ -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,21 +373,21 @@ 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
 
 
-def eiger(action, args_list):
+def eiger(action, args_list, dcm: DCM):
     SSX_LOGGER.debug("***** Entering Eiger")
     SSX_LOGGER.info(f"Setup eiger - {action}")
     if args_list:
         for arg in args_list:
             SSX_LOGGER.debug(f"Argument: {arg}")
-    # caput(pv.eiger_wavelength, caget(pv.dcm_lambda))
     caput(pv.eiger_detdist, str(float(caget(pv.det_z)) / 1000))
-    caput(pv.eiger_wavelength, caget(pv.dcm_lambda))
+    dcm_wavelength_a = yield from bps.rd(dcm.wavelength_in_a.user_readback)
+    caput(pv.eiger_wavelength, dcm_wavelength_a)
     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

@@ -13,7 +13,7 @@ from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
 from mx_bluesky.beamlines.i24.serial.parameters import SSXType
 from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
-from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caget
+from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caget, caput
 from mx_bluesky.beamlines.i24.serial.setup_beamline.pv_abstract import (
     Detector,
     Eiger,
@@ -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,
 }
 
 
@@ -93,4 +93,5 @@ def setup_detector_stage(
         Eiger.det_y_target if requested_detector == "eiger" else Pilatus.det_y_target
     )
     yield from _move_detector_stage(detector_stage, det_y_target)
+    caput(det_type_pv, requested_detector)
     SSX_LOGGER.info("Detector setup done.")

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

@@ -272,7 +272,7 @@ def setup_zebra_for_fastchip_plan(
     det_type: str,
     num_gates: int,
     num_exposures: int,
-    exposure_time: float,
+    exposure_time_s: float,
     start_time_offset: float = 0.0,
     group: str = "setup_zebra_for_fastchip",
     wait: bool = True,
@@ -303,7 +303,7 @@ def setup_zebra_for_fastchip_plan(
         det_type (str): Detector in use, current choices are Eiger or Pilatus.
         num_gates (int): Number of apertures to visit in a chip.
         num_exposures (int): Number of times data is collected in each aperture.
-        exposure_time (float): Exposure time for each shot.
+        exposure_time_s (float): Exposure time for each shot.
         start_time_offset (float): Delay on the start of the position compare. \
             Defaults to 0.0 (standard chip collection).
     """
@@ -341,10 +341,12 @@ def setup_zebra_for_fastchip_plan(
         )
 
     # Square wave - needs a small drop to make it work for eiger
-    pulse_width = exposure_time - 0.0001 if det_type == "eiger" else exposure_time / 2
+    pulse_width = (
+        exposure_time_s - 0.0001 if det_type == "eiger" else exposure_time_s / 2
+    )
 
     # 100us buffer needed to avoid missing some of the triggers
-    exptime_buffer = exposure_time + 0.0001
+    exptime_buffer = exposure_time_s + 0.0001
 
     # Number of gates is the number of windows collected
     yield from bps.abs_set(zebra.pc.num_gates, num_gates, group=group)
@@ -362,7 +364,7 @@ def setup_zebra_for_fastchip_plan(
 def open_fast_shutter_at_each_position_plan(
     zebra: Zebra,
     num_exposures: int,
-    exposure_time: float,
+    exposure_time_s: float,
     group: str = "fast_shutter_control",
     wait: bool = True,
 ):
@@ -384,7 +386,7 @@ def open_fast_shutter_at_each_position_plan(
     Args:
         zebra (Zebra): The zebra ophyd device.
         num_exposures (int): Number of times data is collected in each aperture.
-        exposure_time (float): Exposure time for each shot.
+        exposure_time_s (float): Exposure time for each shot.
     """
     SSX_LOGGER.info(
         "ZEBRA setup for fastchip collection with long delays between exposures."
@@ -395,7 +397,7 @@ def open_fast_shutter_at_each_position_plan(
         zebra.output.pulse_2.input, zebra.mapping.sources.PC_GATE, group=group
     )
     yield from bps.abs_set(zebra.output.pulse_2.delay, 0.0, group=group)
-    pulse2_width = num_exposures * exposure_time + SHUTTER_OPEN_TIME
+    pulse2_width = num_exposures * exposure_time_s + SHUTTER_OPEN_TIME
     yield from bps.abs_set(zebra.output.pulse_2.width, pulse2_width, group=group)
 
     # Fast shutter

mx_bluesky/beamlines/i24/serial/web_gui_plans/general_plans.py

@@ -5,6 +5,11 @@ import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from blueapi.core import MsgGenerator
 from dodal.beamlines import i24
+from dodal.common import inject
+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
+from dodal.devices.oav.oav_detector import OAV
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,
@@ -14,11 +19,15 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
 from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_moveonclick import (
     _move_on_mouse_click_plan,
 )
-from mx_bluesky.beamlines.i24.serial.log import _read_visit_directory_from_file
+from mx_bluesky.beamlines.i24.serial.log import (
+    SSX_LOGGER,
+    _read_visit_directory_from_file,
+)
 from mx_bluesky.beamlines.i24.serial.parameters import (
     FixedTargetParameters,
     get_chip_format,
 )
+from mx_bluesky.beamlines.i24.serial.parameters.utils import EmptyMapError
 from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caput
 from mx_bluesky.beamlines.i24.serial.setup_beamline.pv_abstract import Eiger, Pilatus
@@ -29,9 +38,18 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
 
 
 @bpp.run_decorator()
-def gui_stage_move_on_click(position_px: tuple[int, int]) -> MsgGenerator:
-    oav = i24.oav()
-    pmac = i24.pmac()
+def gui_move_backlight(
+    position: str, backlight: DualBacklight = inject("backlight")
+) -> MsgGenerator:
+    bl_pos = BacklightPositions(position)
+    yield from bps.abs_set(backlight, bl_pos, wait=True)
+    SSX_LOGGER.debug(f"Backlight moved to {bl_pos.value}")
+
+
+@bpp.run_decorator()
+def gui_stage_move_on_click(
+    position_px: tuple[int, int], oav: OAV = inject("oav"), pmac: PMAC = inject("pmac")
+) -> MsgGenerator:
     yield from _move_on_mouse_click_plan(oav, pmac, position_px)
 
 
@@ -58,11 +76,14 @@ def gui_sleep(sec: int) -> MsgGenerator:
 
 
 @bpp.run_decorator()
-def gui_move_detector(det: Literal["eiger", "pilatus"]) -> MsgGenerator:
-    detector_stage = i24.detector_motion()
+def gui_move_detector(
+    det: Literal["eiger", "pilatus"],
+    detector_stage: DetectorMotion = inject("detector_motion"),
+) -> MsgGenerator:
     det_y_target = Eiger.det_y_target if det == "eiger" else Pilatus.det_y_target
     yield from _move_detector_stage(detector_stage, det_y_target)
     # Make the output readable
+    SSX_LOGGER.debug(f"Detector move done, resetting general PV to {det}")
     caput(pv.me14e_gp101, det)
 
 
@@ -75,16 +96,55 @@ def gui_set_parameters(
     transmission: float,
     n_shots: int,
     chip_type: str,
+    map_type: str,
+    chip_format: list[int | float],  # for Lite Oxford it's the chipmap
     checker_pattern: bool,
     pump_probe: str,
     laser_dwell: float,
     laser_delay: float,
     pre_pump: float,
 ) -> MsgGenerator:
+    """Set the parameter model for the data collection.
+
+    Args:
+        sub_dir (str): subdirectory of the visit to write data in.
+        chip_name (str): a name identifying the current chip collection, will be used
+            as filename.
+        exp_time (float): exposure time of each window shot, in s.
+        det_dist (float): sample-detector distance, in mm.
+        transmission (float): requested beam intensity transmission, expressed as
+            a fraction, e.g. 0.3.
+        n_shots (int): number of times each window should be collected.
+        chip_type (str): type of chip in use.
+        map_type (str): if an Oxford chip is used, define whether it's a full chip
+            collection or lite mapping is in use. For all other chip, this will be None.
+        chip_format (list[int|float]): for a custom chip, a list of the number of x,y
+            steps and the x,y step size. For an Oxford chip, the list should be empty
+            if collecting a full chip and a list of the block numbers to scan for a
+            lite collection.
+        checker_pattern (bool): whether checker_pattern is turned on, ie. only every
+            other window in a block gets collected
+        pump_probe (str): pump probe setting.
+        laser_dwell (float): laser exposure time for pump probe collections, in s.
+        laser_delay (float): delay between laser exposure and collection, in s.
+        pre_pump (float): pre-pump exposure time for a pump probe short2 collection,
+            ie a pump-in-probe where the collection starts during the pump.
+    """
     # NOTE still a work in progress, adding to it as the ui grows
+    # See progression of https://github.com/DiamondLightSource/mx-daq-ui/issues/3
     detector_stage = i24.detector_motion()
     det_type = yield from get_detector_type(detector_stage)
-    chip_params = get_chip_format(ChipType[chip_type])
+    _format = chip_format if ChipType[chip_type] is ChipType.Custom else None
+    chip_params = get_chip_format(ChipType[chip_type], _format)
+    if ChipType[chip_type] in [ChipType.Oxford, ChipType.OxfordInner]:
+        mapping = MappingType.Lite if map_type == "Lite" else MappingType.NoMap
+        if mapping is MappingType.Lite and len(chip_format) == 0:
+            # this logic should go in the gui with error message.
+            raise EmptyMapError("No blocks chosen")
+        chip_map = chip_format
+    else:
+        mapping = MappingType.NoMap
+        chip_map = []
 
     params = {
         "visit": _read_visit_directory_from_file().as_posix(),  # noqa
@@ -96,14 +156,14 @@ def gui_set_parameters(
         "num_exposures": n_shots,
         "transmission": transmission,
         "chip": chip_params,
-        "map_type": MappingType.NoMap,
-        "chip_map": [],
+        "map_type": mapping,
+        "chip_map": chip_map,
         "pump_repeat": PumpProbeSetting[pump_probe],  # pump_repeat,
         "laser_dwell_s": laser_dwell,
         "laser_delay_s": laser_delay,
         "checker_pattern": checker_pattern,
         "pre_pump_exposure_s": pre_pump,
     }
-    print(FixedTargetParameters(**params))
-    # This will then run the run_fixed_target plan
+    # TODO run the run_fixed_target plan once params are set (GUI not ready yet)
     yield from bps.sleep(0.5)
+    return FixedTargetParameters(**params)

mx_bluesky/beamlines/i24/serial/write_nexus.py

@@ -4,6 +4,7 @@ import pprint
 import time
 from datetime import datetime
 
+import bluesky.plan_stubs as bps
 import requests
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType, MappingType
@@ -20,7 +21,7 @@ def call_nexgen(
     parameters: ExtruderParameters | FixedTargetParameters,
     wavelength_in_a: float,
     beam_center_in_pix: tuple[float, float],
-    start_time: datetime | None = None,
+    start_time: datetime,
 ):
     """Call the nexus writer by sending a request to nexgen-server.
 
@@ -31,7 +32,7 @@ def call_nexgen(
         parameters (SerialAndLaserExperiment): Collection parameters.
         wavelength_in_a (float): Wavelength, in A.
         beam_center_in_pix (list[float]): Beam center position on detector, in pixels.
-        start_time (datetime, optional): Collection start time.
+        start_time (datetime): Collection start time.
 
     Raises:
         ValueError: For a wrong experiment type passed (either unknwon or not matched \
@@ -61,10 +62,10 @@ def call_nexgen(
     while time.time() - t0 < max_wait:
         if meta_h5.exists():
             SSX_LOGGER.info(f"Found {meta_h5} after {time.time() - t0:.1f} seconds")
-            time.sleep(5)
+            yield from bps.sleep(5)
             break
         SSX_LOGGER.debug(f"Waiting for {meta_h5}")
-        time.sleep(1)
+        yield from bps.sleep(1)
     if not meta_h5.exists():
         SSX_LOGGER.warning(f"Giving up waiting for {meta_h5} after {max_wait} seconds")
         return
@@ -95,7 +96,7 @@ def call_nexgen(
         "visitpath": os.fspath(meta_h5.parent),
         "wavelength": wavelength_in_a,
         "bit_depth": bit_depth,
-        "start_time": start_time,
+        "start_time": start_time.isoformat(),
     }
     SSX_LOGGER.info(f"Sending POST request to {url} with payload:")
     SSX_LOGGER.info(pprint.pformat(payload))

mx_bluesky/{hyperion → common}/device_setup_plans/check_beamstop.py

@@ -1,5 +1,5 @@
 import bluesky.plan_stubs as bps
-from dodal.devices.i03.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
 
 from mx_bluesky.common.utils.log import LOGGER
 

mx_bluesky/{hyperion → common}/device_setup_plans/manipulate_sample.py

@@ -47,7 +47,7 @@ def move_aperture_if_required(
     else:
         LOGGER.info(f"Setting aperture position to {aperture_value}")
         yield from bps.abs_set(
-            aperture_scatterguard,
+            aperture_scatterguard.selected_aperture,
             aperture_value,
             group=group,
         )

mx_bluesky/{hyperion → common}/device_setup_plans/setup_oav.py

@@ -6,15 +6,18 @@ from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 
-from mx_bluesky.hyperion.parameters.constants import CONST
-
-# Helper function to make sure we set the waiting groups correctly
-set_using_group = partial(bps.abs_set, group=CONST.WAIT.READY_FOR_OAV)
+from mx_bluesky.common.parameters.constants import (
+    PlanGroupCheckpointConstants,
+)
 
 
 def setup_pin_tip_detection_params(
-    pin_tip_detect_device: PinTipDetection, parameters: OAVParameters
+    pin_tip_detect_device: PinTipDetection,
+    parameters: OAVParameters,
 ):
+    set_using_group = partial(
+        bps.abs_set, group=PlanGroupCheckpointConstants.READY_FOR_OAV
+    )
     # select which blur to apply to image
     yield from set_using_group(
         pin_tip_detect_device.preprocess_operation, parameters.preprocess
@@ -55,6 +58,9 @@ def setup_pin_tip_detection_params(
 
 
 def setup_general_oav_params(oav: OAV, parameters: OAVParameters):
+    set_using_group = partial(
+        bps.abs_set, group=PlanGroupCheckpointConstants.READY_FOR_OAV
+    )
     yield from set_using_group(oav.cam.color_mode, ColorMode.RGB1)
     yield from set_using_group(oav.cam.acquire_period, parameters.acquire_period)
     yield from set_using_group(oav.cam.acquire_time, parameters.exposure)
@@ -78,4 +84,4 @@ def pre_centring_setup_oav(
     """
     yield from setup_general_oav_params(oav, parameters)
     yield from setup_pin_tip_detection_params(pin_tip_detection_device, parameters)
-    yield from bps.wait(CONST.WAIT.READY_FOR_OAV)
+    yield from bps.wait(PlanGroupCheckpointConstants.READY_FOR_OAV)