mx-bluesky 1.5.10__py3-none-any.whl → 1.5.11__py3-none-any.whl

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

@@ -96,185 +96,6 @@ def set_detector_beam_center_plan(
         yield from bps.wait(group=group)
 
 
-def modechange(action):
-    """Mode Change"""
-    # Pin Hand Mount
-    if action == "Pin_hand_mount":
-        caput(pv.bl_mp_select, "Out")
-        caput(pv.aptr1_mp_select, "Manual Mounting")
-        caput(pv.bs_mp_select, "Robot")
-        caput(pv.vgon_omega, 0)
-        caput(pv.vgon_kappa, 0)
-        caput(pv.vgon_phi, 0)
-        caput(pv.vgon_pinxs, 0)
-        caput(pv.vgon_pinzs, 0)
-        caput(pv.fluo_trans, "OUT")
-        caput(pv.cstrm_p1701, 0)
-        caput(pv.cstrm_mp_select, "Out")
-        SSX_LOGGER.debug("Pin Hand Mount Done")
-
-    # Pin Room Tempreature Hand Mount
-    elif action == "Pin_rt_hand_mount":
-        caput(pv.cstrm_p1701, 0)
-        caput(pv.cstrm_mp_select, "Away")
-        caput(pv.bl_mp_select, "Out")
-        caput(pv.aptr1_mp_select, "Manual Mounting")
-        caput(pv.bs_mp_select, "Robot")
-        caput(pv.vgon_omega, 0)
-        caput(pv.vgon_kappa, 0)
-        caput(pv.vgon_phi, 0)
-        caput(pv.vgon_pinxs, 0)
-        caput(pv.vgon_pinzs, 0)
-        caput(pv.fluo_trans, "OUT")
-        SSX_LOGGER.debug("RT Pin Hand Mount Done")
-
-    # Pin Data Collection
-    elif action == "Pin_data_collection":
-        caput(pv.cstrm_p1701, 0)
-        caput(pv.cstrm_mp_select, "In")
-        caput(pv.aptr1_mp_select, "In")
-        caput(pv.vgon_omega, 0)
-        caput(pv.vgon_kappa, 0)
-        caput(pv.vgon_phi, 0)
-        caput(pv.vgon_pinxs, 0)
-        # caput(pv.vgon_pinyh, 0)
-        caput(pv.vgon_pinzs, 0)
-        caput(pv.fluo_trans, "OUT")
-        caput(pv.bs_roty, 0)
-        yield from bps.sleep(0.5)
-        caput(pv.bs_mp_select, "Data Collection")
-        yield from bps.sleep(2.3)
-        caput(pv.bl_mp_select, "In")
-        SSX_LOGGER.debug("Pin Data Collection Done")
-
-    # Pin Room Tempreature Data Collection
-    elif action == "Pin_rt_data_collection":
-        SSX_LOGGER.debug("RT Mode")
-        caput(pv.cstrm_p1701, 0)
-        caput(pv.cstrm_mp_select, "Away")
-        caput(pv.aptr1_mp_select, "In")
-        caput(pv.vgon_omega, 0)
-        caput(pv.vgon_kappa, 0)
-        caput(pv.vgon_phi, 0)
-        caput(pv.vgon_pinxs, 0)
-        caput(pv.vgon_pinyh, 0)
-        caput(pv.vgon_pinzs, 0)
-        caput(pv.fluo_trans, "OUT")
-        yield from bps.sleep(0.1)
-        caput(pv.bs_roty, 0)
-        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")
-
-    # Tray Hand Mount
-    elif action == "Tray_hand_mount":
-        caput(pv.ttab_x, 2.0)
-        caput(pv.hgon_trayys, 0.0)
-        caput(pv.hgon_omega, 0.0)
-        caput(pv.fluo_trans, "OUT")
-        caput(pv.bl_mp_select, "Out")
-        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:
-            yield from bps.sleep(1)
-        SSX_LOGGER.debug("Tray Hand Mount Done")
-
-    # Tray Robot Load. This action needs to be reviewed and revised
-    elif action == "Tray_robot_load":
-        # Middle of black circle
-        caput(pv.ttab_x, 79.2)
-        caput(pv.hgon_trayys, -7.00)
-        caput(pv.hgon_trayzs, -1.10)
-        caput(pv.hgon_omega, 0.0)
-        caput(pv.fluo_trans, "OUT")
-        caput(pv.aptr1_mp_select, "In")
-        caput(pv.bl_mp_select, "Out")
-        yield from bps.sleep(1)
-        caput(pv.bs_roty, 0)
-        yield from bps.sleep(1)
-        caput(pv.bs_mp_select, "Robot")
-        yield from bps.sleep(1)
-        caput(pv.bs_mp_select, "Data Collection Far")
-        yield from bps.sleep(1)
-        caput(pv.bs_roty, 0)
-        yield from bps.sleep(4)
-        caput(pv.bl_mp_select, "In")
-        SSX_LOGGER.debug("Tray Robot Mount Done")
-
-    # Tray Data Collection
-    elif action == "Tray_data_collection":
-        SSX_LOGGER.debug("This should be E11 on the test tray (CrystalQuickX)")
-        caput(pv.ttab_x, 37.4)
-        caput(pv.hgon_trayys, -8.0)
-        caput(pv.hgon_trayzs, -2.1)
-        caput(pv.aptr1_mp_select, "In")
-        caput(pv.fluo_trans, "OUT")
-        caput(pv.bl_mp_select, "Out")
-        yield from bps.sleep(1)
-        caput(pv.bs_roty, 0)
-        yield from bps.sleep(1)
-        caput(pv.bs_mp_select, "Robot")
-        yield from bps.sleep(1)
-        caput(pv.bs_mp_select, "Data Collection")
-        yield from bps.sleep(1)
-        caput(pv.bs_roty, 0)
-        yield from bps.sleep(4)
-        caput(pv.bl_mp_select, "In")
-        SSX_LOGGER.debug("Tray Data Collection Done")
-
-    # Pin Switch to Tray
-    elif action == "Pin_switch2tray":
-        caput(pv.cstrm_p1701, 0)
-        caput(pv.cstrm_mp_select, "Away")
-        caput(pv.aptr1_mp_select, "Manual Mounting")
-        caput(pv.bl_mp_select, "Out")
-        caput(pv.hgon_omega, 0.0)
-        caput(pv.ttab_x, 0)
-        caput(pv.hgon_trayys, 0.0)
-        caput(pv.hgon_trayzs, 0.0)
-        caput(pv.ptab_y, -90)
-        caput(pv.fluo_trans, "OUT")
-        caput(pv.vgon_omega, 0)
-        caput(pv.vgon_kappa, 0)
-        caput(pv.vgon_phi, 0)
-        caput(pv.vgon_pinxs, 0)
-        caput(pv.vgon_pinyh, 0)
-        caput(pv.vgon_pinzs, 0)
-        while float(caget(pv.ttab_x + ".RBV")) > 1:
-            SSX_LOGGER.debug(f"moving ttab_x {caget(pv.ttab_x)}")
-            yield from bps.sleep(0.1)
-        while caget(pv.fluo_out_limit) == "OFF":
-            SSX_LOGGER.debug("waiting on fluorescence detector")
-            yield from bps.sleep(0.1)
-        while caget(pv.bl_mp_select) != "Out":
-            SSX_LOGGER.debug("waiting on back light to move to out")
-            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:
-            yield from bps.sleep(1)
-        SSX_LOGGER.debug("Switch To Tray Done")
-
-    # Tray Switch to Pin
-    elif action == "Tray_switch2pin":
-        caput(pv.ttab_x, 0.0)
-        # Supposed to absorb pin laser
-        caput(pv.hgon_trayys, 0.0)
-        caput(pv.hgon_trayzs, 0.0)
-        while float(caget(pv.ttab_x + ".RBV")) > 1.0:
-            yield from bps.sleep(1)
-        caput(pv.ptab_y, 0)
-        while float(caget(pv.ptab_y + ".RBV")) < -1.0:
-            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}")
-    return 1
-
-
 def eiger(action, args_list, dcm: DCM):
     SSX_LOGGER.debug("***** Entering Eiger")
     SSX_LOGGER.info(f"Setup eiger - {action}")
@@ -292,7 +113,7 @@ def eiger(action, args_list, dcm: DCM):
     caput(pv.eiger_monitor, "No")
     # caput(pv.eiger_datasource, 'None')
     caput(pv.eiger_statuspoll, "1 second")
-    caput(pv.eiger_ROImode, "Disabled")
+    caput(pv.eiger_roi_mode, "Disabled")
     caput(pv.eiger_ff, "Enabled")
     caput(pv.eiger_compresstype, "bslz4")
     caput(pv.eiger_countmode, "Retrigger")
@@ -304,10 +125,10 @@ def eiger(action, args_list, dcm: DCM):
         # Sends a single trigger to start data collection
         SSX_LOGGER.debug("Eiger quickshot")
         [filepath, filename, num_imgs, exptime] = args_list
-        filename = filename + "_" + str(caget(pv.eiger_seqID))
-        caput(pv.eiger_ODfilepath, filepath)
+        filename = filename + "_" + str(caget(pv.eiger_seq_id))
+        caput(pv.eiger_od_filepath, filepath)
         yield from bps.sleep(0.1)
-        caput(pv.eiger_ODfilename, filename)
+        caput(pv.eiger_od_filename, filename)
         yield from bps.sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
@@ -325,17 +146,17 @@ def eiger(action, args_list, dcm: DCM):
         yield from bps.sleep(1.0)
         # ODIN setup
         SSX_LOGGER.info("Setting up Odin")
-        caput(pv.eiger_ODfilename, filename)
-        caput(pv.eiger_ODfilepath, filepath)
-        caput(pv.eiger_ODnumcapture, str(num_imgs))
-        caput(pv.eiger_ODfilepath, filepath)
+        caput(pv.eiger_od_filename, filename)
+        caput(pv.eiger_od_filepath, filepath)
+        caput(pv.eiger_od_num_capture, str(num_imgs))
+        caput(pv.eiger_od_filepath, filepath)
         eigerbdrbv = "UInt" + str(caget(pv.eiger_bitdepthrbv))
-        caput(pv.eiger_ODdatatype, eigerbdrbv)
-        caput(pv.eiger_ODcompress, "BSL24")
+        caput(pv.eiger_od_datatype, eigerbdrbv)
+        caput(pv.eiger_od_compress, "BSL24")
         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")
+        caput(pv.eiger_od_capture, "Capture")
         # If detector fails to arm first time can try twice with a sleep inbetween
         SSX_LOGGER.info("Arming Eiger")
         caput(pv.eiger_acquire, "1")
@@ -346,10 +167,10 @@ def eiger(action, args_list, dcm: DCM):
         # Send a trigger for every image. Records while TTL is high
         SSX_LOGGER.info("Eiger triggered")
         [filepath, filename, num_imgs, exptime] = args_list
-        filename = filename + "_" + str(caget(pv.eiger_seqID))
-        caput(pv.eiger_ODfilepath, filepath)
+        filename = filename + "_" + str(caget(pv.eiger_seq_id))
+        caput(pv.eiger_od_filepath, filepath)
         yield from bps.sleep(0.1)
-        caput(pv.eiger_ODfilename, filename)
+        caput(pv.eiger_od_filename, filename)
         yield from bps.sleep(0.1)
         acqtime = float(exptime) - 0.0000001
         caput(pv.eiger_acquiretime, str(acqtime))
@@ -367,17 +188,17 @@ def eiger(action, args_list, dcm: DCM):
         yield from bps.sleep(1.0)
         # ODIN setup #
         SSX_LOGGER.info("Setting up Odin")
-        caput(pv.eiger_ODfilename, filename)
-        caput(pv.eiger_ODfilepath, filepath)
-        caput(pv.eiger_ODnumcapture, str(num_imgs))
-        caput(pv.eiger_ODfilepath, filepath)
+        caput(pv.eiger_od_filename, filename)
+        caput(pv.eiger_od_filepath, filepath)
+        caput(pv.eiger_od_num_capture, str(num_imgs))
+        caput(pv.eiger_od_filepath, filepath)
         eigerbdrbv = "UInt" + str(caget(pv.eiger_bitdepthrbv))
-        caput(pv.eiger_ODdatatype, eigerbdrbv)
-        caput(pv.eiger_ODcompress, "BSL24")
+        caput(pv.eiger_od_datatype, eigerbdrbv)
+        caput(pv.eiger_od_compress, "BSL24")
         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")
+        caput(pv.eiger_od_capture, "Capture")
         # If detector fails to arm first time can try twice with a sleep inbetween
         SSX_LOGGER.info("Arming Eiger")
         caput(pv.eiger_acquire, "1")
@@ -387,55 +208,7 @@ def eiger(action, args_list, dcm: DCM):
     # Put it all back to GDA acceptable defaults
     elif action == "return-to-normal":
         caput(pv.eiger_manualtrigger, "No")
-        # caput(pv.eiger_seqID, int(caget(pv.eiger_seqID))+1)
+        # caput(pv.eiger_seq_id, int(caget(pv.eiger_seq_id))+1)
     SSX_LOGGER.debug("***** leaving Eiger")
     yield from bps.sleep(0.1)
     return 0
-
-
-def xspress3(action, args_list):
-    SSX_LOGGER.debug("***** Entering xspress3")
-    SSX_LOGGER.info(f"xspress3 - {action}")
-    if args_list:
-        for arg in args_list:
-            SSX_LOGGER.debug(f"Argument: {arg}")
-
-    if action == "stop-and-start":
-        [exp_time, lo, hi] = args_list
-        caput(pv.xsp3_triggermode, "Internal")
-        caput(pv.xsp3_numimages, 1)
-        caput(pv.xsp3_acquiretime, exp_time)
-        caput(pv.xsp3_c1_mca_roi1_llm, lo)
-        caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        yield from bps.sleep(0.2)
-        caput(pv.xsp3_c1_mca_roi1_llm, lo)
-        caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        yield from bps.sleep(0.2)
-        caput(pv.xsp3_erase, 0)
-
-    elif action == "on-the-fly":
-        [num_frms, lo, hi] = args_list
-        caput(pv.xsp3_triggermode, "TTL Veto Only")
-        caput(pv.xsp3_numimages, num_frms)
-        caput(pv.xsp3_c1_mca_roi1_llm, lo)
-        caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        yield from bps.sleep(0.2)
-        caput(pv.xsp3_c1_mca_roi1_llm, lo)
-        caput(pv.xsp3_c1_mca_roi1_hlm, hi)
-        yield from bps.sleep(0.2)
-        caput(pv.xsp3_erase, 0)
-
-    elif action == "return-to-normal":
-        caput(pv.xsp3_triggermode, "TTL Veto Only")
-        caput(pv.xsp3_numimages, 1)
-        caput(pv.xsp3_acquiretime, 1)
-        caput(pv.xsp3_c1_mca_roi1_llm, 0)
-        caput(pv.xsp3_c1_mca_roi1_hlm, 0)
-        caput(pv.xsp3_erase, 0)
-
-    else:
-        SSX_LOGGER.error("Unknown action for xspress3 method:", action)
-
-    yield from bps.sleep(0.1)
-    SSX_LOGGER.debug("***** leaving xspress3")
-    return 1

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

@@ -32,7 +32,7 @@ class DetRequest(IntEnum):
         return self.name
 
 
-class UnknownDetectorType(Exception):
+class UnknownDetectorTypeError(Exception):
     pass
 
 
@@ -45,7 +45,7 @@ def get_detector_type(detector_stage: YZStage) -> Generator[Msg, None, Detector]
         return Eiger()
     else:
         SSX_LOGGER.error("Detector not found.")
-        raise UnknownDetectorType("Detector not found.")
+        raise UnknownDetectorTypeError("Detector not found.")
 
 
 def _move_detector_stage(detector_stage: YZStage, target: float) -> MsgGenerator:

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

@@ -209,13 +209,13 @@ def setup_zebra_for_extruder_with_pump_probe_plan(
     yield from set_logic_gates_for_porto_triggering(zebra)
 
     # Set TTL out depending on detector type
-    DET_TTL = TTL_EIGER
-    LASER_TTL = TTL_LASER  # may change with additional detectors
+    det_ttl = TTL_EIGER
+    laser_ttl = TTL_LASER  # may change with additional detectors
     yield from bps.abs_set(
-        zebra.output.out_pvs[DET_TTL], zebra.mapping.sources.AND4, group=group
+        zebra.output.out_pvs[det_ttl], zebra.mapping.sources.AND4, group=group
     )
     yield from bps.abs_set(
-        zebra.output.out_pvs[LASER_TTL], zebra.mapping.sources.AND3, group=group
+        zebra.output.out_pvs[laser_ttl], zebra.mapping.sources.AND3, group=group
     )
 
     yield from bps.abs_set(

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

@@ -1,4 +1,5 @@
 # from collections.abc import Sequence
+from datetime import datetime
 from typing import Literal
 
 import bluesky.plan_stubs as bps
@@ -6,6 +7,7 @@ import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.beamlines import i24
 from dodal.common import inject
+from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i24.aperture import Aperture
 from dodal.devices.i24.beam_center import DetectorBeamCenter
@@ -19,15 +21,18 @@ from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.zebra.zebra import Zebra
 
 from mx_bluesky.beamlines.i24.serial.dcid import DCID
+from mx_bluesky.beamlines.i24.serial.extruder.i24ssx_extruder_collect_py3v2 import (
+    run_plan_in_wrapper as run_ex_collection_plan,
+)
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,
     MappingType,
     PumpProbeSetting,
 )
-from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Collect_py3v1 import (
-    run_plan_in_wrapper,
+from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_chip_collect_py3v1 import (
+    run_plan_in_wrapper as run_ft_collection_plan,
 )
-from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 import (
+from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_chip_manager_py3v1 import (
     upload_chip_map_to_geobrick,
 )
 from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_moveonclick import (
@@ -41,13 +46,15 @@ from mx_bluesky.beamlines.i24.serial.parameters import (
     FixedTargetParameters,
     get_chip_format,
 )
+from mx_bluesky.beamlines.i24.serial.parameters.experiment_parameters import (
+    ExtruderParameters,
+)
 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
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
     _move_detector_stage,
-    get_detector_type,
 )
 
 
@@ -92,13 +99,6 @@ def gui_gonio_move_on_click(position_px: tuple[int, int]) -> MsgGenerator:
     yield from bps.mv(gonio.x, x_um / 1000, gonio.yh, y_um / 1000)  # type: ignore
 
 
-# See https://github.com/DiamondLightSource/mx-bluesky/issues/853
-@bpp.run_decorator()
-def gui_sleep(sec: int) -> MsgGenerator:
-    for _ in range(sec):
-        yield from bps.sleep(1)
-
-
 @bpp.run_decorator()
 def gui_move_detector(
     det: Literal["eiger"],
@@ -111,6 +111,12 @@ def gui_move_detector(
     caput(pv.me14e_gp101, det)
 
 
+@bpp.run_decorator()
+def gui_set_fiducial_0(pmac: PMAC = inject("PMAC")) -> MsgGenerator:
+    SSX_LOGGER.debug("Set fiducial 0 to home string")
+    yield from bps.trigger(pmac.home, wait=True)
+
+
 @bpp.run_decorator()
 def gui_run_chip_collection(
     sub_dir: str,
@@ -137,8 +143,9 @@ def gui_run_chip_collection(
     dcm: DCM = inject("dcm"),
     mirrors: FocusMirrorsMode = inject("focus_mirrors"),
     beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+    attenuator: EnumFilterAttenuator = inject("attenuator"),
 ) -> MsgGenerator:
-    """Set the parameter model for the data collection.
+    """Set the parameter model and run the data collection.
 
     Args:
         sub_dir (str): subdirectory of the visit to write data in.
@@ -166,7 +173,9 @@ def gui_run_chip_collection(
     """
     # 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
-    det_type = yield from get_detector_type(detector_stage)
+    # get_detector_type temporarily disabled as pilatus went away, and for now only eiger in use
+    # for this.
+    # det_type = yield from get_detector_type(detector_stage)
     _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]:
@@ -179,13 +188,16 @@ def gui_run_chip_collection(
         mapping = MappingType.NoMap
         chip_map = []
 
+    # NOTE. For now setting attenuation here in place of the edms doing a caput
+    yield from bps.abs_set(attenuator, transmission, wait=True)
+
     params = {
         "visit": _read_visit_directory_from_file().as_posix(),  # noqa
         "directory": sub_dir,
         "filename": chip_name,
         "exposure_time_s": exp_time,
         "detector_distance_mm": det_dist,
-        "detector_name": str(det_type),
+        "detector_name": "eiger",
         "num_exposures": n_shots,
         "transmission": transmission,
         "chip": chip_params,
@@ -213,7 +225,7 @@ def gui_run_chip_collection(
     dcid = DCID(emit_errors=False, expt_params=parameters)  # noqa
     SSX_LOGGER.info("DCID created")
 
-    yield from run_plan_in_wrapper(
+    yield from run_ft_collection_plan(
         zebra,
         pmac,
         aperture,
@@ -227,3 +239,78 @@ def gui_run_chip_collection(
         parameters,
         dcid,
     )
+
+
+@bpp.run_decorator()
+def gui_run_extruder_collection(
+    sub_dir: str,
+    file_name: str,
+    exp_time: float,
+    det_dist: float,
+    transmission: float,
+    num_images: int,
+    pump_probe: bool,
+    laser_dwell: float,
+    laser_delay: float,
+    zebra: Zebra = inject("zebra"),
+    aperture: Aperture = inject("aperture"),
+    backlight: DualBacklight = inject("backlight"),
+    beamstop: Beamstop = inject("beamstop"),
+    detector_stage: YZStage = inject("detector_motion"),
+    shutter: HutchShutter = inject("shutter"),
+    dcm: DCM = inject("dcm"),
+    mirrors: FocusMirrorsMode = inject("focus_mirrors"),
+    attenuator: EnumFilterAttenuator = inject("attenuator"),
+    beam_center_eiger: DetectorBeamCenter = inject("eiger_bc"),
+):
+    """Set parameter model for extruder and run the data collection.
+    Args:
+        sub_dir (str): subdirectory of the visit to write data in.
+        file_name (str): filename to be used for the collection.
+        exp_time (float): exposure time of each image, in s.
+        det_dist (float): sample-detector distance, in mm.
+        transmission (float): requested beam intensity transmission, expressed as
+            a fraction, e.g. 0.3.
+        num_images (int): number of images be collected.
+        pump_probe (bool): 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.
+    """
+    # NOTE. For now setting attenuation here in place of the edms doing a caput
+    yield from bps.abs_set(attenuator, transmission, wait=True)
+    start_time = datetime.now()
+    SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
+
+    params = {
+        "visit": _read_visit_directory_from_file().as_posix(),  # noqa
+        "directory": sub_dir,
+        "filename": file_name,
+        "exposure_time_s": exp_time,
+        "detector_distance_mm": det_dist,
+        "detector_name": "eiger",
+        "transmission": transmission,
+        "num_images": num_images,
+        "pump_status": pump_probe,
+        "laser_dwell_s": laser_dwell,
+        "laser_delay_s": laser_delay,
+    }
+    parameters = ExtruderParameters(**params)
+    # Create collection directory
+    parameters.collection_directory.mkdir(parents=True, exist_ok=True)
+    # DCID - not generated yet
+    dcid = DCID(emit_errors=False, expt_params=parameters)
+
+    yield from run_ex_collection_plan(
+        zebra,
+        aperture,
+        backlight,
+        beamstop,
+        detector_stage,
+        shutter,
+        dcm,
+        mirrors,
+        beam_center_eiger,
+        parameters,
+        dcid,
+        start_time,
+    )

mx_bluesky/beamlines/i24/serial/write_nexus.py

@@ -37,7 +37,7 @@ def call_nexgen(
     Raises:
         ValueError: For a wrong experiment type passed (either unknown or not matched \
             to parameter model).
-        HTTPError: For a problem with reponse from server
+        HTTPError: For a problem with response from server
 
     """
     current_chip_map = None
@@ -55,7 +55,7 @@ def call_nexgen(
             total_numb_imgs = parameters.num_images
             pump_status = parameters.pump_status
 
-    filename_prefix = cagetstring(Eiger.pv.filenameRBV)
+    filename_prefix = cagetstring(Eiger.PV.filename_rbv)
     meta_h5 = parameters.visit / parameters.directory / f"{filename_prefix}_meta.h5"
     t0 = time.time()
     max_wait = 60  # seconds
@@ -71,7 +71,7 @@ def call_nexgen(
         SSX_LOGGER.warning(f"Giving up waiting for {meta_h5} after {max_wait} seconds")
         return
 
-    bit_depth = int(caget(Eiger.pv.bit_depth))
+    bit_depth = int(caget(Eiger.PV.bit_depth))
     SSX_LOGGER.debug(
         f"Call to nexgen server with the following chip definition: \n{chip_prog_dict}"
     )
@@ -109,7 +109,7 @@ def submit_to_server(
     Raises:
         ValueError: For a wrong experiment type passed (either unknown or not matched \
             to parameter model).
-        HTTPError: For a problem with reponse from server
+        HTTPError: For a problem with response from server
 
     """
     access_token = pathlib.Path("/scratch/ssx_nexgen.key").read_text().strip()

mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py

@@ -37,8 +37,8 @@ from mx_bluesky.common.parameters.constants import (
 from mx_bluesky.common.parameters.device_composites import FlyScanEssentialDevices
 from mx_bluesky.common.parameters.gridscan import SpecifiedThreeDGridScan
 from mx_bluesky.common.utils.exceptions import (
-    CrystalNotFoundException,
-    SampleException,
+    CrystalNotFoundError,
+    SampleError,
 )
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.utils.tracing import TRACER
@@ -77,7 +77,7 @@ def generic_tidy(xrc_composite: FlyScanEssentialDevices, wait=True) -> MsgGenera
     yield from bps.wait(group)
 
 
-def construct_beamline_specific_FGS_features(
+def construct_beamline_specific_fast_gridscan_features(
     setup_trigger_plan: Callable[..., MsgGenerator],
     tidy_plan: Callable[..., MsgGenerator],
     set_flyscan_params_plan: Callable[..., MsgGenerator],
@@ -235,7 +235,7 @@ def _fetch_xrc_results_from_zocalo(
             flyscan_results = [_generate_dummy_xrc_result(parameters)]
         else:
             LOGGER.warning("No X-ray centre received")
-            raise CrystalNotFoundException()
+            raise CrystalNotFoundError()
     yield from _fire_xray_centre_result_event(flyscan_results)
 
 
@@ -276,7 +276,7 @@ def run_gridscan(
         yield from beamline_specific.set_flyscan_params_plan()
     except FailedStatus as e:
         if isinstance(e.__cause__, GridScanInvalidError):
-            raise SampleException(
+            raise SampleError(
                 "Scan invalid - gridscan not valid for detected pin position"
             ) from e
 
@@ -301,7 +301,7 @@ def run_gridscan(
 def _xrc_result_in_boxes_to_result_in_mm(
     xrc_result: XrcResult, parameters: SpecifiedThreeDGridScan
 ) -> XRayCentreResult:
-    fgs_params = parameters.FGS_params
+    fgs_params = parameters.fast_gridscan_params
     xray_centre = fgs_params.grid_position_to_motor_position(
         np.array(xrc_result["centre_of_mass"])
     )

mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py

@@ -29,7 +29,7 @@ from mx_bluesky.common.experiment_plans.oav_grid_detection_plan import (
     grid_detection_plan,
 )
 from mx_bluesky.common.experiment_plans.oav_snapshot_plan import (
-    setup_beamline_for_OAV,
+    setup_beamline_for_oav,
 )
 from mx_bluesky.common.external_interaction.callbacks.common.grid_detection_callback import (
     GridDetectionCallback,
@@ -123,7 +123,7 @@ def detect_grid_and_do_gridscan(
 
     grid_params_callback = GridDetectionCallback()
 
-    yield from setup_beamline_for_OAV(
+    yield from setup_beamline_for_oav(
         composite.smargon,
         composite.backlight,
         composite.aperture_scatterguard,

mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py

@@ -46,7 +46,7 @@ def _wait_for_zocalo_to_stage_then_do_fgs(
     LOGGER.info("Waiting for Zocalo device queue to have been cleared...")
     yield from bps.wait(ZOCALO_STAGE_GROUP)
 
-    # Triggers Zocalo if RE is subscribed to ZocaloCallback
+    # Triggers Zocalo if run_engine is subscribed to ZocaloCallback
     yield from read_hardware_for_zocalo(detector)
     LOGGER.info("Wait for all moves with no assigned group")
     yield from bps.wait()