mx-bluesky 1.4.1__tar.gz → 1.4.2__tar.gz

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/.github/workflows/_container.yml

@@ -51,6 +51,7 @@ jobs:
         # Docker cache and publish it
         with:
           context: .
+          file: Dockerfile.release
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mx-bluesky
-Version: 1.4.1
+Version: 1.4.2
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -239,7 +239,7 @@ Requires-Dist: daq-config-server>=0.1.1
 Requires-Dist: ophyd==1.9.0
 Requires-Dist: ophyd-async>=0.8a5
 Requires-Dist: bluesky>=1.13.0a4
-Requires-Dist: dls-dodal==1.36.2
+Requires-Dist: dls-dodal==1.36.3
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
     "ophyd == 1.9.0",
     "ophyd-async >= 0.8a5",
     "bluesky >= 1.13.0a4",
-    "dls-dodal == 1.36.2",
+    "dls-dodal == 1.36.3",
 ]
 
 

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.1'
-__version_tuple__ = version_tuple = (1, 4, 1)
+__version__ = version = '1.4.2'
+__version_tuple__ = version_tuple = (1, 4, 2)

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/__init__.py

@@ -18,9 +18,6 @@ from .fixed_target.i24ssx_Chip_Manager_py3v1 import (
     moveto,
     moveto_preset,
     pumpprobe_calc,
-    save_screen_map,
-    upload_parameters,
-    write_parameter_file,
 )
 from .log import clean_up_log_config_at_end, setup_collection_logs
 from .setup_beamline.setup_detector import setup_detector_stage
@@ -44,9 +41,6 @@ __all__ = [
     "load_lite_map",
     "load_stock_map",
     "pumpprobe_calc",
-    "save_screen_map",
-    "upload_parameters",
-    "write_parameter_file",
     "setup_collection_logs",
     "clean_up_log_config_at_end",
 ]

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/extruder/i24ssx_Extruder_Collect_py3v2.py

@@ -4,9 +4,7 @@ This version in python3 new Feb2021 by RLO
     - March 21 added logging and Eiger functionality
 """
 
-import json
 import re
-import shutil
 import sys
 import time
 from datetime import datetime
@@ -40,10 +38,6 @@ from mx_bluesky.beamlines.i24.serial.log import (
     log_on_entry,
 )
 from mx_bluesky.beamlines.i24.serial.parameters import ExtruderParameters
-from mx_bluesky.beamlines.i24.serial.parameters.constants import (
-    PARAM_FILE_NAME,
-    PARAM_FILE_PATH,
-)
 from mx_bluesky.beamlines.i24.serial.setup_beamline import Pilatus, caget, caput, pv
 from mx_bluesky.beamlines.i24.serial.setup_beamline import setup_beamline as sup
 from mx_bluesky.beamlines.i24.serial.setup_beamline.setup_detector import (
@@ -141,12 +135,20 @@ def enter_hutch(
 
 
 @log_on_entry
-def write_parameter_file(
-    detector_stage: DetectorMotion, attenuator: ReadOnlyAttenuator
-):
-    """Writes a json parameter file that can later be parsed by the model."""
-    param_file: Path = PARAM_FILE_PATH / PARAM_FILE_NAME
-    SSX_LOGGER.debug(f"Writing Parameter File to: {param_file}\n")
+def read_parameters(detector_stage: DetectorMotion, attenuator: ReadOnlyAttenuator):
+    """ Read the parameters from user input and create the parameter model for an \
+        extruder collection.
+
+    Args:
+        detector_stage (DetectorMotion): The detector stage device.
+        attenuator (ReadOnlyAttenuator): A read-only attenuator device to get the \
+            transmission value.
+
+    Returns:
+        ExtruderParameters: Parameter model for extruder collections
+
+    """
+    SSX_LOGGER.info("Creating parameter model from input.")
 
     det_type = yield from get_detector_type(detector_stage)
     SSX_LOGGER.warning(f"DETECTOR TYPE: {det_type}")
@@ -182,12 +184,11 @@ def write_parameter_file(
         "laser_dwell_s": pump_exp,
         "laser_delay_s": pump_delay,
     }
-    with open(param_file, "w") as f:
-        json.dump(params_dict, f, indent=4)
 
     SSX_LOGGER.info("Parameters \n")
     SSX_LOGGER.info(pformat(params_dict))
     yield from bps.null()
+    return ExtruderParameters(**params_dict)
 
 
 @log_on_entry
@@ -467,11 +468,6 @@ def collection_complete_plan(
     dcid.collection_complete(end_time, aborted=False)
     SSX_LOGGER.info(f"End Time = {end_time.ctime()}")
 
-    # Copy parameter file
-    shutil.copy2(
-        PARAM_FILE_PATH / PARAM_FILE_NAME,
-        collection_directory / PARAM_FILE_NAME,
-    )
     yield from bps.null()
 
 
@@ -489,8 +485,9 @@ def run_extruder_plan(
     start_time = datetime.now()
     SSX_LOGGER.info(f"Collection start time: {start_time.ctime()}")
 
-    yield from write_parameter_file(detector_stage, attenuator)
-    parameters = ExtruderParameters.from_file(PARAM_FILE_PATH / PARAM_FILE_NAME)
+    parameters: ExtruderParameters = yield from read_parameters(
+        detector_stage, attenuator
+    )
 
     beam_center_device = sup.get_beam_center_device(parameters.detector_name)
 

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/fixed_target/FT-gui-edm/MappingLite-oxford_py3v1.edl

@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 1062
-y 369
+x 308
+y 339
 w 650
 h 400
 font "arial-medium-r-18.0"
@@ -179,50 +179,6 @@ font "arial-medium-r-18.0"
 colorPv "ME14E-MO-IOC-01:GP67"
 endObjectProperties
 
-# (Shell Command)
-object shellCmdClass
-beginObjectProperties
-major 4
-minor 3
-release 0
-x 40
-y 290
-w 194
-h 40
-fgColor index 0
-bgColor index 23
-topShadowColor index 1
-botShadowColor index 11
-font "arial-medium-r-18.0"
-buttonLabel "Save Screen Map"
-numCmds 1
-command {
-  0 "blueapi -c CONFIG_LOCATION controller run save_screen_map"
-}
-endObjectProperties
-
-# (Shell Command)
-object shellCmdClass
-beginObjectProperties
-major 4
-minor 3
-release 0
-x 12
-y 337
-w 244
-h 53
-fgColor index 13
-bgColor index 49
-topShadowColor index 1
-botShadowColor index 11
-font "arial-medium-r-18.0"
-buttonLabel "Upload Parameters"
-numCmds 1
-command {
-  0 "blueapi -c CONFIG_LOCATION controller run upload_parameters '\{\"pmac\":\"pmac\"\}'"
-}
-endObjectProperties
-
 # (Message Button)
 object activeMessageButtonClass
 beginObjectProperties

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Collect_py3v1.py

@@ -2,14 +2,12 @@
 Fixed target data collection
 """
 
-import shutil
 from datetime import datetime
 from pathlib import Path
 from time import sleep
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
-import numpy as np
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.attenuator import ReadOnlyAttenuator
@@ -35,18 +33,11 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     PumpProbeSetting,
 )
 from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_Manager_py3v1 import (
-    write_parameter_file,
+    read_parameters,
+    upload_chip_map_to_geobrick,
 )
 from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
-from mx_bluesky.beamlines.i24.serial.parameters import (
-    ChipDescription,
-    FixedTargetParameters,
-)
-from mx_bluesky.beamlines.i24.serial.parameters.constants import (
-    LITEMAP_PATH,
-    PARAM_FILE_NAME,
-    PARAM_FILE_PATH_FT,
-)
+from mx_bluesky.beamlines.i24.serial.parameters import FixedTargetParameters
 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 (
@@ -107,19 +98,6 @@ def calculate_collection_timeout(parameters: FixedTargetParameters) -> float:
     return timeout
 
 
-def copy_files_to_data_location(
-    dest_dir: Path | str,
-    param_path: Path = PARAM_FILE_PATH_FT,
-    map_file: Path = LITEMAP_PATH,
-    map_type: MappingType = MappingType.Lite,
-):
-    if not isinstance(dest_dir, Path):
-        dest_dir = Path(dest_dir)
-    shutil.copy2(param_path / "parameters.txt", dest_dir / "parameters.txt")
-    if map_type == MappingType.Lite:
-        shutil.copy2(map_file / "currentchip.map", dest_dir / "currentchip.map")
-
-
 def write_userlog(
     parameters: FixedTargetParameters,
     filename: str,
@@ -308,50 +286,18 @@ def get_prog_num(
 
 
 @log_on_entry
-def datasetsizei24(
-    n_exposures: int,
-    chip_params: ChipDescription,
-    map_type: MappingType,
-) -> int:
-    # Calculates how many images will be collected based on map type and N repeats
-    SSX_LOGGER.info("Calculate total number of images expected in data collection.")
-
-    if map_type == MappingType.NoMap:
-        if chip_params.chip_type == ChipType.Custom:
-            total_numb_imgs = chip_params.x_num_steps * chip_params.y_num_steps
-            SSX_LOGGER.info(
-                f"Map type: None \tCustom chip \tNumber of images {total_numb_imgs}"
-            )
-        else:
-            chip_format = chip_params.chip_format[:4]
-            total_numb_imgs = int(np.prod(chip_format))
-            SSX_LOGGER.info(
-                f"""Map type: None \tOxford chip {chip_params.chip_type} \t \
-                    Number of images {total_numb_imgs}"""
-            )
-
-    elif map_type == MappingType.Lite:
-        SSX_LOGGER.info(f"Using Mapping Lite on chip type {chip_params.chip_type}")
-        chip_format = chip_params.chip_format[2:4]
-        block_count = 0
-        with open(LITEMAP_PATH / "currentchip.map") as f:
-            for line in f.readlines():
-                entry = line.split()
-                if entry[2] == "1":
-                    block_count += 1
-
-        SSX_LOGGER.info(f"Block count={block_count}")
-        SSX_LOGGER.info(f"Chip format={chip_format}")
-
-        SSX_LOGGER.info(f"Number of exposures={n_exposures}")
-
-        total_numb_imgs = int(np.prod(chip_format) * block_count * n_exposures)
-        SSX_LOGGER.info(f"Calculated number of images: {total_numb_imgs}")
+def set_datasize(
+    parameters: FixedTargetParameters,
+):
+    SSX_LOGGER.info("Setting PV to calculated total number of images")
 
-    SSX_LOGGER.info("Set PV to calculated number of images.")
-    caput(pv.me14e_gp10, int(total_numb_imgs))
+    SSX_LOGGER.debug(f"Map type: {parameters.map_type}")
+    SSX_LOGGER.debug(f"Chip type: {parameters.chip.chip_type}")
+    if parameters.map_type == MappingType.Lite:
+        SSX_LOGGER.debug(f"Num exposures: {parameters.num_exposures}")
+        SSX_LOGGER.debug(f"Block count: {len(parameters.chip_map)}")
 
-    return int(total_numb_imgs)
+    caput(pv.me14e_gp10, parameters.total_num_images)
 
 
 @log_on_entry
@@ -622,9 +568,7 @@ def main_fixed_target_plan(
         parameters.checker_pattern,
     )
 
-    parameters.total_num_images = datasetsizei24(
-        parameters.num_exposures, parameters.chip, parameters.map_type
-    )
+    set_datasize(parameters)
 
     start_time = yield from start_i24(
         zebra,
@@ -695,8 +639,7 @@ def collection_complete_plan(
     SSX_LOGGER.debug(f"Collection end time {end_time}")
     dcid.collection_complete(end_time, aborted=False)
 
-    # Copy parameter file and eventual chip map to collection directory
-    copy_files_to_data_location(collection_directory, map_type=map_type)
+    # NOTE no files to copy anymore but shoud write userlog here
     yield from bps.null()
 
 
@@ -749,29 +692,13 @@ def run_fixed_target_plan(
     mirrors: FocusMirrorsMode = inject("focus_mirrors"),
     attenuator: ReadOnlyAttenuator = inject("attenuator"),
 ) -> MsgGenerator:
-    # in the first instance, write params here
-    yield from write_parameter_file(detector_stage, attenuator)
-
-    SSX_LOGGER.info("Getting parameters from file.")
-    parameters = FixedTargetParameters.from_file(PARAM_FILE_PATH_FT / PARAM_FILE_NAME)
-
-    log_msg = f"""
-            Parameters for I24 serial collection: \n
-                Chip name is {parameters.filename}
-                visit = {parameters.visit}
-                sub_dir = {parameters.directory}
-                n_exposures = {parameters.num_exposures}
-                chip_type = {str(parameters.chip.chip_type)}
-                map_type = {str(parameters.map_type)}
-                dcdetdist = {parameters.detector_distance_mm}
-                exptime = {parameters.exposure_time_s}
-                det_type = {parameters.detector_name}
-                pump_repeat = {str(parameters.pump_repeat)}
-                pumpexptime = {parameters.laser_dwell_s}
-                pumpdelay = {parameters.laser_delay_s}
-                prepumpexptime = {parameters.pre_pump_exposure_s}
-        """
-    SSX_LOGGER.info(log_msg)
+    # Read the parameters
+    parameters: FixedTargetParameters = yield from read_parameters(
+        detector_stage, attenuator
+    )
+
+    if parameters.chip_map:
+        upload_chip_map_to_geobrick(pmac, parameters.chip_map)
 
     beam_center_device = sup.get_beam_center_device(parameters.detector_name)
 

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Manager_py3v1.py

@@ -21,17 +21,24 @@ 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.ft_utils import ChipType, Fiducials
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
+    ChipType,
+    Fiducials,
+    MappingType,
+)
 from mx_bluesky.beamlines.i24.serial.log import (
     SSX_LOGGER,
     _read_visit_directory_from_file,
     log_on_entry,
 )
-from mx_bluesky.beamlines.i24.serial.parameters import get_chip_format
+from mx_bluesky.beamlines.i24.serial.parameters import (
+    FixedTargetParameters,
+    get_chip_format,
+    get_chip_map,
+)
 from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     CS_FILES_PATH,
     LITEMAP_PATH,
-    PARAM_FILE_NAME,
     PARAM_FILE_PATH_FT,
     PVAR_FILE_PATH,
 )
@@ -47,6 +54,8 @@ CHIP_MOVES = {
     ChipType.Custom: 25.40,
     ChipType.Minichip: 25.40,
 }
+OXFORD_CHIP_WIDTH = 8
+PVAR_TEMPLATE = f"P3%0{2}d1"
 CHIPTYPE_PV = pv.me14e_gp1
 MAPTYPE_PV = pv.me14e_gp2
 NUM_EXPOSURES_PV = pv.me14e_gp3
@@ -107,22 +116,35 @@ def initialise_stages(
 
 
 @log_on_entry
-def write_parameter_file(
+def read_parameters(
     detector_stage: DetectorMotion,
     attenuator: ReadOnlyAttenuator,
 ) -> MsgGenerator:
-    param_path: Path = PARAM_FILE_PATH_FT
-    # Create directory if it doesn't yet exist.
-    param_path.mkdir(parents=True, exist_ok=True)
+    """ Read the parameters from user input and create the parameter model for a fixed \
+        target collection.
 
-    SSX_LOGGER.info(
-        f"Writing Parameter File: {(param_path / PARAM_FILE_NAME).as_posix()}"
-    )
+    Args:
+        detector_stage (DetectorMotion): The detector stage device.
+        attenuator (ReadOnlyAttenuator): A read-only attenuator device to get the \
+            transmission value.
+
+    Returns:
+        FixedTargetParameters: Parameter model for fixed target collections
+
+    """
+    SSX_LOGGER.info("Creating parameter model from input.")
 
     filename = caget(pv.me14e_chip_name)
     det_type = yield from get_detector_type(detector_stage)
     chip_params = get_chip_format(ChipType(int(caget(CHIPTYPE_PV))))
     map_type = int(caget(MAPTYPE_PV))
+    if map_type == MappingType.Lite and chip_params.chip_type in [
+        ChipType.Oxford,
+        ChipType.OxfordInner,
+    ]:
+        chip_map = get_chip_map()
+    else:
+        chip_map = []
     pump_repeat = int(caget(PUMP_REPEAT_PV))
 
     # If file name ends in a digit this causes processing/pilatus pain.
@@ -153,6 +175,7 @@ def write_parameter_file(
         "map_type": map_type,
         "pump_repeat": pump_repeat,
         "checker_pattern": bool(caget(pv.me14e_gp111)),
+        "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,
         "pre_pump_exposure_s": float(caget(pv.me14e_gp109))
@@ -160,13 +183,11 @@ def write_parameter_file(
         else None,
     }
 
-    with open(param_path / PARAM_FILE_NAME, "w") as f:
-        json.dump(params_dict, f, indent=4)
-
-    SSX_LOGGER.info("Information written to file \n")
+    SSX_LOGGER.info("Parameters for I24 serial collection: \n")
     SSX_LOGGER.info(pformat(params_dict))
 
     yield from bps.null()
+    return FixedTargetParameters(**params_dict)
 
 
 def scrape_pvar_file(fid: str, pvar_dir: Path = PVAR_FILE_PATH):
@@ -221,59 +242,25 @@ def define_current_chip(
 
 
 @log_on_entry
-def save_screen_map() -> MsgGenerator:
-    litemap_path: Path = LITEMAP_PATH
-    litemap_path.mkdir(parents=True, exist_ok=True)
-
-    SSX_LOGGER.info(f"Saving {litemap_path.as_posix()} currentchip.map")
-    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 = f"ME14E-MO-IOC-01:GP{x + 10:d}"
-            block_val = int(caget(block_str))
-            if block_val == 1:
-                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()
+def upload_chip_map_to_geobrick(pmac: PMAC, chip_map: list[int]) -> MsgGenerator:
+    """Upload the map parameters for an Oxford-type chip (width=8) to the geobrick.
 
+    Args:
+        pmac (PMAC): The PMAC device.
+        chip_map (list[int]): A list of selected blocks to be collected.
 
-@log_on_entry
-def upload_parameters(pmac: PMAC = inject("pmac")) -> MsgGenerator:
+    """
     SSX_LOGGER.info("Uploading Parameters for Oxford Chip to the GeoBrick")
-    caput(CHIPTYPE_PV, 0)
-    width = 8
-
-    map_file: Path = LITEMAP_PATH / "currentchip.map"
-    if not map_file.exists():
-        raise FileNotFoundError(f"The file {map_file} has not yet been created")
-
-    with open(map_file) as f:
-        SSX_LOGGER.info(f"Chipid {ChipType.Oxford}")
-        SSX_LOGGER.info(f"width {width}")
-        x = 1
-        for line in f.readlines()[: width**2]:
-            cols = line.split()
-            pvar = cols[1]
-            value = cols[2]
-            s = pvar + "=" + value
-            if value != "1":
-                s2 = pvar + "   "
-                sys.stdout.write(s2)
-            else:
-                sys.stdout.write(s + " ")
-            sys.stdout.flush()
-            if x == width:
-                print()
-                x = 1
-            else:
-                x += 1
-            yield from bps.abs_set(pmac.pmac_string, s, wait=True)
-            sleep(0.02)
-
-    SSX_LOGGER.warning("Automatic Setting Mapping Type to Lite has been disabled")
+    SSX_LOGGER.info(f"Chipid {ChipType.Oxford}, width {OXFORD_CHIP_WIDTH}")
+    for block in range(1, 65):
+        value = 1 if block in chip_map else 0
+        pvar = PVAR_TEMPLATE % block
+        pvar_str = f"{pvar}={value}"
+        SSX_LOGGER.debug(f"Set {pvar_str} for block {block}")
+        yield from bps.abs_set(pmac.pmac_string, pvar_str, wait=True)
+        # Wait for PMAC to be done processing PVAR string
+        sleep(0.02)
     SSX_LOGGER.debug("Upload parameters done.")
-    yield from bps.null()
 
 
 @log_on_entry

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py

@@ -3,28 +3,10 @@ Startup utilities for chip
 """
 
 import string
-from pathlib import Path
 
 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 (
-    FixedTargetParameters,
-    get_chip_format,
-)
-from mx_bluesky.beamlines.i24.serial.parameters.constants import (
-    PARAM_FILE_NAME,
-    PARAM_FILE_PATH_FT,
-)
-
-
-def read_parameter_file(
-    param_path: Path | str = PARAM_FILE_PATH_FT,
-) -> FixedTargetParameters:
-    if not isinstance(param_path, Path):
-        param_path = Path(param_path)
-    params_file = param_path / PARAM_FILE_NAME
-    params = FixedTargetParameters.from_file(params_file)
-    return params
+from mx_bluesky.beamlines.i24.serial.parameters import get_chip_format
 
 
 @log_on_entry

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/parameters/__init__.py

@@ -6,7 +6,10 @@ from mx_bluesky.beamlines.i24.serial.parameters.experiment_parameters import (
     FixedTargetParameters,
     SerialAndLaserExperiment,
 )
-from mx_bluesky.beamlines.i24.serial.parameters.utils import get_chip_format
+from mx_bluesky.beamlines.i24.serial.parameters.utils import (
+    get_chip_format,
+    get_chip_map,
+)
 
 __all__ = [
     "SSXType",
@@ -16,4 +19,5 @@ __all__ = [
     "FixedTargetParameters",
     "SerialAndLaserExperiment",
     "get_chip_format",
+    "get_chip_map",
 ]

{mx_bluesky-1.4.1 → mx_bluesky-1.4.2}/src/mx_bluesky/beamlines/i24/serial/parameters/experiment_parameters.py

@@ -3,7 +3,8 @@ from abc import abstractmethod
 from pathlib import Path
 from typing import Literal
 
-from pydantic import BaseModel, ConfigDict, field_validator
+import numpy as np
+from pydantic import BaseModel, ConfigDict, computed_field, field_validator
 
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
     ChipType,
@@ -56,6 +57,11 @@ class SerialAndLaserExperiment(SerialExperiment, LaserExperiment):
     def nexgen_experiment_type(self) -> str:
         pass
 
+    @property
+    @abstractmethod
+    def ispyb_experiment_type(self) -> SSXType:
+        pass
+
 
 class ExtruderParameters(SerialAndLaserExperiment):
     """Extruder parameter model."""
@@ -103,6 +109,10 @@ class ChipDescription(BaseModel):
         else:
             return ((self.y_num_steps - 1) * self.y_step_size) + self.b2b_vert
 
+    @property
+    def tot_num_blocks(self) -> int:
+        return self.x_blocks * self.y_blocks
+
 
 class FixedTargetParameters(SerialAndLaserExperiment):
     """Fixed target parameter model."""
@@ -112,7 +122,7 @@ class FixedTargetParameters(SerialAndLaserExperiment):
     map_type: MappingType
     pump_repeat: PumpProbeSetting
     checker_pattern: bool = False
-    total_num_images: int = 0  # Calculated in the code for now
+    chip_map: list[int]
 
     @property
     def nexgen_experiment_type(self) -> str:
@@ -122,6 +132,28 @@ class FixedTargetParameters(SerialAndLaserExperiment):
     def ispyb_experiment_type(self) -> SSXType:
         return SSXType.FIXED
 
+    @computed_field  # type: ignore   # Mypy doesn't like it
+    @property
+    def total_num_images(self) -> int:
+        match self.map_type:
+            case MappingType.NoMap:
+                if self.chip.chip_type is ChipType.Custom:
+                    num_images = (
+                        self.chip.x_num_steps
+                        * self.chip.y_num_steps
+                        * self.num_exposures
+                    )
+                else:
+                    chip_format = self.chip.chip_format[:4]
+                    num_images = int(np.prod(chip_format) * self.num_exposures)
+            case MappingType.Lite:
+                chip_format = self.chip.chip_format[2:4]
+                block_count = len(self.chip_map)  # type: ignore
+                num_images = int(
+                    np.prod(chip_format) * block_count * self.num_exposures
+                )
+        return num_images
+
 
 class BeamSettings(BaseModel):
     model_config = ConfigDict(frozen=True)