mx-bluesky 0.0.2__py3-none-any.whl → 1.1.0__py3-none-any.whl

mx_bluesky/{I24 → beamlines/i24}/serial/log.py

@@ -1,18 +1,39 @@
-from __future__ import annotations
-
 import functools
 import logging
 import logging.config
 from os import environ
 from pathlib import Path
-from typing import Optional
+
+from dodal.log import (
+    ERROR_LOG_BUFFER_LINES,
+    integrate_bluesky_and_ophyd_logging,
+    set_up_all_logging_handlers,
+)
+from dodal.log import LOGGER as dodal_logger
+
+VISIT_PATH = Path("/dls_sw/i24/etc/ssx_current_visit.txt")
+
+
+class OphydDebugFilter(logging.Filter):  # NOTE yet to be fully tested
+    """Do not send ophyd debug log messages to stream handler."""
+
+    def filter(self, record):
+        return "ophyd" not in record.getMessage().lower()
+
 
 # Logging set up
-logging.getLogger("I24ssx").addHandler(logging.NullHandler())
+logger = logging.getLogger("I24ssx")
+logger.addHandler(logging.NullHandler())
+logger.parent = dodal_logger
 
 logging_config = {
     "version": 1,
     "disable_existing_loggers": False,
+    "filters": {
+        "ophyd_filter": {
+            "()": OphydDebugFilter,
+        }
+    },
     "formatters": {
         "default": {
             "class": "logging.Formatter",
@@ -24,6 +45,7 @@ logging_config = {
             "level": "DEBUG",
             "class": "logging.StreamHandler",
             "formatter": "default",
+            "filters": ["ophyd_filter"],
             "stream": "ext://sys.stdout",
         }
     },
@@ -39,6 +61,12 @@ logging_config = {
 logging.config.dictConfig(logging_config)
 
 
+def _read_visit_directory_from_file() -> Path:
+    with open(VISIT_PATH) as f:
+        visit = f.readline().rstrip()
+    return Path(visit)
+
+
 def _get_logging_file_path() -> Path:
     """Get the path to write the artemis log files to.
     If on a beamline, this will be written to the according area depending on the
@@ -47,26 +75,44 @@ def _get_logging_file_path() -> Path:
     Returns:
         logging_path (Path): Path to the log file for the file handler to write to.
     """
-    beamline: Optional[str] = environ.get("BEAMLINE")
+    beamline: str | None = environ.get("BEAMLINE")
     logging_path: Path
 
     if beamline:
-        logging_path = Path("/dls_sw/" + beamline + "/logs/serial/")
+        logging_path = _read_visit_directory_from_file() / "tmp/serial/logs"
     else:
         logging_path = Path("./tmp/logs/")
 
-    try:
-        Path(logging_path).mkdir(parents=True, exist_ok=True)
-    except OSError:
-        # Until https://github.com/DiamondLightSource/mx_bluesky/issues/45 is fixed
-        # Logs could also go to the current visit directory, but not always possible
-        # when testing
-        logging_path = Path("~/serial_logs/").expanduser().resolve()
-        Path(logging_path).mkdir(parents=True, exist_ok=True)
+    Path(logging_path).mkdir(parents=True, exist_ok=True)
     return logging_path
 
 
-def config(logfile: str | None = None, write_mode: str = "a", delayed: bool = False):
+def default_logging_setup(dev_mode: bool = False):
+    """ Default log setup for i24 serial.
+
+    - Set up handlers for parent logger (from dodal)
+    - integrate bluesky and ophyd loggers
+    - Remove dodal stream handler to avoid double messages (for now, use only the \
+        i24ssx default stream to keep the output expected by the scientists.)
+    """
+    handlers = set_up_all_logging_handlers(  # noqa: F841
+        dodal_logger,
+        _get_logging_file_path(),
+        "dodal.log",
+        dev_mode,
+        ERROR_LOG_BUFFER_LINES,
+    )
+    integrate_bluesky_and_ophyd_logging(dodal_logger)
+    # Remove dodal StreamHandler to avoid duplication of messages above debug
+    dodal_logger.removeHandler(dodal_logger.handlers[0])
+
+
+def config(
+    logfile: str | None = None,
+    write_mode: str = "a",
+    delayed: bool = False,
+    dev_mode: bool = False,
+):
     """
     Configure the logging.
 
@@ -75,8 +121,11 @@ def config(logfile: str | None = None, write_mode: str = "a", delayed: bool = Fa
             for the logger to write to file the log output. Defaults to None.
         write_mode (str, optional): String indicating writing mode for the output \
             .log file. Defaults to "a".
+        dev_mode (bool, optional): If true, will log to graylog on localhost instead \
+            of production. Defaults to False.
     """
-    logger = logging.getLogger("I24ssx")
+    default_logging_setup(dev_mode=dev_mode)
+
     if logfile:
         logs = _get_logging_file_path() / logfile
         fileFormatter = logging.Formatter(
@@ -90,12 +139,10 @@ def config(logfile: str | None = None, write_mode: str = "a", delayed: bool = Fa
 
 
 def log_on_entry(func):
-    logger = logging.getLogger("I24ssx")
-
     @functools.wraps(func)
     def decorator(*args, **kwargs):
         name = func.__name__
-        logger.debug("Running %s " % name)
+        logger.debug(f"Running {name} ")
         return func(*args, **kwargs)
 
     return decorator

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

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

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

@@ -0,0 +1,47 @@
+from enum import Enum
+from os import environ
+from pathlib import Path
+
+from mx_bluesky.beamlines.i24.serial.log import _read_visit_directory_from_file
+
+
+class SSXType(Enum):
+    FIXED = "Serial Fixed"
+    EXTRUDER = "Serial Jet"
+
+
+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",
+    "display_config": "/dls_sw/i24/software/gda_versions/var/display.configuration",
+}
+OAV1_CAM = "http://bl24i-di-serv-01.diamond.ac.uk:8080/OAV1.mjpg.mjpg"
+
+HEADER_FILES_PATH = Path("/dls_sw/i24/scripts/fastchips/").expanduser().resolve()
+
+INTERNAL_FILES_PATH = Path(__file__).absolute().parent
+
+
+def _params_file_location() -> Path:
+    beamline: str | None = environ.get("BEAMLINE")
+    filepath: Path
+
+    if beamline:
+        filepath = _read_visit_directory_from_file() / "tmp/serial/parameters"
+    else:
+        filepath = INTERNAL_FILES_PATH
+
+    filepath.mkdir(parents=True, exist_ok=True)
+
+    return filepath
+
+
+PARAM_FILE_NAME = "parameters.json"
+# Paths for rw - these should have been created on startup
+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

@@ -0,0 +1,103 @@
+import json
+from pathlib import Path
+from typing import Literal
+
+from pydantic import BaseModel, field_validator
+
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import (
+    ChipType,
+    MappingType,
+    PumpProbeSetting,
+)
+
+
+class SerialExperiment(BaseModel):
+    """Generic parameters common to all serial experiments."""
+
+    visit: Path
+    directory: str
+    filename: str
+    exposure_time_s: float
+    detector_distance_mm: float
+    detector_name: Literal["eiger", "pilatus"]
+
+    @field_validator("visit", mode="before")
+    @classmethod
+    def _parse_visit(cls, visit: str | Path):
+        if isinstance(visit, str):
+            return Path(visit)
+        return visit
+
+    @property
+    def collection_directory(self) -> Path:
+        return Path(self.visit) / self.directory
+
+
+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
+    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
+
+    @classmethod
+    def from_file(cls, filename: str | Path):
+        with open(filename) as fh:
+            raw_params = json.load(fh)
+        return cls(**raw_params)
+
+
+class ChipDescription(BaseModel):
+    """Parameters defining the chip in use for FT collection."""
+
+    chip_type: ChipType
+    x_num_steps: int
+    y_num_steps: int
+    x_step_size: float
+    y_step_size: float
+    x_blocks: int
+    y_blocks: int
+    b2b_horz: float
+    b2b_vert: float
+
+    @property
+    def chip_format(self) -> list[int]:
+        return [self.x_blocks, self.y_blocks, self.x_num_steps, self.y_num_steps]
+
+    @property
+    def x_block_size(self) -> float:
+        if self.chip_type.name == "Custom":
+            return 0.0  # placeholder
+        else:
+            return ((self.x_num_steps - 1) * self.x_step_size) + self.b2b_horz
+
+    @property
+    def y_block_size(self) -> float:
+        if self.chip_type.name == "Custom":
+            return 0.0  # placeholder
+        else:
+            return ((self.y_num_steps - 1) * self.y_step_size) + self.b2b_vert
+
+
+class FixedTargetParameters(SerialExperiment, LaserExperiment):
+    """Fixed target parameter model."""
+
+    num_exposures: int
+    chip: ChipDescription
+    map_type: MappingType
+    pump_repeat: PumpProbeSetting
+    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)

mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json

@@ -0,0 +1,9 @@
+{
+    "scalex": 10004.0,
+    "scaley": 10005.2,
+    "scalez": 10000.0,
+    "skew": -0.01,
+    "Sx_dir": 1,
+    "Sy_dir": 1,
+    "Sz_dir": 1
+}

mx_bluesky/{I24 → beamlines/i24}/serial/parameters/fixed_target/cs/motor_direction.txt

@@ -6,5 +6,5 @@
 # motor number * (dir) = positive chip direction
 
 mtr1_dir=1
-mtr2_dir=1
+mtr2_dir=-1
 mtr3_dir=-1

mx_bluesky/{I24 → beamlines/i24}/serial/parameters/fixed_target/pvar_files/minichip-oxford.pvar

@@ -16,4 +16,4 @@ P3062=1.250 P3063=0.000
 
 P3072=2.375 P3073=0.000
 P3082=2.375 P3083=1.250
-P3092=2.375 P3093=2.375
+P3092=2.375 P3093=2.375

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

@@ -0,0 +1,42 @@
+from typing import Any
+
+from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
+from mx_bluesky.beamlines.i24.serial.parameters.experiment_parameters import (
+    ChipDescription,
+)
+from mx_bluesky.beamlines.i24.serial.setup_beamline import caget, pv
+
+
+def get_chip_format(chip_type: ChipType) -> ChipDescription:
+    """Default parameter values."""
+    defaults: dict[str, int | float] = {}
+    match chip_type:
+        case ChipType.Oxford:
+            defaults["x_num_steps"] = defaults["y_num_steps"] = 20
+            defaults["x_step_size"] = defaults["y_step_size"] = 0.125
+            defaults["x_blocks"] = defaults["y_blocks"] = 8
+            defaults["b2b_horz"] = defaults["b2b_vert"] = 0.800
+        case ChipType.OxfordInner:
+            defaults["x_num_steps"] = defaults["y_num_steps"] = 25
+            defaults["x_step_size"] = defaults["y_step_size"] = 0.600
+            defaults["x_blocks"] = defaults["y_blocks"] = 1
+            defaults["b2b_horz"] = defaults["b2b_vert"] = 0.0
+        case ChipType.Minichip:
+            defaults["x_num_steps"] = defaults["y_num_steps"] = 20
+            defaults["x_step_size"] = defaults["y_step_size"] = 0.125
+            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))
+            defaults["x_blocks"] = defaults["y_blocks"] = 1
+            defaults["b2b_horz"] = defaults["b2b_vert"] = 0.0
+        case ChipType.MISP:
+            defaults["x_num_steps"] = defaults["y_num_steps"] = 78
+            defaults["x_step_size"] = defaults["y_step_size"] = 0.1193
+            defaults["x_blocks"] = defaults["y_blocks"] = 1
+            defaults["b2b_horz"] = defaults["b2b_vert"] = 0.0
+    chip_params: dict[str, Any] = {"chip_type": chip_type, **defaults}
+    return ChipDescription(**chip_params)

mx_bluesky/beamlines/i24/serial/run_extruder.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Get edm path from input
+edm_path=$1
+
+# Get the directory of this script
+current=$( realpath "$( dirname "$0" )" )
+
+# Run script to start blueapi serve
+. $current/start_blueapi.sh
+
+# Open the edm screen for an extruder serial collection
+echo "Starting extruder edm screen."
+edm -x "${edm_path}/EX-gui/DiamondExtruder-I24-py3v1.edl"
+
+echo "Edm screen closed, bye!"
+
+pgrep blueapi | xargs kill
+echo "Blueapi process killed"

mx_bluesky/beamlines/i24/serial/run_fixed_target.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Get edm path from input
+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" )" )
+
+# Run script to start blueapi serve
+. $current/start_blueapi.sh
+
+# Open the edm screen for a fixed target serial collection
+echo "Starting fixed target edm screen."
+edm -x "${edm_path}/FT-gui/DiamondChipI24-py3v1.edl"
+
+echo "Edm screen closed, bye!"
+
+pgrep blueapi | xargs kill
+echo "Blueapi process killed"

mx_bluesky/beamlines/i24/serial/run_serial.py

@@ -0,0 +1,36 @@
+import logging
+import subprocess
+from os import environ
+from pathlib import Path
+
+logger = logging.getLogger("I24ssx.run")
+
+
+def get_location(default: str = "dev") -> str:
+    return environ.get("BEAMLINE") or default
+
+
+def get_edm_path() -> Path:
+    return Path(__file__).parents[5] / "edm_serial"
+
+
+def _get_file_path() -> Path:
+    return Path(__file__).parent
+
+
+def run_extruder():
+    loc = get_location()
+    logger.debug(f"Running on {loc}.")
+    edm_path = get_edm_path()
+    filepath = _get_file_path()
+    logger.debug(f"Running {filepath}/run_extruder.sh")
+    subprocess.run(["sh", filepath / "run_extruder.sh", edm_path.as_posix()])
+
+
+def run_fixed_target():
+    loc = get_location()
+    logger.info(f"Running on {loc}.")
+    edm_path = get_edm_path()
+    filepath = _get_file_path()
+    logger.debug(f"Running {filepath}/run_fixed_target.sh")
+    subprocess.run(["sh", filepath / "run_fixed_target.sh", edm_path.as_posix()])

mx_bluesky/{I24 → beamlines/i24}/serial/set_visit_directory.sh

@@ -30,6 +30,11 @@ echo "Reading visit from file: $filename"
 visit=$(sed -n '1p' $filename)
 expt_type=${1:-FT}
 
+# Append a / to the visit if missing to avoid filepaths issues later on
+if [[ "${visit: -1}" != "/" ]]; then
+    visit="${visit}/"
+fi
+
 ex_pv=BL24I-EA-IOC-12:GP1
 ft_pv=ME14E-MO-IOC-01:GP100
 
@@ -48,4 +53,4 @@ then
 else
     echo -e "Unknown experiment type, visit PV not set. \nValid experiment values: fixed-target, extruder."
     exit 1
-fi
+fi

mx_bluesky/{I24 → beamlines/i24}/serial/setup_beamline/pv.py

@@ -19,7 +19,7 @@ def __show__(name):
 def __which__():
     """Return script directory, used for finding which pv.py you are running"""
     pathname, scriptname = os.path.split(sys.argv[0])
-    print(("Current dir: " + os.path.abspath(pathname)))
+    print("Current dir: " + os.path.abspath(pathname))
     print("path to pv.py: ")
 
 
@@ -90,60 +90,6 @@ eiger_beamy = "BL24I-EA-EIGER-01:CAM:BeamY"
 eiger_omegaincr = "BL24I-EA-EIGER-01:CAM:OmegaIncr"
 eiger_ODfilenameRBV = "BL24I-EA-EIGER-01:OD:FP:FileName_RBV"
 
-# eiger_filenumber    = 'BL24I-EA-PILAT-01:cam1:FileNumber'
-# eiger_imagemode     = 'BL24I-EA-PILAT-01:cam1:ImageMode'
-# eiger_filetemplate  = 'BL24I-EA-PILAT-01:cam1:FileTemplate'
-# eiger_delaytime     = 'BL24I-EA-PILAT-01:cam1:DelayTime'
-# eiger_filtertrasm   = 'BL24I-EA-PILAT-01:cam1:FilterTransm'
-# eiger_filetemplate  = 'BL24I-EA-PILAT-01:cam1:FileTemplate'
-# eiger_startangle    = 'BL24I-EA-PILAT-01:cam1:StartAngle'
-# eiger_angleincr     = 'BL24I-EA-PILAT-01:cam1:AngleIncr'
-
-# eiger_cbftemplate   = 'BL24I-EA-PILAT-01:cam1:CbfTemplateFile'
-
-# ZEBRA
-zebra1_and2_inp1 = "BL24I-EA-ZEBRA-01:AND2_INP1"
-zebra1_and2_inp2 = "BL24I-EA-ZEBRA-01:AND2_INP2"
-zebra1_and3_inp1 = "BL24I-EA-ZEBRA-01:AND3_INP1"
-zebra1_and3_inp2 = "BL24I-EA-ZEBRA-01:AND3_INP2"
-zebra1_and4_inp1 = "BL24I-EA-ZEBRA-01:AND4_INP1"
-zebra1_and4_inp2 = "BL24I-EA-ZEBRA-01:AND4_INP2"
-zebra1_out1_ttl = "BL24I-EA-ZEBRA-01:OUT1_TTL"
-zebra1_out2_ttl = "BL24I-EA-ZEBRA-01:OUT2_TTL"
-zebra1_out3_ttl = "BL24I-EA-ZEBRA-01:OUT3_TTL"
-zebra1_out4_ttl = "BL24I-EA-ZEBRA-01:OUT4_TTL"
-zebra1_pc_arm_out = "BL24I-EA-ZEBRA-01:PC_ARM_OUT"
-zebra1_pc_arm = "BL24I-EA-ZEBRA-01:PC_ARM"
-zebra1_pc_disarm = "BL24I-EA-ZEBRA-01:PC_DISARM"
-zebra1_pc_arm_sel = "BL24I-EA-ZEBRA-01:PC_ARM_SEL"
-zebra1_pc_gate_sel = "BL24I-EA-ZEBRA-01:PC_GATE_SEL"
-zebra1_pc_gate_inp = "BL24I-EA-ZEBRA-01:PC_GATE_INP"
-zebra1_pc_gate_start = "BL24I-EA-ZEBRA-01:PC_GATE_START"
-zebra1_pc_gate_width = "BL24I-EA-ZEBRA-01:PC_GATE_WID"
-zebra1_pc_gate_step = "BL24I-EA-ZEBRA-01:PC_GATE_STEP"
-zebra1_pc_gate_ngate = "BL24I-EA-ZEBRA-01:PC_GATE_NGATE"
-zebra1_pc_pulse_sel = "BL24I-EA-ZEBRA-01:PC_PULSE_SEL"
-zebra1_pc_pulse_inp = "BL24I-EA-ZEBRA-01:PC_PULSE_INP"
-zebra1_pc_pulse_start = "BL24I-EA-ZEBRA-01:PC_PULSE_START"
-zebra1_pc_pulse_width = "BL24I-EA-ZEBRA-01:PC_PULSE_WID"
-zebra1_pc_pulse_step = "BL24I-EA-ZEBRA-01:PC_PULSE_STEP"
-zebra1_pc_pulse_max = "BL24I-EA-ZEBRA-01:PC_PULSE_MAX"
-zebra1_soft_in_b0 = "BL24I-EA-ZEBRA-01:SOFT_IN:B0"
-zebra1_soft_in_b1 = "BL24I-EA-ZEBRA-01:SOFT_IN:B1"
-zebra1_soft_in_b2 = "BL24I-EA-ZEBRA-01:SOFT_IN:B2"
-zebra1_soft_in_b3 = "BL24I-EA-ZEBRA-01:SOFT_IN:B3"
-zebra1_pc_enc = "BL24I-EA-ZEBRA-01:PC_ENC"
-zebra1_pc_dir = "BL24I-EA-ZEBRA-01:PC_DIR"
-zebra1_reset_proc = "BL24I-EA-ZEBRA-01:SYS_RESET.PROC"
-zebra1_config_read_proc = "BL24I-EA-ZEBRA-01:CONFIG_READ.PROC"
-zebra1_or1_ena_b0 = "BL24I-EA-ZEBRA-01:OR1_ENA:B0"
-zebra1_pulse1_inp = "BL24I-EA-ZEBRA-01:PULSE1_INP"
-zebra1_pulse1_delay = "BL24I-EA-ZEBRA-01:PULSE1_DLY"
-zebra1_pulse1_width = "BL24I-EA-ZEBRA-01:PULSE1_WID"
-zebra1_pulse2_inp = "BL24I-EA-ZEBRA-01:PULSE2_INP"
-zebra1_pulse2_delay = "BL24I-EA-ZEBRA-01:PULSE2_DLY"
-zebra1_pulse2_width = "BL24I-EA-ZEBRA-01:PULSE2_WID"
-
 # BPMs
 qbpm1_inten = "BL24I-DI-QBPM-01:INTEN"
 qbpm1_intenN = "BL24I-DI-QBPM-01:INTEN_N"
@@ -209,13 +155,6 @@ dcm_pitch2 = "BL24I-MO-DCM-01:XTAL2:PITCH"
 dcm_lambda = "BL24I-MO-DCM-01:LAMBDA"
 dcm_energy = "BL24I-MO-DCM-01:ENERGY"
 
-# OLD Mono. Left for short term reference only 10Nov21
-# dcm_bragg  = 'BL24I-OP-DCM-01:BRAGG'
-# dcm_t2     = 'BL24I-OP-DCM-01:T2'
-# dcm_roll1  = 'BL24I-OP-DCM-01:ROLL1'
-# dcm_pitch2 = 'BL24I-OP-DCM-01:PITCH2'
-# dcm_lambda = 'BL24I-OP-DCM-01:LAMBDA'
-# dcm_energy = 'BL24I-OP-DCM-01:ENERGY'
 # S2
 s2_x_plus = "BL24I-AL-SLITS-02:X:PLUS"
 s2_x_minus = "BL24I-AL-SLITS-02:X:MINUS"

mx_bluesky/{I24 → beamlines/i24}/serial/setup_beamline/pv_abstract.py

@@ -4,11 +4,8 @@ Cleaner abstractions of the PV table.
 Takes the PV tables from I24's setup_beamline and wraps a slightly more
 abstract wrapper around them.
 """
-from __future__ import annotations
 
-from typing import Union
-
-from mx_bluesky.I24.serial.setup_beamline import pv
+from mx_bluesky.beamlines.i24.serial.setup_beamline import pv
 
 
 class Pilatus:
@@ -19,7 +16,7 @@ class Pilatus:
     image_size_pixels = (2463, 2527)
     pixel_size_mm = (0.172, 0.172)
     image_size_mm = tuple(
-        round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm)
+        round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm, strict=False)
     )
 
     det_y_threshold = 560.0
@@ -48,7 +45,7 @@ class Eiger:
     image_size_pixels = (3108, 3262)
 
     image_size_mm = tuple(
-        round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm)
+        round(a * b, 3) for a, b in zip(image_size_pixels, pixel_size_mm, strict=False)
     )
 
     det_y_threshold = -10.0
@@ -58,15 +55,17 @@ class Eiger:
         detector_distance = pv.eiger_detdist
         wavelength = pv.eiger_wavelength
         transmission = "BL24I-EA-PILAT-01:cam1:FilterTransm"
+        filenameRBV = pv.eiger_ODfilenameRBV
         file_name = pv.eiger_ODfilename
         file_path = pv.eiger_ODfilepath
         file_template = None
         sequence_id = pv.eiger_seqID
         beamx = pv.eiger_beamx
         beamy = pv.eiger_beamy
+        bit_depth = pv.eiger_bitdepthrbv
 
     def __str__(self) -> str:
         return self.name
 
 
-Detector = Union[Pilatus, Eiger]
+Detector = Pilatus | Eiger