mx-bluesky 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

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

@@ -5,7 +5,6 @@ This version changed to python3 March2020 by RLO
 
 import json
 import re
-import shutil
 import sys
 import time
 from pathlib import Path
@@ -14,25 +13,15 @@ from time import sleep
 
 import bluesky.plan_stubs as bps
 import numpy as np
-from blueapi.core import MsgGenerator
-from dodal.beamlines import i24
+from bluesky.utils import MsgGenerator
 from dodal.common import inject
+from dodal.devices.attenuator import ReadOnlyAttenuator
 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 dodal.devices.i24.pmac import PMAC, EncReset, LaserSettings
 
-from mx_bluesky.beamlines.i24.serial.fixed_target import (
-    i24ssx_Chip_Mapping_py3v1 as mapping,
-)
-from mx_bluesky.beamlines.i24.serial.fixed_target import (
-    i24ssx_Chip_StartUp_py3v1 as startup,
-)
-from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
-    ChipType,
-    Fiducials,
-    MappingType,
-)
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType, Fiducials
 from mx_bluesky.beamlines.i24.serial.log import (
     SSX_LOGGER,
     _read_visit_directory_from_file,
@@ -41,7 +30,6 @@ from mx_bluesky.beamlines.i24.serial.log import (
 from mx_bluesky.beamlines.i24.serial.parameters import get_chip_format
 from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     CS_FILES_PATH,
-    FULLMAP_PATH,
     LITEMAP_PATH,
     PARAM_FILE_NAME,
     PARAM_FILE_PATH_FT,
@@ -106,6 +94,9 @@ def initialise_stages(
     sleep(0.1)
     SSX_LOGGER.info("Clearing General Purpose PVs 1-120")
     for i in range(4, 120):
+        if i == 100:
+            # Do not clear visit PV
+            continue
         pvar = "ME14E-MO-IOC-01:GP" + str(i)
         caput(pvar, 0)
         sys.stdout.write(".")
@@ -118,6 +109,7 @@ def initialise_stages(
 @log_on_entry
 def write_parameter_file(
     detector_stage: DetectorMotion,
+    attenuator: ReadOnlyAttenuator,
 ) -> MsgGenerator:
     param_path: Path = PARAM_FILE_PATH_FT
     # Create directory if it doesn't yet exist.
@@ -146,6 +138,8 @@ def write_parameter_file(
                 f"Requested filename ends in a number. Appended dash: {filename}"
             )
 
+    transmission = yield from bps.rd(attenuator.actual_transmission)
+
     params_dict = {
         "visit": _read_visit_directory_from_file().as_posix(),  # noqa
         "directory": caget(pv.me14e_filepath),
@@ -154,12 +148,13 @@ def write_parameter_file(
         "detector_distance_mm": caget(pv.me14e_dcdetdist),
         "detector_name": str(det_type),
         "num_exposures": int(caget(NUM_EXPOSURES_PV)),
-        "chip": chip_params.dict(),
+        "transmission": transmission,
+        "chip": chip_params.model_dump(),
         "map_type": map_type,
         "pump_repeat": pump_repeat,
         "checker_pattern": bool(caget(pv.me14e_gp111)),
-        "laser_dwell_s": float(caget(pv.me14e_gp103)) if pump_repeat != 0 else None,
-        "laser_delay_s": float(caget(pv.me14e_gp110)) if pump_repeat != 0 else None,
+        "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,
         "pre_pump_exposure_s": float(caget(pv.me14e_gp109))
         if pump_repeat != 0
         else None,
@@ -171,11 +166,6 @@ def write_parameter_file(
     SSX_LOGGER.info("Information written to file \n")
     SSX_LOGGER.info(pformat(params_dict))
 
-    if map_type == MappingType.Full:
-        # This step creates some header files (.addr, .spec), containing the parameters,
-        # that are only needed when full mapping is in use.
-        SSX_LOGGER.info("Full mapping in use. Running start up now.")
-        startup.run()
     yield from bps.null()
 
 
@@ -239,11 +229,11 @@ def save_screen_map() -> MsgGenerator:
     with open(litemap_path / "currentchip.map", "w") as f:
         SSX_LOGGER.debug("Printing only blocks with block_val == 1")
         for x in range(1, 82):
-            block_str = "ME14E-MO-IOC-01:GP%i" % (x + 10)
+            block_str = f"ME14E-MO-IOC-01:GP{x + 10:d}"
             block_val = int(caget(block_str))
             if block_val == 1:
-                SSX_LOGGER.info("%s %d" % (block_str, block_val))
-            line = "%02dstatus    P3%02d1 \t%s\n" % (x, x, block_val)
+                SSX_LOGGER.info(f"{block_str} {block_val:d}")
+            line = f"{x:02d}status    P3{x:02d}1 \t{block_val}\n"
             f.write(line)
     yield from bps.null()
 
@@ -286,29 +276,6 @@ def upload_parameters(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     yield from bps.null()
 
 
-@log_on_entry
-def upload_full(pmac: PMAC | None = None) -> MsgGenerator:
-    if not pmac:
-        pmac = i24.pmac()
-
-    map_file: Path = FULLMAP_PATH / "currentchip.full"
-    if not map_file.exists():
-        raise FileNotFoundError(f"The file {map_file} has not yet been created")
-    with open(map_file) as fh:
-        f = fh.readlines()
-
-    for _i in range(len(f) // 2):
-        pmac_list = []
-        for _j in range(2):
-            pmac_list.append(f.pop(0).rstrip("\n"))
-        writeline = " ".join(pmac_list)
-        SSX_LOGGER.info(f"{writeline}")
-        yield from bps.abs_set(pmac.pmac_string, writeline, wait=True)
-        yield from bps.sleep(0.02)
-    SSX_LOGGER.debug("Upload fullmap done")
-    yield from bps.null()
-
-
 @log_on_entry
 def load_stock_map(map_choice: str = "clear") -> MsgGenerator:
     # TODO See https://github.com/DiamondLightSource/mx_bluesky/issues/122
@@ -553,7 +520,7 @@ def load_lite_map() -> MsgGenerator:
                     break
                 button_name = str(row) + str(column)
                 lab_num = x * 8 + z
-                label = "%02.d" % (lab_num + 1)
+                label = f"{lab_num + 1:02d}"
                 btn_names[button_name] = label
         block_dict = btn_names
     else:
@@ -576,26 +543,6 @@ def load_lite_map() -> MsgGenerator:
     yield from bps.null()
 
 
-@log_on_entry
-def load_full_map() -> MsgGenerator:
-    from matplotlib import pyplot as plt
-
-    params = startup.read_parameter_file()
-
-    fullmap_fid = FULLMAP_PATH / f"{caget(MAP_FILEPATH_PV)}.spec"
-    SSX_LOGGER.info(f"Opening {fullmap_fid}")
-    mapping.plot_file(plt, fullmap_fid, params.chip.chip_type.value)
-    mapping.convert_chip_to_hex(fullmap_fid, params.chip.chip_type.value)
-    shutil.copy2(fullmap_fid.with_suffix(".full"), FULLMAP_PATH / "currentchip.full")
-    SSX_LOGGER.info(
-        "Copying {} to {}".format(
-            fullmap_fid.with_suffix(".full"), FULLMAP_PATH / "currentchip.full"
-        )
-    )
-    SSX_LOGGER.debug("Load full map done")
-    yield from bps.null()
-
-
 @log_on_entry
 def moveto(place: str = "origin", pmac: PMAC = inject("pmac")) -> MsgGenerator:
     SSX_LOGGER.info(f"Move to: {place}")
@@ -731,15 +678,15 @@ def fiducial(point: int = 1, pmac: PMAC = inject("pmac")) -> MsgGenerator:
     output_param_path.mkdir(parents=True, exist_ok=True)
     SSX_LOGGER.info(f"Writing Fiducial File {output_param_path}/fiducial_{point}.txt")
     SSX_LOGGER.info("MTR\tRBV\tRAW\tCorr\tf_value")
-    SSX_LOGGER.info("MTR1\t%1.4f\t%i" % (rbv_1, mtr1_dir))
-    SSX_LOGGER.info("MTR2\t%1.4f\t%i" % (rbv_2, mtr2_dir))
-    SSX_LOGGER.info("MTR3\t%1.4f\t%i" % (rbv_3, mtr3_dir))
+    SSX_LOGGER.info(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:d}")
+    SSX_LOGGER.info(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:d}")
+    SSX_LOGGER.info(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:d}")
 
     with open(output_param_path / f"fiducial_{point}.txt", "w") as f:
         f.write("MTR\tRBV\tCorr\n")
-        f.write("MTR1\t%1.4f\t%i\n" % (rbv_1, mtr1_dir))
-        f.write("MTR2\t%1.4f\t%i\n" % (rbv_2, mtr2_dir))
-        f.write("MTR3\t%1.4f\t%i" % (rbv_3, mtr3_dir))
+        f.write(f"MTR1\t{rbv_1:1.4f}\t{mtr1_dir:d}\n")
+        f.write(f"MTR2\t{rbv_2:1.4f}\t{mtr2_dir:d}\n")
+        f.write(f"MTR3\t{rbv_3:1.4f}\t{mtr3_dir:d}")
     SSX_LOGGER.info(f"Fiducial {point} set.")
     yield from bps.null()
 
@@ -901,13 +848,13 @@ def cs_maker(pmac: PMAC = inject("pmac")) -> MsgGenerator:
     sleep(2.5)
     yield from set_pmac_strings_for_cs(pmac, {"cs1": cs1, "cs2": cs2, "cs3": cs3})
     yield from bps.trigger(pmac.to_xyz_zero)
-    sleep(0.1)
+    sleep(2.5)
     yield from bps.trigger(pmac.home, wait=True)
-    sleep(0.1)
+    sleep(2.5)
     SSX_LOGGER.debug(f"Chip_type is {chip_type}")
     if chip_type == 0:
         yield from bps.abs_set(pmac.pmac_string, "!x0.4y0.4", wait=True)
-        sleep(0.1)
+        sleep(2.5)
         yield from bps.trigger(pmac.home, wait=True)
     else:
         yield from bps.trigger(pmac.home, wait=True)

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

@@ -2,13 +2,9 @@
 Startup utilities for chip
 """
 
-import os
 import string
-import time
 from pathlib import Path
 
-import numpy as np
-
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
 from mx_bluesky.beamlines.i24.serial.parameters import (
@@ -16,7 +12,6 @@ from mx_bluesky.beamlines.i24.serial.parameters import (
     get_chip_format,
 )
 from mx_bluesky.beamlines.i24.serial.parameters.constants import (
-    HEADER_FILES_PATH,
     PARAM_FILE_NAME,
     PARAM_FILE_PATH_FT,
 )
@@ -45,31 +40,6 @@ def fiducials(chip_type: int):
     return fiducial_list
 
 
-def get_xy(addr: str, chip_type: ChipType):
-    entry = addr.split("_")[-2:]
-    R, C = entry[0][0], entry[0][1]
-    r2, c2 = entry[1][0], entry[1][1]
-    blockR = string.ascii_uppercase.index(R)
-    blockC = int(C) - 1
-    lowercase_list = list(string.ascii_lowercase + string.ascii_uppercase + "0")
-    windowR = lowercase_list.index(r2)
-    windowC = lowercase_list.index(c2)
-
-    chip_params = get_chip_format(chip_type)
-
-    x = (
-        (blockC * chip_params.b2b_horz)
-        + (blockC * (chip_params.x_num_steps - 1) * chip_params.x_step_size)
-        + (windowC * chip_params.x_step_size)
-    )
-    y = (
-        (blockR * chip_params.b2b_vert)
-        + (blockR * (chip_params.y_num_steps - 1) * chip_params.y_step_size)
-        + (windowR * chip_params.y_step_size)
-    )
-    return x, y
-
-
 def pathli(l_in=None, way="typewriter", reverse=False):
     if l_in is None:
         l_in = []
@@ -147,172 +117,3 @@ def get_alphanumeric(chip_type: ChipType):
             alphanumeric_list.append(block + "_" + window)
     SSX_LOGGER.info(f"Length of alphanumeric list = {len(alphanumeric_list)}")
     return alphanumeric_list
-
-
-@log_on_entry
-def get_shot_order(chip_type: ChipType):
-    cell_format = get_chip_format(chip_type)
-    blk_num = cell_format.x_blocks
-    wnd_num = cell_format.x_num_steps
-    uppercase_list = list(string.ascii_uppercase)[:blk_num]
-    number_list = [str(x) for x in range(1, blk_num + 1)]
-    lowercase_list = list(string.ascii_lowercase + string.ascii_uppercase + "0")[
-        :wnd_num
-    ]
-
-    block_list = zippum([uppercase_list, "snake", 0], [number_list, "expand", 0])
-    window_dn = zippum([lowercase_list, "expand", 0], [lowercase_list, "snake", 0])
-    window_up = zippum([lowercase_list, "expand", 1], [lowercase_list, "snake", 0])
-
-    switch = 0
-    count = 0
-    collect_list = []
-    for block in block_list:
-        if switch == 0:
-            for window in window_dn:
-                collect_list.append(block + "_" + window)
-            count += 1
-            if count == blk_num:
-                count = 0
-                switch = 1
-        else:
-            for window in window_up:
-                collect_list.append(block + "_" + window)
-            count += 1
-            if count == blk_num:
-                count = 0
-                switch = 0
-
-    SSX_LOGGER.info(f"Length of collect list = {len(collect_list)}")
-    return collect_list
-
-
-@log_on_entry
-def write_file(
-    location: str = "i24",
-    suffix: str = ".addr",
-    order: str = "alphanumeric",
-    param_file_path: Path = PARAM_FILE_PATH_FT,
-    save_path: Path = HEADER_FILES_PATH,
-):
-    if location == "i24":
-        params = read_parameter_file(param_file_path)
-    else:
-        msg = f"Unknown location, {location}"
-        SSX_LOGGER.error(msg)
-        raise ValueError(msg)
-    chip_file_path = save_path / f"chips/{params.directory}/{params.filename}{suffix}"
-
-    fiducial_list = fiducials(params.chip.chip_type.value)
-
-    if order == "alphanumeric":
-        addr_list = get_alphanumeric(params.chip.chip_type)
-    elif order == "shot":
-        addr_list = get_shot_order(params.chip.chip_type)
-    else:
-        raise ValueError(f"{order=} unrecognised")
-
-    with open(chip_file_path, "a") as g:
-        for addr in addr_list:
-            xtal_name = "_".join([params.filename, addr])
-            (x, y) = get_xy(xtal_name, params.chip.chip_type)
-            if addr in fiducial_list:
-                pres = "0"
-            else:
-                if "rand" in suffix:
-                    pres = str(np.random.randint(2))
-                else:
-                    pres = "-1"
-            line = "\t".join([xtal_name, str(x), str(y), "0.0", pres]) + "\n"
-            g.write(line)
-
-    SSX_LOGGER.info(f"Write {chip_file_path} completed")
-
-
-@log_on_entry
-def check_files(
-    location: str,
-    suffix_list: list[str],
-    param_file_path: Path | str = PARAM_FILE_PATH_FT,
-    save_path: Path = HEADER_FILES_PATH,
-):
-    if location == "i24":
-        params = read_parameter_file(param_file_path)
-    else:
-        msg = f"Unknown location, {location}"
-        SSX_LOGGER.error(msg)
-        raise ValueError(msg)
-    chip_file_path = save_path / f"chips/{params.directory}/{params.filename}"
-
-    try:
-        os.stat(chip_file_path)
-    except Exception:
-        os.makedirs(chip_file_path)
-    for suffix in suffix_list:
-        full_fid = chip_file_path.with_suffix(suffix)
-        if full_fid.is_file():
-            time_str = time.strftime("%Y%m%d_%H%M%S_")
-            timestamp_fid = (  # noqa: F841
-                full_fid.parent / f"{time_str}_{params.filename}{full_fid.suffix}"
-            )
-            # FIXME hack / fix. Actually move the file
-            SSX_LOGGER.info(f"File {full_fid} Already Exists")
-    SSX_LOGGER.debug("Check files done")
-    return 1
-
-
-@log_on_entry
-def write_headers(
-    location: str,
-    suffix_list: list[str],
-    param_file_path: Path = PARAM_FILE_PATH_FT,
-    save_path: Path = HEADER_FILES_PATH,
-):
-    if location == "i24":
-        params = read_parameter_file(param_file_path)
-        chip_file_path = save_path / f"chips/{params.directory}/{params.filename}"
-
-        for suffix in suffix_list:
-            full_fid = chip_file_path.with_suffix(suffix)
-            with open(full_fid, "w") as g:
-                g.write(
-                    "#23456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\n#\n"
-                )
-                g.write(f"#&i24\tchip_name    = {params.filename}\n")
-                g.write(f"#&i24\tvisit        = {params.visit}\n")
-                g.write(f"#&i24\tsub_dir      = {params.directory}\n")
-                g.write(f"#&i24\tn_exposures  = {params.num_exposures}\n")
-                g.write(f"#&i24\tchip_type    = {params.chip.chip_type.value}\n")
-                g.write(f"#&i24\tmap_type     = {params.map_type.value}\n")
-                g.write(f"#&i24\tpump_repeat  = {params.pump_repeat.value}\n")
-                g.write(f"#&i24\tpumpexptime  = {params.laser_dwell_s}\n")
-                g.write(f"#&i24\texptime      = {params.laser_delay_s}\n")
-                g.write(f"#&i24\tdcdetdist    = {params.detector_distance_mm}\n")
-                g.write(f"#&i24\tprepumpexptime  = {params.pre_pump_exposure_s}\n")
-                g.write(f"#&i24\tdet_Type     = {params.detector_name}\n")
-                g.write("#\n")
-                g.write(
-                    "#XtalAddr      XCoord  YCoord  ZCoord  Present Shot  Spare04 Spare03 Spare02 Spare01\n"
-                )
-    else:
-        msg = f"Unknown location, {location}"
-        SSX_LOGGER.error(msg)
-        raise ValueError(msg)
-    SSX_LOGGER.debug("Write headers done")
-
-
-def run():
-    SSX_LOGGER.debug("Run Startup")
-    check_files("i24", [".addr", ".shot"])
-    SSX_LOGGER.info("Checked Files")
-    write_headers("i24", [".addr", ".shot"])
-    SSX_LOGGER.info("Written Headers")
-    SSX_LOGGER.info("Writing to Files has been disabled. Headers Only")
-    # Makes a file with random crystal positions
-    check_files("i24", ["rando.spec"])
-    write_headers("i24", ["rando.spec"])
-    SSX_LOGGER.debug("StartUp Done")
-
-
-if __name__ == "__main__":
-    run()

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

@@ -3,7 +3,6 @@ Move on click gui for fixed targets at I24
 Robin Owen 12 Jan 2021
 """
 
-import logging
 from collections.abc import Sequence
 
 import bluesky.plan_stubs as bps
@@ -17,10 +16,9 @@ from mx_bluesky.beamlines.i24.serial.fixed_target import (
     i24ssx_Chip_Manager_py3v1 as manager,
 )
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import Fiducials
+from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER
 from mx_bluesky.beamlines.i24.serial.parameters.constants import OAV1_CAM
 
-logger = logging.getLogger("I24ssx.moveonclick")
-
 
 def _get_beam_centre(oav: OAV):
     """Extract the beam centre x/y positions from the display.configuration file.
@@ -53,7 +51,7 @@ def _move_on_mouse_click_plan(
     x, y = clicked_position
     xmove = -1 * (beamX - x) * zoomcalibrator
     ymove = 1 * (beamY - y) * zoomcalibrator
-    logger.info(f"Moving X and Y {xmove} {ymove}")
+    SSX_LOGGER.info(f"Moving X and Y {xmove} {ymove}")
     xmovepmacstring = "#1J:" + str(xmove)
     ymovepmacstring = "#2J:" + str(ymove)
     yield from bps.abs_set(pmac.pmac_string, xmovepmacstring, wait=True)
@@ -66,7 +64,7 @@ def onMouse(event, x, y, flags, param):
         RE = param[0]
         pmac = param[1]
         oav = param[2]
-        logger.info(f"Clicked X and Y {x} {y}")
+        SSX_LOGGER.info(f"Clicked X and Y {x} {y}")
         RE(_move_on_mouse_click_plan(oav, pmac, (x, y)))
 
 
@@ -159,7 +157,7 @@ def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
     cv.namedWindow("OAV1view")
     cv.setMouseCallback("OAV1view", onMouse, param=[RE, pmac, oav])  # type: ignore
 
-    logger.info("Showing camera feed. Press escape to close")
+    SSX_LOGGER.info("Showing camera feed. Press escape to close")
     # Read captured video and store them in success and frame
     success, frame = cap.read()
 

mx_bluesky/beamlines/i24/serial/log.py

@@ -6,8 +6,8 @@ from os import environ
 from pathlib import Path
 
 import bluesky.plan_stubs as bps
-from blueapi.core import MsgGenerator
 from bluesky.log import logger as bluesky_logger
+from bluesky.utils import MsgGenerator
 from dodal.log import DEFAULT_GRAYLOG_PORT, ophyd_async_logger
 from dodal.log import LOGGER as dodal_logger
 

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

@@ -1,15 +1,19 @@
 from mx_bluesky.beamlines.i24.serial.parameters.constants import SSXType
 from mx_bluesky.beamlines.i24.serial.parameters.experiment_parameters import (
+    BeamSettings,
     ChipDescription,
     ExtruderParameters,
     FixedTargetParameters,
+    SerialAndLaserExperiment,
 )
 from mx_bluesky.beamlines.i24.serial.parameters.utils import get_chip_format
 
 __all__ = [
     "SSXType",
+    "BeamSettings",
     "ExtruderParameters",
     "ChipDescription",
     "FixedTargetParameters",
+    "SerialAndLaserExperiment",
     "get_chip_format",
 ]

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

@@ -10,6 +10,12 @@ class SSXType(Enum):
     EXTRUDER = "Serial Jet"
 
 
+BEAM_CENTER_POS: dict[str, list] = {
+    "eiger": [1600.0, 1697.4],
+    "pilatus": [1284.7, 1308.6],
+}
+
+
 OAV_CONFIG_FILES = {
     "zoom_params_file": "/dls_sw/i24/software/gda_versions/gda_9_34/config/xml/jCameraManZoomLevels.xml",
     "oav_config_json": "/dls_sw/i24/software/daq_configuration/json/OAVCentring.json",
@@ -41,7 +47,6 @@ PARAM_FILE_NAME = "parameters.json"
 PARAM_FILE_PATH = _params_file_location()
 PARAM_FILE_PATH_FT = PARAM_FILE_PATH / "fixed_target"
 LITEMAP_PATH = PARAM_FILE_PATH_FT / "litemaps"
-FULLMAP_PATH = PARAM_FILE_PATH_FT / "fullmaps"
 # Paths for r only
 PVAR_FILE_PATH = INTERNAL_FILES_PATH / "fixed_target/pvar_files"
 CS_FILES_PATH = INTERNAL_FILES_PATH / "fixed_target/cs"

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

@@ -1,14 +1,16 @@
 import json
+from abc import abstractmethod
 from pathlib import Path
 from typing import Literal
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, ConfigDict, field_validator
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,
     MappingType,
     PumpProbeSetting,
 )
+from mx_bluesky.beamlines.i24.serial.parameters.constants import SSXType
 
 
 class SerialExperiment(BaseModel):
@@ -20,6 +22,7 @@ class SerialExperiment(BaseModel):
     exposure_time_s: float
     detector_distance_mm: float
     detector_name: Literal["eiger", "pilatus"]
+    transmission: float
 
     @field_validator("visit", mode="before")
     @classmethod
@@ -36,23 +39,38 @@ class SerialExperiment(BaseModel):
 class LaserExperiment(BaseModel):
     """Laser settings for pump probe serial collections."""
 
-    laser_dwell_s: float | None = None  # pump exposure time
-    laser_delay_s: float | None = None  # pump delay
+    laser_dwell_s: float = 0.0  # pump exposure time
+    laser_delay_s: float = 0.0  # pump delay
     pre_pump_exposure_s: float | None = None  # Pre illumination, just for chip
 
 
-class ExtruderParameters(SerialExperiment, LaserExperiment):
-    """Extruder parameter model."""
-
-    num_images: int
-    pump_status: bool
-
+class SerialAndLaserExperiment(SerialExperiment, LaserExperiment):
     @classmethod
     def from_file(cls, filename: str | Path):
         with open(filename) as fh:
             raw_params = json.load(fh)
         return cls(**raw_params)
 
+    @property
+    @abstractmethod
+    def nexgen_experiment_type(self) -> str:
+        pass
+
+
+class ExtruderParameters(SerialAndLaserExperiment):
+    """Extruder parameter model."""
+
+    num_images: int
+    pump_status: bool
+
+    @property
+    def nexgen_experiment_type(self) -> str:
+        return "extruder"
+
+    @property
+    def ispyb_experiment_type(self) -> SSXType:
+        return SSXType.EXTRUDER
+
 
 class ChipDescription(BaseModel):
     """Parameters defining the chip in use for FT collection."""
@@ -86,7 +104,7 @@ class ChipDescription(BaseModel):
             return ((self.y_num_steps - 1) * self.y_step_size) + self.b2b_vert
 
 
-class FixedTargetParameters(SerialExperiment, LaserExperiment):
+class FixedTargetParameters(SerialAndLaserExperiment):
     """Fixed target parameter model."""
 
     num_exposures: int
@@ -96,8 +114,17 @@ class FixedTargetParameters(SerialExperiment, LaserExperiment):
     checker_pattern: bool = False
     total_num_images: int = 0  # Calculated in the code for now
 
-    @classmethod
-    def from_file(cls, filename: str | Path):
-        with open(filename) as fh:
-            raw_params = json.load(fh)
-        return cls(**raw_params)
+    @property
+    def nexgen_experiment_type(self) -> str:
+        return "fixed-target"
+
+    @property
+    def ispyb_experiment_type(self) -> SSXType:
+        return SSXType.FIXED
+
+
+class BeamSettings(BaseModel):
+    model_config = ConfigDict(frozen=True)
+    wavelength_in_a: float
+    beam_size_in_um: tuple[float, float]
+    beam_center_in_mm: tuple[float, float]

mx_bluesky/beamlines/i24/serial/run_fixed_target.sh

@@ -15,12 +15,13 @@ edm_path=$1
 # Export env variable for the stages edm to work properly
 export EDMDATAFILES="/dls_sw/prod/R3.14.12.3/support/motor/6-7-1dls14/motorApp/opi/edl"
 
+# Get the directory of this script
+current=$( realpath "$( dirname "$0" )" )
+
+
 if [[ $NO_PROCESERV_TEST == true ]]; then
     echo "Start the blueapi sever"
 
-    # Get the directory of this script
-    current=$( realpath "$( dirname "$0" )" )
-
     # Run script to start blueapi serve
     . $current/start_blueapi.sh
 fi

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

@@ -23,6 +23,8 @@ def __which__():
     print("path to pv.py: ")
 
 
+requested_transmission = "BL24I-OP-ATTN-01:T2A:SETVAL1"
+
 # PILATUS
 pilat_filepath = "BL24I-EA-PILAT-01:cam1:FilePath"
 pilat_filename = "BL24I-EA-PILAT-01:cam1:FileName"