mx-bluesky 1.5.6__py3-none-any.whl → 1.5.8__py3-none-any.whl

mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py

@@ -1,23 +1,28 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Sequence
+from enum import StrEnum
+from math import isclose
 from time import time
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from bluesky import preprocessors as bpp
 from bluesky.utils import MsgGenerator, make_decorator
+from dodal.devices.zocalo import ZocaloStartInfo
 
 from mx_bluesky.common.external_interaction.callbacks.common.ispyb_callback_base import (
     BaseISPyBCallback,
+    D,
 )
 from mx_bluesky.common.external_interaction.callbacks.common.ispyb_mapping import (
     populate_data_collection_group,
     populate_remaining_data_collection_info,
 )
+from mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback import (
+    ZocaloInfoGenerator,
+)
 from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_mapping import (
     construct_comment_for_gridscan,
-    populate_xy_data_collection_info,
-    populate_xz_data_collection_info,
 )
 from mx_bluesky.common.external_interaction.ispyb.data_model import (
     DataCollectionGridInfo,
@@ -33,14 +38,21 @@ from mx_bluesky.common.external_interaction.ispyb.ispyb_store import (
 )
 from mx_bluesky.common.parameters.components import DiffractionExperimentWithSample
 from mx_bluesky.common.parameters.constants import DocDescriptorNames, PlanNameConstants
-from mx_bluesky.common.parameters.gridscan import (
-    GridCommon,
-)
+from mx_bluesky.common.parameters.gridscan import GridCommon
 from mx_bluesky.common.utils.exceptions import (
     ISPyBDepositionNotMade,
     SampleException,
 )
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER, set_dcgid_tag
+from mx_bluesky.common.utils.utils import number_of_frames_from_scan_spec
+
+OMEGA_TOLERANCE = 1
+
+
+class GridscanPlane(StrEnum):
+    OMEGA_XY = "0"
+    OMEGA_XZ = "90"
+
 
 if TYPE_CHECKING:
     from event_model import Event, RunStart, RunStop
@@ -89,10 +101,10 @@ class GridscanISPyBCallback(BaseISPyBCallback):
     ) -> None:
         super().__init__(emit=emit)
         self.ispyb: StoreInIspyb
-        self.ispyb_ids: IspybIds = IspybIds()
         self.param_type = param_type
         self._start_of_fgs_uid: str | None = None
         self._processing_start_time: float | None = None
+        self._grid_plane_to_id_map: dict[GridscanPlane, int] = {}
         self.data_collection_group_info: DataCollectionGroupInfo | None
 
     def activity_gated_start(self, doc: RunStart):
@@ -108,6 +120,7 @@ class GridscanISPyBCallback(BaseISPyBCallback):
             mx_bluesky_parameters = doc.get("mx_bluesky_parameters")
             assert isinstance(mx_bluesky_parameters, str)
             self.params = self.param_type.model_validate_json(mx_bluesky_parameters)
+            assert isinstance(self.params, DiffractionExperimentWithSample)
             self.ispyb = StoreInIspyb(self.ispyb_config)
             self.data_collection_group_info = populate_data_collection_group(
                 self.params
@@ -118,8 +131,8 @@ class GridscanISPyBCallback(BaseISPyBCallback):
                     data_collection_info=populate_remaining_data_collection_info(
                         "MX-Bluesky: Xray centring 1 -",
                         None,
-                        populate_xy_data_collection_info(
-                            self.params.detector_params,
+                        DataCollectionInfo(
+                            data_collection_number=self.params.detector_params.run_number,
                         ),
                         self.params,
                     ),
@@ -128,7 +141,11 @@ class GridscanISPyBCallback(BaseISPyBCallback):
                     data_collection_info=populate_remaining_data_collection_info(
                         "MX-Bluesky: Xray centring 2 -",
                         None,
-                        populate_xz_data_collection_info(self.params.detector_params),
+                        DataCollectionInfo(
+                            data_collection_number=(
+                                self.params.detector_params.run_number + 1
+                            ),
+                        ),
                         self.params,
                     )
                 ),
@@ -175,7 +192,6 @@ class GridscanISPyBCallback(BaseISPyBCallback):
         assert self.params, "ISPyB handler didn't receive parameters!"
         assert self.data_collection_group_info, "No data collection group"
         data = doc["data"]
-        data_collection_id = None
         data_collection_info = DataCollectionInfo(
             xtal_snapshot1=data.get("oav-grid_snapshot-last_path_full_overlay"),
             xtal_snapshot2=data.get("oav-grid_snapshot-last_path_outer"),
@@ -214,10 +230,9 @@ class GridscanISPyBCallback(BaseISPyBCallback):
                 f"by {data_collection_grid_info.steps_y} "
             )
 
-        if len(self.ispyb_ids.data_collection_ids) > self._oav_snapshot_event_idx:
-            data_collection_id = self.ispyb_ids.data_collection_ids[
-                self._oav_snapshot_event_idx
-            ]
+        data_collection_id = self.ispyb_ids.data_collection_ids[
+            self._oav_snapshot_event_idx
+        ]
         self._populate_axis_info(data_collection_info, doc["data"]["smargon-omega"])
 
         scan_data_info = ScanDataInfo(
@@ -228,6 +243,11 @@ class GridscanISPyBCallback(BaseISPyBCallback):
         ISPYB_ZOCALO_CALLBACK_LOGGER.info(
             "Updating ispyb data collection after oav snapshot."
         )
+        grid_plane = _smargon_omega_to_xyxz_plane(doc["data"]["smargon-omega"])
+        # Snapshots may be triggered in a different order to gridscans, so save
+        # the mapping to the data collection id in order to trigger Zocalo correctly.
+        self._grid_plane_to_id_map[grid_plane] = data_collection_id
+
         self._oav_snapshot_event_idx += 1
         return [scan_data_info]
 
@@ -294,5 +314,43 @@ class GridscanISPyBCallback(BaseISPyBCallback):
                 self.ispyb_ids.data_collection_group_id,
             )
             self.data_collection_group_info = None
+            self._grid_plane_to_id_map.clear()
             return super().activity_gated_stop(doc)
-        return self._tag_doc(doc)
+        return self.tag_doc(doc)
+
+    def tag_doc(self, doc: D) -> D:
+        doc = super().tag_doc(doc)
+        assert isinstance(doc, dict)
+        if self._grid_plane_to_id_map:
+            doc["grid_plane_to_id_map"] = self._grid_plane_to_id_map
+        return doc  # type: ignore
+
+
+def generate_start_info_from_omega_map() -> ZocaloInfoGenerator:
+    """
+    Generate the zocalo trigger info from bluesky runs where the frame number is
+    computed using metadata added to the document by the ISPyB callback and the
+    run start which together can be used to determine the correct frame numbering.
+    """
+    doc = yield []
+    omega_to_scan_spec = doc["omega_to_scan_spec"]
+    start_frame = 0
+    infos = []
+    for i, omega in enumerate([GridscanPlane.OMEGA_XY, GridscanPlane.OMEGA_XZ]):
+        frames = number_of_frames_from_scan_spec(omega_to_scan_spec[omega])
+        infos.append(
+            ZocaloStartInfo(
+                doc["grid_plane_to_id_map"][omega], None, start_frame, frames, i
+            )
+        )
+        start_frame += frames
+    yield infos
+
+
+def _smargon_omega_to_xyxz_plane(smargon_omega: float) -> GridscanPlane:
+    modulo_180 = abs(smargon_omega) % 180
+    is_xy = isclose(modulo_180, 0, abs_tol=OMEGA_TOLERANCE)
+    assert is_xy or isclose(modulo_180, 90, abs_tol=OMEGA_TOLERANCE), (
+        f"Smargon snapshot omega not in tolerance of compass point {smargon_omega}"
+    )
+    return GridscanPlane.OMEGA_XY if is_xy else GridscanPlane.OMEGA_XZ

mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_mapping.py

@@ -1,33 +1,13 @@
 from __future__ import annotations
 
 import numpy
-from dodal.devices.detector import DetectorParams
 from dodal.devices.oav import utils as oav_utils
 
 from mx_bluesky.common.external_interaction.ispyb.data_model import (
     DataCollectionGridInfo,
-    DataCollectionInfo,
 )
 
 
-def populate_xz_data_collection_info(detector_params: DetectorParams):
-    assert (
-        detector_params.omega_start is not None
-        and detector_params.run_number is not None
-    ), "StoreGridscanInIspyb failed to get parameters"
-    run_number = detector_params.run_number + 1
-    info = DataCollectionInfo(
-        data_collection_number=run_number,
-    )
-    return info
-
-
-def populate_xy_data_collection_info(detector_params: DetectorParams):
-    return DataCollectionInfo(
-        data_collection_number=detector_params.run_number,
-    )
-
-
 def construct_comment_for_gridscan(grid_info: DataCollectionGridInfo) -> str:
     assert grid_info is not None, "StoreGridScanInIspyb failed to get parameters"
 

mx_bluesky/common/parameters/device_composites.py

@@ -8,7 +8,7 @@ from dodal.devices.common_dcm import BaseDCM
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
-    ZebraFastGridScan,
+    ZebraFastGridScanThreeD,
 )
 from dodal.devices.flux import Flux
 from dodal.devices.mx_phase1.beamstop import Beamstop
@@ -53,7 +53,7 @@ class GridDetectThenXRayCentreComposite(FlyScanEssentialDevices):
     beamstop: Beamstop
     dcm: BaseDCM
     detector_motion: DetectorMotion
-    zebra_fast_grid_scan: ZebraFastGridScan
+    zebra_fast_grid_scan: ZebraFastGridScanThreeD
     flux: Flux
     oav: OAV
     pin_tip_detection: PinTipDetection

mx_bluesky/common/parameters/gridscan.py

@@ -1,15 +1,19 @@
 from __future__ import annotations
 
+from abc import abstractmethod
+from typing import Generic, TypeVar
+
 from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector.det_dim_constants import EIGER2_X_9M_SIZE, EIGER2_X_16M_SIZE
 from dodal.devices.detector.detector import DetectorParams
 from dodal.devices.fast_grid_scan import (
-    ZebraGridScanParams,
+    GridScanParamsCommon,
+    ZebraGridScanParamsThreeD,
 )
 from dodal.utils import get_beamline_name
 from pydantic import Field, PrivateAttr
 from scanspec.core import Path as ScanPath
-from scanspec.specs import Line, Static
+from scanspec.specs import Concat, Line, Product, Static
 
 from mx_bluesky.common.parameters.components import (
     DiffractionExperimentWithSample,
@@ -33,6 +37,10 @@ DETECTOR_SIZE_PER_BEAMLINE = {
     "i04": EIGER2_X_16M_SIZE,
 }
 
+GridScanParamType = TypeVar(
+    "GridScanParamType", bound=GridScanParamsCommon, covariant=True
+)
+
 
 class GridCommon(
     DiffractionExperimentWithSample,
@@ -87,36 +95,80 @@ class GridCommon(
         )
 
 
-class SpecifiedGrid(XyzStarts, WithScan):
+class SpecifiedGrid(GridCommon, XyzStarts, WithScan, Generic[GridScanParamType]):
     """A specified grid is one which has defined values for the start position,
     grid and box sizes, etc., as opposed to parameters for a plan which will create
     those parameters at some point (e.g. through optical pin detection)."""
 
+    grid1_omega_deg: float = Field(default=GridscanParamConstants.OMEGA_1)
+    x_step_size_um: float = Field(default=GridscanParamConstants.BOX_WIDTH_UM)
+    y_step_size_um: float = Field(default=GridscanParamConstants.BOX_WIDTH_UM)
+    x_steps: int = Field(gt=0)
+    y_steps: int = Field(gt=0)
+    _set_stub_offsets: bool = PrivateAttr(default_factory=lambda: False)
+
+    @property
+    @abstractmethod
+    def FGS_params(self) -> GridScanParamType: ...
+
+    def do_set_stub_offsets(self, value: bool):
+        self._set_stub_offsets = value
+
+    @property
+    def grid_1_spec(self):
+        x_end = self.x_start_um + self.x_step_size_um * (self.x_steps - 1)
+        y1_end = self.y_start_um + self.y_step_size_um * (self.y_steps - 1)
+        grid_1_x = Line("sam_x", self.x_start_um, x_end, self.x_steps)
+        grid_1_y = Line("sam_y", self.y_start_um, y1_end, self.y_steps)
+        grid_1_z = Static("sam_z", self.z_start_um)
+        return grid_1_y.zip(grid_1_z) * ~grid_1_x
+
+    @property
+    def scan_indices(self) -> list[int]:
+        """The first index of each gridscan, useful for writing nexus files/VDS"""
+        return [
+            0,
+            len(ScanPath(self.grid_1_spec.calculate()).consume().midpoints["sam_x"]),
+        ]
+
+    @property
+    @abstractmethod
+    def scan_spec(self) -> Product[str] | Concat[str]:
+        """A fully specified ScanSpec object representing all grids, with x, y, z and
+        omega positions."""
+
+    @property
+    def scan_points(self):
+        """A list of all the points in the scan_spec."""
+        return ScanPath(self.scan_spec.calculate()).consume().midpoints
+
+    @property
+    def scan_points_first_grid(self):
+        """A list of all the points in the first grid scan."""
+        return ScanPath(self.grid_1_spec.calculate()).consume().midpoints
+
+    @property
+    def num_images(self) -> int:
+        return len(self.scan_points["sam_x"])
+
 
 class SpecifiedThreeDGridScan(
-    GridCommon,
-    SpecifiedGrid,
+    SpecifiedGrid[ZebraGridScanParamsThreeD],
     SplitScan,
     WithOptionalEnergyChange,
 ):
     """Parameters representing a so-called 3D grid scan, which consists of doing a
     gridscan in X and Y, followed by one in X and Z."""
 
-    grid1_omega_deg: float = Field(default=GridscanParamConstants.OMEGA_1)
-    grid2_omega_deg: float = Field(default=GridscanParamConstants.OMEGA_2)
-    x_step_size_um: float = Field(default=GridscanParamConstants.BOX_WIDTH_UM)
-    y_step_size_um: float = Field(default=GridscanParamConstants.BOX_WIDTH_UM)
+    z_steps: int = Field(gt=0)
     z_step_size_um: float = Field(default=GridscanParamConstants.BOX_WIDTH_UM)
     y2_start_um: float
     z2_start_um: float
-    x_steps: int = Field(gt=0)
-    y_steps: int = Field(gt=0)
-    z_steps: int = Field(gt=0)
-    _set_stub_offsets: bool = PrivateAttr(default_factory=lambda: False)
+    grid2_omega_deg: float = Field(default=GridscanParamConstants.OMEGA_2)
 
     @property
-    def FGS_params(self) -> ZebraGridScanParams:
-        return ZebraGridScanParams(
+    def FGS_params(self) -> ZebraGridScanParamsThreeD:
+        return ZebraGridScanParamsThreeD(
             x_steps=self.x_steps,
             y_steps=self.y_steps,
             z_steps=self.z_steps,
@@ -133,18 +185,6 @@ class SpecifiedThreeDGridScan(
             transmission_fraction=self.transmission_frac,
         )
 
-    def do_set_stub_offsets(self, value: bool):
-        self._set_stub_offsets = value
-
-    @property
-    def grid_1_spec(self):
-        x_end = self.x_start_um + self.x_step_size_um * (self.x_steps - 1)
-        y1_end = self.y_start_um + self.y_step_size_um * (self.y_steps - 1)
-        grid_1_x = Line("sam_x", self.x_start_um, x_end, self.x_steps)
-        grid_1_y = Line("sam_y", self.y_start_um, y1_end, self.y_steps)
-        grid_1_z = Static("sam_z", self.z_start_um)
-        return grid_1_y.zip(grid_1_z) * ~grid_1_x
-
     @property
     def grid_2_spec(self):
         x_end = self.x_start_um + self.x_step_size_um * (self.x_steps - 1)
@@ -154,35 +194,13 @@ class SpecifiedThreeDGridScan(
         grid_2_y = Static("sam_y", self.y2_start_um)
         return grid_2_z.zip(grid_2_y) * ~grid_2_x
 
-    @property
-    def scan_indices(self):
-        """The first index of each gridscan, useful for writing nexus files/VDS"""
-        return [
-            0,
-            len(ScanPath(self.grid_1_spec.calculate()).consume().midpoints["sam_x"]),
-        ]
-
     @property
     def scan_spec(self):
         """A fully specified ScanSpec object representing both grids, with x, y, z and
         omega positions."""
         return self.grid_1_spec.concat(self.grid_2_spec)
 
-    @property
-    def scan_points(self):
-        """A list of all the points in the scan_spec."""
-        return ScanPath(self.scan_spec.calculate()).consume().midpoints
-
-    @property
-    def scan_points_first_grid(self):
-        """A list of all the points in the first grid scan."""
-        return ScanPath(self.grid_1_spec.calculate()).consume().midpoints
-
     @property
     def scan_points_second_grid(self):
         """A list of all the points in the second grid scan."""
         return ScanPath(self.grid_2_spec.calculate()).consume().midpoints
-
-    @property
-    def num_images(self) -> int:
-        return len(self.scan_points["sam_x"])

mx_bluesky/hyperion/device_setup_plans/smargon.py

@@ -1,6 +1,8 @@
 import numpy as np
 from bluesky import plan_stubs as bps
+from bluesky.utils import FailedStatus
 from dodal.devices.smargon import CombinedMove, Smargon
+from ophyd_async.epics.motor import MotorLimitsException
 
 from mx_bluesky.common.utils.exceptions import SampleException
 
@@ -9,12 +11,15 @@ def move_smargon_warn_on_out_of_range(
     smargon: Smargon, position: np.ndarray | list[float] | tuple[float, float, float]
 ):
     """Throws a SampleException if the specified position is out of range for the
-    smargon. Otherwise moves to that position."""
-    limits = yield from smargon.get_xyz_limits()
-    if not limits.position_valid(position):
-        raise SampleException(
-            "Pin tip centring failed - pin too long/short/bent and out of range"
+    smargon. Otherwise moves to that position. The check is from ophyd-async"""
+    try:
+        yield from bps.mv(
+            smargon, CombinedMove(x=position[0], y=position[1], z=position[2])
         )
-    yield from bps.mv(
-        smargon, CombinedMove(x=position[0], y=position[1], z=position[2])
-    )
+    except FailedStatus as fs:
+        if isinstance(fs.__cause__, MotorLimitsException):
+            raise SampleException(
+                "Pin tip centring failed - pin too long/short/bent and out of range"
+            ) from fs.__cause__
+        else:
+            raise fs

mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -12,7 +12,7 @@ from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
-from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScan
+from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScanThreeD
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.i03 import Beamstop
@@ -72,7 +72,7 @@ class RobotLoadThenCentreComposite:
     backlight: Backlight
     detector_motion: DetectorMotion
     eiger: EigerDetector
-    zebra_fast_grid_scan: ZebraFastGridScan
+    zebra_fast_grid_scan: ZebraFastGridScanThreeD
     flux: Flux
     oav: OAV
     pin_tip_detection: PinTipDetection

mx_bluesky/hyperion/external_interaction/callbacks/__main__.py

@@ -23,6 +23,7 @@ from mx_bluesky.common.external_interaction.callbacks.sample_handling.sample_han
 )
 from mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback import (
     GridscanISPyBCallback,
+    generate_start_info_from_omega_map,
 )
 from mx_bluesky.common.external_interaction.callbacks.xray_centre.nexus_callback import (
     GridscanNexusFileCallback,
@@ -41,6 +42,7 @@ from mx_bluesky.hyperion.external_interaction.callbacks.robot_actions.ispyb_call
 )
 from mx_bluesky.hyperion.external_interaction.callbacks.rotation.ispyb_callback import (
     RotationISPyBCallback,
+    generate_start_info_from_ordered_runs,
 )
 from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback import (
     RotationNexusFileCallback,
@@ -66,7 +68,9 @@ def create_gridscan_callbacks() -> tuple[
         GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
         GridscanISPyBCallback(
             param_type=GridCommonWithHyperionDetectorParams,
-            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
+            emit=ZocaloCallback(
+                CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV, generate_start_info_from_omega_map
+            ),
         ),
     )
 
@@ -77,7 +81,11 @@ def create_rotation_callbacks() -> tuple[
     return (
         RotationNexusFileCallback(),
         RotationISPyBCallback(
-            emit=ZocaloCallback(CONST.PLAN.ROTATION_MULTI, CONST.ZOCALO_ENV)
+            emit=ZocaloCallback(
+                CONST.PLAN.ROTATION_MULTI,
+                CONST.ZOCALO_ENV,
+                generate_start_info_from_ordered_runs,
+            )
         ),
     )
 

mx_bluesky/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from collections.abc import Callable, Sequence
 from typing import TYPE_CHECKING, Any, cast
 
+from dodal.devices.zocalo import ZocaloStartInfo
+
 from mx_bluesky.common.external_interaction.callbacks.common.ispyb_callback_base import (
     BaseISPyBCallback,
 )
@@ -10,6 +12,9 @@ from mx_bluesky.common.external_interaction.callbacks.common.ispyb_mapping impor
     populate_data_collection_group,
     populate_remaining_data_collection_info,
 )
+from mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback import (
+    ZocaloInfoGenerator,
+)
 from mx_bluesky.common.external_interaction.ispyb.data_model import (
     DataCollectionInfo,
     DataCollectionPositionInfo,
@@ -21,6 +26,7 @@ from mx_bluesky.common.external_interaction.ispyb.ispyb_store import (
 )
 from mx_bluesky.common.parameters.components import IspybExperimentType
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER, set_dcgid_tag
+from mx_bluesky.common.utils.utils import number_of_frames_from_scan_spec
 from mx_bluesky.hyperion.external_interaction.callbacks.rotation.ispyb_mapping import (
     populate_data_collection_info_for_rotation,
 )
@@ -175,4 +181,34 @@ class RotationISPyBCallback(BaseISPyBCallback):
         if doc.get("run_start") == self.uid_to_finalize_on:
             self.uid_to_finalize_on = None
             return super().activity_gated_stop(doc)
-        return self._tag_doc(doc)
+        return self.tag_doc(doc)
+
+
+def generate_start_info_from_ordered_runs() -> ZocaloInfoGenerator:
+    """
+    Generate the zocalo trigger info from bluesky runs where the frame number is
+    computed using the order in which the run start docs are received.
+    Yields:
+        A list of the ZocaloStartInfo objects extracted from the event
+    Send:
+        A dict containing the run start document
+    """
+    start_frame = 0
+    doc = yield []
+    while doc:
+        zocalo_info = []
+        if (
+            isinstance(scan_points := doc.get("scan_points"), list)
+            and isinstance(ispyb_ids := doc.get("ispyb_dcids"), tuple)
+            and len(ispyb_ids) > 0
+        ):
+            ISPYB_ZOCALO_CALLBACK_LOGGER.info(f"Zocalo triggering for {ispyb_ids}")
+            ids_and_shape = list(zip(ispyb_ids, scan_points, strict=False))
+            for idx, id_and_shape in enumerate(ids_and_shape):
+                id, shape = id_and_shape
+                num_frames = number_of_frames_from_scan_spec(shape)
+                zocalo_info.append(
+                    ZocaloStartInfo(id, None, start_frame, num_frames, idx)
+                )
+                start_frame += num_frames
+        doc = yield zocalo_info

mx_bluesky/hyperion/parameters/device_composites.py

@@ -10,7 +10,7 @@ from dodal.devices.common_dcm import BaseDCM
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import (
     PandAFastGridScan,
-    ZebraFastGridScan,
+    ZebraFastGridScanThreeD,
 )
 from dodal.devices.flux import Flux
 from dodal.devices.robot import BartRobot
@@ -51,7 +51,7 @@ class HyperionFlyScanXRayCentreComposite(FlyScanEssentialDevices):
     sample_shutter: ZebraShutter
     backlight: Backlight
     xbpm_feedback: XBPMFeedback
-    zebra_fast_grid_scan: ZebraFastGridScan
+    zebra_fast_grid_scan: ZebraFastGridScanThreeD
 
 
 @pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})

mx_bluesky/hyperion/parameters/gridscan.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from dodal.devices.fast_grid_scan import (
     PandAGridScanParams,
-    ZebraGridScanParams,
+    ZebraGridScanParamsThreeD,
 )
 
 from mx_bluesky.common.parameters.gridscan import (
@@ -44,8 +44,8 @@ class HyperionSpecifiedThreeDGridScan(SpecifiedThreeDGridScan):
 
     # Relative to common grid scan, stub offsets are defined by config server
     @property
-    def FGS_params(self) -> ZebraGridScanParams:
-        return ZebraGridScanParams(
+    def FGS_params(self) -> ZebraGridScanParamsThreeD:
+        return ZebraGridScanParamsThreeD(
             x_steps=self.x_steps,
             y_steps=self.y_steps,
             z_steps=self.z_steps,

{mx_bluesky-1.5.6.dist-info → mx_bluesky-1.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.6
+Version: 1.5.8
 Summary: Bluesky tools for MX Beamlines at DLS
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -241,7 +241,7 @@ Requires-Dist: blueapi>=0.15.0
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.10.0a2
 Requires-Dist: bluesky>=1.13.1
-Requires-Dist: dls-dodal==1.58.0
+Requires-Dist: dls-dodal==1.61.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"