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

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

@@ -4,7 +4,7 @@ major 4
 minor 0
 release 1
 x 830
-y 200
+y 237
 w 900
 h 700
 font "arial-medium-r-18.0"
@@ -1521,7 +1521,7 @@ x 275
 y 111
 w 175
 h 139
-file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short1-laser.png"
+file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/s1l.png"
 endObjectProperties
 
 # (PNG Image)
@@ -1534,7 +1534,7 @@ x 486
 y 111
 w 172
 h 139
-file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short2-laser.png"
+file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/s2l.png"
 endObjectProperties
 
 # (Static Text)
@@ -1585,7 +1585,7 @@ symbol0 {
   1 "ML"
 }
 value0 {
-  0 "none"
+  0 "False"
   1 "True"
 }
 endObjectProperties
@@ -1600,7 +1600,7 @@ x 695
 y 111
 w 175
 h 139
-file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/short1-laser.png"
+file "SCRIPTS_LOCATION/fixed_target/FT-gui-edm/s1l.png"
 endObjectProperties
 
 # (Static Text)

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

@@ -4,6 +4,7 @@ Fixed target data collection
 
 from datetime import datetime
 from pathlib import Path
+from traceback import format_exception
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
@@ -18,6 +19,7 @@ from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
+from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.zebra.zebra import Zebra
 
@@ -37,7 +39,10 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 impo
 )
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
 from mx_bluesky.beamlines.i24.serial.parameters import FixedTargetParameters
-from mx_bluesky.beamlines.i24.serial.parameters.constants import BEAM_CENTER_LUT_FILES
+from mx_bluesky.beamlines.i24.serial.parameters.constants import (
+    BEAM_CENTER_LUT_FILES,
+    DetectorName,
+)
 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 (
@@ -51,52 +56,6 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_zebra_plans import (
 )
 from mx_bluesky.beamlines.i24.serial.write_nexus import call_nexgen
 
-# Move this in common place as part of
-# https://github.com/DiamondLightSource/mx-bluesky/pull/603
-PMAC_MOVE_TIME = 0.008  # Move time between positions on chip ~ 7-8 ms
-
-
-def calculate_collection_timeout(parameters: FixedTargetParameters) -> float:
-    """Give an estimation of the time the plan should wait for the data collection \
-        to be finished.
-
-    For non-pump probe collections and collection with short delays, it should be \
-    enough to use the collection time plus a genereous 30s buffer.
-    For EAVA (Excite and visit again) collections instead, the laser dwell and laser \
-    delay times should be included in the calculation. For long dalays between pump \
-    and probe, the shutter opening time will also need to be taken into account.
-    For more details on the dynamics see
-    https://confluence.diamond.ac.uk/display/MXTech/Dynamics+and+fixed+targets.
-
-    Args:
-        parameters (FixedTargerParameters): The collection parameters.
-
-    Returns:
-        The estimated collection time, in s.
-    """
-    buffer = PMAC_MOVE_TIME * parameters.total_num_images + 600
-    pump_setting = parameters.pump_repeat
-    collection_time = parameters.total_num_images * parameters.exposure_time_s
-    if pump_setting in [
-        PumpProbeSetting.NoPP,
-        PumpProbeSetting.Short1,
-        PumpProbeSetting.Short2,
-    ]:
-        timeout = collection_time + buffer
-    else:
-        # EAVA: Excite and visit again
-        num_windows = parameters.total_num_images / parameters.num_exposures
-        timeout = (
-            collection_time
-            + parameters.laser_dwell_s * num_windows  # type: ignore
-            + parameters.laser_delay_s
-            + buffer
-        )
-        if pump_setting == PumpProbeSetting.Medium1:
-            # Long delay between pump and probe, with fast shutter opening and closing.
-            timeout = timeout + SHUTTER_OPEN_TIME * parameters.total_num_images
-    return timeout
-
 
 def write_userlog(
     parameters: FixedTargetParameters,
@@ -225,10 +184,12 @@ def load_motion_program_data(
         # Pump setting chosen
         prefix = 14
         SSX_LOGGER.info(f"Setting program prefix to {prefix}")
-        yield from bps.abs_set(pmac.pmac_string, "P1439=0", wait=True)
         if checker_pattern:
             SSX_LOGGER.info("Checker pattern setting enabled.")
             yield from bps.abs_set(pmac.pmac_string, "P1439=1", wait=True)
+        else:
+            SSX_LOGGER.info("Checker pattern setting disabled.")
+            yield from bps.abs_set(pmac.pmac_string, "P1439=0", wait=True)
         if pump_repeat == PumpProbeSetting.Medium1:
             # Medium1 has time delays (Fast shutter opening time in ms)
             yield from bps.abs_set(pmac.pmac_string, "P1441=50", wait=True)
@@ -315,6 +276,7 @@ def start_i24(
     mirrors: FocusMirrorsMode,
     beam_center_device: DetectorBeamCenter,
     dcid: DCID,
+    pilatus_metadata: PilatusMetadata,
 ):
     """Set up for I24 fixed target data collection, trigger the detector and open \
     the hutch shutter.
@@ -373,7 +335,9 @@ def start_i24(
 
         # DCID process depends on detector PVs being set up already
         SSX_LOGGER.debug("Start DCID process")
-        filetemplate = yield from get_pilatus_filename_template_from_device()
+        filetemplate = yield from get_pilatus_filename_template_from_device(
+            pilatus_metadata
+        )
         dcid.generate_dcid(
             beam_settings=beam_settings,
             image_dir=filepath,
@@ -430,6 +394,7 @@ def start_i24(
                 parameters.total_num_images,
                 parameters.exposure_time_s,
             ],
+            dcm,
         )
 
         # DCID process depends on detector PVs being set up already
@@ -505,7 +470,7 @@ def finish_i24(
     elif parameters.detector_name == "eiger":
         SSX_LOGGER.debug("Finish I24 Eiger")
         yield from reset_zebra_when_collection_done_plan(zebra)
-        yield from sup.eiger("return-to-normal", None)
+        yield from sup.eiger("return-to-normal", None, dcm)
         complete_filename = cagetstring(pv.eiger_ODfilenameRBV)  # type: ignore
     else:
         raise ValueError(f"{parameters.detector_name=} unrecognised")
@@ -520,12 +485,12 @@ def finish_i24(
     write_userlog(parameters, complete_filename, transmission, wavelength)
 
 
-def run_aborted_plan(pmac: PMAC, dcid: DCID):
+def run_aborted_plan(pmac: PMAC, dcid: DCID, exception: Exception):
     """Plan to send pmac_strings to tell the PMAC when a collection has been aborted, \
         either by pressing the Abort button or because of a timeout, and to reset the \
         P variable.
     """
-    SSX_LOGGER.warning("Data Collection Aborted")
+    SSX_LOGGER.warning(f"Data Collection Aborted: {format_exception(exception)}")
     yield from bps.trigger(pmac.abort_program, wait=True)
 
     end_time = datetime.now()
@@ -546,6 +511,7 @@ def main_fixed_target_plan(
     beam_center_device: DetectorBeamCenter,
     parameters: FixedTargetParameters,
     dcid: DCID,
+    pilatus_metadata: PilatusMetadata,
 ) -> MsgGenerator:
     SSX_LOGGER.info("Running a chip collection on I24")
 
@@ -590,6 +556,7 @@ def main_fixed_target_plan(
         mirrors,
         beam_center_device,
         dcid,
+        pilatus_metadata,
     )
 
     SSX_LOGGER.info("Moving to Start")
@@ -621,12 +588,6 @@ def kickoff_and_complete_collection(pmac: PMAC, parameters: FixedTargetParameter
         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)
-    SSX_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"})
@@ -699,6 +660,9 @@ def run_fixed_target_plan(
     dcm: DCM = inject("dcm"),
     mirrors: FocusMirrorsMode = inject("focus_mirrors"),
     attenuator: ReadOnlyAttenuator = inject("attenuator"),
+    beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+    beam_center_pilatus: DetectorBeamCenter = inject("pilatus_bc"),
+    pilatus_metadata: PilatusMetadata = inject("pilatus_meta"),
 ) -> MsgGenerator:
     # Read the parameters
     parameters: FixedTargetParameters = yield from read_parameters(
@@ -711,7 +675,11 @@ def run_fixed_target_plan(
     if 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)
+    beam_center_device = (
+        beam_center_eiger
+        if parameters.detector_name is DetectorName.EIGER
+        else beam_center_pilatus
+    )
 
     # DCID instance - do not create yet
     dcid = DCID(emit_errors=False, expt_params=parameters)
@@ -730,8 +698,9 @@ def run_fixed_target_plan(
             beam_center_device,
             parameters,
             dcid,
+            pilatus_metadata,
         ),
-        except_plan=lambda e: (yield from run_aborted_plan(pmac, dcid)),
+        except_plan=lambda e: (yield from run_aborted_plan(pmac, dcid, e)),
         final_plan=lambda: (
             yield from tidy_up_after_collection_plan(
                 zebra, pmac, shutter, dcm, parameters, dcid

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

@@ -113,6 +113,12 @@ def initialise_stages(
     yield from bps.wait(group=group)
 
 
+def _is_checker_pattern() -> bool:
+    """Read the checker pattern value and return True if selected."""
+    checks = int(caget(pv.me14e_gp111))
+    return bool(checks)
+
+
 @log_on_entry
 def read_parameters(
     detector_stage: DetectorMotion,
@@ -172,7 +178,7 @@ def read_parameters(
         "chip": chip_params.model_dump(),
         "map_type": map_type,
         "pump_repeat": pump_repeat,
-        "checker_pattern": bool(caget(pv.me14e_gp111)),
+        "checker_pattern": _is_checker_pattern(),
         "chip_map": chip_map,
         "laser_dwell_s": float(caget(pv.me14e_gp103)) if pump_repeat != 0 else 0.0,
         "laser_delay_s": float(caget(pv.me14e_gp110)) if pump_repeat != 0 else 0.0,

mx_bluesky/beamlines/i24/serial/log.py

@@ -99,16 +99,6 @@ def config(
         dev_mode (bool, optional): If true, will log to graylog on localhost instead \
             of production. Defaults to False.
     """
-    do_default_logging_setup(
-        "mx-bluesky.log",
-        DEFAULT_GRAYLOG_PORT,
-        dev_mode=dev_mode,
-        integrate_all_logs=False,
-    )
-    # Remove dodal StreamHandler to avoid duplication of messages above debug
-    dodal_logger.removeHandler(dodal_logger.handlers[0])
-    _integrate_bluesky_logs(dodal_logger)
-
     if logfile:
         logs = _get_logging_file_path() / logfile
         fileFormatter = logging.Formatter(
@@ -119,6 +109,15 @@ def config(
         FH.setLevel(logging.DEBUG)
         FH.setFormatter(fileFormatter)
         SSX_LOGGER.addHandler(FH)
+    do_default_logging_setup(
+        "mx-bluesky.log",
+        DEFAULT_GRAYLOG_PORT,
+        dev_mode=dev_mode,
+        integrate_all_logs=False,
+    )
+    # Remove dodal StreamHandler to avoid duplication of messages above debug
+    dodal_logger.removeHandler(dodal_logger.handlers[0])
+    _integrate_bluesky_logs(dodal_logger)
 
 
 def log_on_entry(func):

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

@@ -1,4 +1,5 @@
-from typing import Any
+from collections.abc import Sequence
+from typing import Any, Literal
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
 from mx_bluesky.beamlines.i24.serial.parameters.experiment_parameters import (
@@ -13,8 +14,27 @@ class EmptyMapError(Exception):
     pass
 
 
-def get_chip_format(chip_type: ChipType) -> ChipDescription:
-    """Default parameter values."""
+def get_chip_format(
+    chip_type: ChipType,
+    format: Sequence[int | float] | None = None,
+    origin: Literal["edm", "web"] = "edm",
+) -> ChipDescription:
+    """Get the default parameter values for the requested chip type.
+
+    For an Oxford-type chip, the default values are hard coded as the dimensions are
+    always the same. For a Custom chip instead, the number of steps and step size in
+    each direction must be entered through the GUI - web or edm. If the collection is
+    run through the edm, the values will be read from the general purpose PVs set on
+    there. If instead the plan is run from the web UI, the values will be passed in the
+    form of a list/tuple of 4 values.
+
+    Args:
+        chip_type (ChipType): Chip in use
+        custom_format (Sequence[int | float], optional): Number and size of steps input
+            from the web ui. Format should be: [int, int, float, float].
+            Defaults to None.
+        origin (str, optional): UI in use, can be either web or edm. Defaults to edm.
+    """
     defaults: dict[str, int | float] = {}
     match chip_type:
         case ChipType.Oxford:
@@ -33,10 +53,19 @@ def get_chip_format(chip_type: ChipType) -> ChipDescription:
             defaults["x_blocks"] = defaults["y_blocks"] = 1
             defaults["b2b_horz"] = defaults["b2b_vert"] = 0.0
         case ChipType.Custom:
-            defaults["x_num_steps"] = int(caget(pv.me14e_gp6))
-            defaults["y_num_steps"] = int(caget(pv.me14e_gp7))
-            defaults["x_step_size"] = float(caget(pv.me14e_gp8))
-            defaults["y_step_size"] = float(caget(pv.me14e_gp99))
+            if origin == "edm":
+                defaults["x_num_steps"] = int(caget(pv.me14e_gp6))
+                defaults["y_num_steps"] = int(caget(pv.me14e_gp7))
+                defaults["x_step_size"] = float(caget(pv.me14e_gp8))
+                defaults["y_step_size"] = float(caget(pv.me14e_gp99))
+            else:
+                # NOTE Test for WEB GUI
+                if not format:
+                    raise ValueError("Format for custom chip not passed")
+                defaults["x_num_steps"] = format[0]
+                defaults["y_num_steps"] = format[1]
+                defaults["x_step_size"] = format[2]
+                defaults["y_step_size"] = format[3]
             defaults["x_blocks"] = defaults["y_blocks"] = 1
             defaults["b2b_horz"] = defaults["b2b_vert"] = 0.0
         case ChipType.MISP:

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

@@ -154,7 +154,6 @@ dcm_gap = "BL24I-MO-DCM-01:GAP"
 dcm_roll1 = "BL24I-MO-DCM-01:XTAL1:ROLL"
 dcm_roll2 = "BL24I-MO-DCM-01:XTAL2:ROLL"
 dcm_pitch2 = "BL24I-MO-DCM-01:XTAL2:PITCH"
-dcm_lambda = "BL24I-MO-DCM-01:LAMBDA"
 dcm_energy = "BL24I-MO-DCM-01:ENERGY"
 
 # S2

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

@@ -19,8 +19,8 @@ class Pilatus:
         round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm, strict=False)
     )
 
-    det_y_threshold = 560.0
-    det_y_target = 566.0
+    det_y_threshold = 640.0
+    det_y_target = 647.0
 
     class pv:
         detector_distance = pv.pilat_detdist
@@ -48,8 +48,8 @@ class Eiger:
         round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm, strict=False)
     )
 
-    det_y_threshold = -10.0
-    det_y_target = -22.0
+    det_y_threshold = 70.0
+    det_y_target = 59.0
 
     class pv:
         detector_distance = pv.eiger_detdist

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

@@ -1,11 +1,11 @@
 from pathlib import Path
 
 import bluesky.plan_stubs as bps
-from dodal.beamlines import i24
 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 (
@@ -18,13 +18,6 @@ from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline.ca import caget, caput
 
 
-def get_beam_center_device(detector_in_use: str) -> DetectorBeamCenter:
-    if detector_in_use == "eiger":
-        return i24.eiger_beam_center(connect_immediately=True)
-    else:
-        return i24.pilatus_beam_center(connect_immediately=True)
-
-
 def compute_beam_center_position_from_lut(
     lut_path: Path,
     detector_distance_mm: float,
@@ -289,7 +282,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))
 
@@ -377,15 +369,15 @@ def pilatus(action, args_list):
     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)
     yield from bps.sleep(0.1)
     # Setup common to all collections ###

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,
@@ -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/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

@@ -21,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.
 
@@ -32,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 \
@@ -96,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))