mx-bluesky 1.5.14__tar.gz → 1.5.15__tar.gz

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/Dockerfile.blueapi

@@ -1,7 +1,7 @@
 # Before changing this BlueAPI version number, you should check that 
 # the BlueAPI pin in pyproject.toml is compatible, else the version will
 # be overridden
-FROM ghcr.io/diamondlightsource/blueapi:1.11.0
+FROM ghcr.io/diamondlightsource/blueapi:1.0.0-rc.2
 
 ARG DEBIAN_FRONTEND=noninteractive
 

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.14
+Version: 1.5.15
 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>=1.8.0
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.14.0
 Requires-Dist: bluesky>=1.14.6
-Requires-Dist: dls-dodal==1.67.0
+Requires-Dist: dls-dodal==1.68.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
     "ophyd >= 1.10.5",
     "ophyd-async >= 0.14.0",
     "bluesky >= 1.14.6",
-    "dls-dodal == 1.67.0",
+    "dls-dodal == 1.68.0",
 ]
 
 

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.5.14'
-__version_tuple__ = version_tuple = (1, 5, 14)
+__version__ = version = '1.5.15'
+__version_tuple__ = version_tuple = (1, 5, 15)
 
-__commit_id__ = commit_id = 'g127494239'
+__commit_id__ = commit_id = 'gd40b2c5f8'

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -278,11 +278,8 @@ def construct_i04_specific_features(
     signals_to_read_pre_flyscan = [
         xrc_composite.undulator.current_gap,
         xrc_composite.synchrotron.synchrotron_mode,
-        xrc_composite.s4_slit_gaps.xgap,
-        xrc_composite.s4_slit_gaps.ygap,
-        xrc_composite.smargon.x,
-        xrc_composite.smargon.y,
-        xrc_composite.smargon.z,
+        xrc_composite.s4_slit_gaps,
+        xrc_composite.smargon,
         xrc_composite.dcm.energy_in_keV,
     ]
 
@@ -293,6 +290,7 @@ def construct_i04_specific_features(
         xrc_composite.dcm.energy_in_keV,
         xrc_composite.eiger.bit_depth,
         xrc_composite.beamsize,
+        xrc_composite.eiger.cam.roi_mode,
     ]
 
     tidy_plan = partial(

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/beamlines/i24/serial/web_gui_plans/oav_plans.py

@@ -1,6 +1,7 @@
 from enum import Enum
 
 import bluesky.plan_stubs as bps
+from bluesky.utils import MsgGenerator
 from dodal.common import inject
 from dodal.devices.i24.pmac import PMAC
 
@@ -17,6 +18,11 @@ class Direction(Enum):
     RIGHT = "right"
 
 
+class FocusDirection(Enum):
+    IN = "in"
+    OUT = "out"
+
+
 def _move_direction(magnitude: float, direction: Direction, pmac):
     y_move = 0.0
     x_move = 0.0
@@ -62,3 +68,18 @@ def move_nudge_on_arrow_click(
             magnitude = 0.0060
 
     yield from _move_direction(magnitude, direction, pmac)
+
+
+def focus_on_oav_view(
+    direction: FocusDirection, size_of_move: MoveSize, pmac: PMAC = inject("pmac")
+) -> MsgGenerator:
+    match size_of_move:
+        case MoveSize.SMALL:
+            magnitude = 0.0200
+        case MoveSize.BIG:
+            magnitude = 0.1200
+
+    if direction == FocusDirection.IN:
+        magnitude = -magnitude
+
+    yield from bps.abs_set(pmac.z, magnitude, wait=True)

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py

@@ -75,6 +75,7 @@ def standard_read_hardware_during_collection(
         dcm.energy_in_keV,
         detector.bit_depth,
         beamsize,
+        detector.cam.roi_mode,
     ]
     yield from read_hardware_plan(
         signals_to_read_during_collection, DocDescriptorNames.HARDWARE_READ_DURING

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py

@@ -158,6 +158,7 @@ class BaseISPyBCallback(PlanReactiveCallback):
             beamsize_at_samplex=beamsize_x_mm,
             beamsize_at_sampley=beamsize_y_mm,
             flux=doc["data"]["flux-flux_reading"],
+            detector_mode="ROI" if doc["data"]["eiger_cam_roi_mode"] else "FULL",
         )
         if transmission := doc["data"]["attenuator-actual_transmission"]:
             # Ispyb wants the transmission in a percentage, we use fractions

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/common/external_interaction/callbacks/common/ispyb_mapping.py

@@ -28,6 +28,7 @@ def populate_remaining_data_collection_info(
     data_collection_info: DataCollectionInfo,
     params: DiffractionExperimentWithSample,
 ):
+    data_collection_info.sample_id = params.sample_id
     data_collection_info.visit_string = params.visit
     data_collection_info.parent_id = data_collection_group_id
     data_collection_info.detector_id = I03_EIGER_DETECTOR

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/common/external_interaction/ispyb/data_model.py

@@ -67,6 +67,9 @@ class DataCollectionInfo:
     start_time: str | None = None
     end_time: str | None = None
     run_status: str | None = None
+    detector_mode: str | None = None
+
+    sample_id: int | None = None
 
 
 @dataclass

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py

@@ -309,6 +309,8 @@ def _data_collection_info_to_json(data: DataCollectionInfo) -> dict:
             "startTime": data.start_time,
             "endTime": data.end_time,
             "runStatus": data.run_status,
+            "sampleId": data.sample_id,
+            "detectorMode": data.detector_mode,
         }
     )
 

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/hyperion/experiment_plans/hyperion_flyscan_xray_centre_plan.py

@@ -49,11 +49,8 @@ def construct_hyperion_specific_features(
     signals_to_read_pre_flyscan = [
         xrc_composite.undulator.current_gap,
         xrc_composite.synchrotron.synchrotron_mode,
-        xrc_composite.s4_slit_gaps.xgap,
-        xrc_composite.s4_slit_gaps.ygap,
-        xrc_composite.smargon.x,
-        xrc_composite.smargon.y,
-        xrc_composite.smargon.z,
+        xrc_composite.s4_slit_gaps,
+        xrc_composite.smargon,
         xrc_composite.dcm.energy_in_keV,
     ]
 
@@ -64,6 +61,7 @@ def construct_hyperion_specific_features(
         xrc_composite.dcm.energy_in_keV,
         xrc_composite.eiger.bit_depth,
         xrc_composite.beamsize,
+        xrc_composite.eiger.cam.roi_mode,
     ]
 
     setup_trigger_plan: Callable[..., MsgGenerator]

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky/hyperion/experiment_plans/udc_default_state.py

@@ -17,6 +17,7 @@ from dodal.devices.fluorescence_detector_motion import FluorescenceDetector
 from dodal.devices.fluorescence_detector_motion import InOut as FlouInOut
 from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
 from dodal.devices.mx_phase1.beamstop import BeamstopPositions
+from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.robot import BartRobot, PinMounted
 from dodal.devices.scintillator import InOut as ScinInOut
 from dodal.devices.scintillator import Scintillator
@@ -49,6 +50,7 @@ class UDCDefaultDevices(BeamstopCheckDevices):
     robot: BartRobot
     scintillator: Scintillator
     smargon: Smargon
+    oav: OAV
 
 
 class UnexpectedSampleError(BeamlineCheckFailureError): ...
@@ -109,7 +111,7 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
     )
 
     # Wait for all of the above to complete
-    yield from bps.wait(group=_GROUP_PRE_BEAMSTOP_CHECK, timeout=0.1)
+    yield from bps.wait(group=_GROUP_PRE_BEAMSTOP_CHECK, timeout=10)
 
     feature_flags: HyperionFeatureSettings = (
         get_hyperion_config_client().get_feature_flags()
@@ -141,7 +143,11 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
         devices.cryojet.fine, CryoInOut.IN, group=_GROUP_POST_BEAMSTOP_CHECK
     )
 
-    yield from bps.wait(_GROUP_POST_BEAMSTOP_CHECK)
+    yield from bps.abs_set(
+        devices.oav.zoom_controller, "1.0x", group=_GROUP_POST_BEAMSTOP_CHECK
+    )
+
+    yield from bps.wait(_GROUP_POST_BEAMSTOP_CHECK, timeout=10)
 
 
 def _verify_correct_cryostream_selected(

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mx-bluesky
-Version: 1.5.14
+Version: 1.5.15
 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>=1.8.0
 Requires-Dist: ophyd>=1.10.5
 Requires-Dist: ophyd-async>=0.14.0
 Requires-Dist: bluesky>=1.14.6
-Requires-Dist: dls-dodal==1.67.0
+Requires-Dist: dls-dodal==1.68.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/src/mx_bluesky.egg-info/requires.txt

@@ -25,7 +25,7 @@ blueapi>=1.8.0
 ophyd>=1.10.5
 ophyd-async>=0.14.0
 bluesky>=1.14.6
-dls-dodal==1.67.0
+dls-dodal==1.68.0
 
 [dev]
 black

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/tests/conftest.py

@@ -1420,6 +1420,7 @@ class _TestEventData(OavGridSnapshotTestEvents):
                 "dcm-energy_in_keV": 11.105,
                 "beamsize-x_um": 50.0,
                 "beamsize-y_um": 20.0,
+                "eiger_cam_roi_mode": False,
             },
             "timestamps": {"det1": 1666604299.8220396, "det2": 1666604299.8235943},
             "seq_num": 1,
@@ -1534,6 +1535,7 @@ class _TestEventData(OavGridSnapshotTestEvents):
                 "eiger_bit_depth": "16",
                 "beamsize-x_um": 50.0,
                 "beamsize-y_um": 20.0,
+                "eiger_cam_roi_mode": True,
             },
             "timestamps": {
                 "det1": 1666604299.8220396,

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/tests/unit_tests/beamlines/i24/serial/web_gui/test_oav_plans.py

@@ -4,7 +4,9 @@ import pytest
 
 from mx_bluesky.beamlines.i24.serial.web_gui_plans.oav_plans import (
     Direction,
+    FocusDirection,
     MoveSize,
+    focus_on_oav_view,
     move_block_on_arrow_click,
     move_nudge_on_arrow_click,
     move_window_on_arrow_click,
@@ -85,3 +87,19 @@ def test_move_nudge_on_arrow_click(
             mock_abs_set.assert_any_call(pmac.x, expected_value, wait=True)
         else:
             mock_abs_set.assert_any_call(pmac.y, expected_value, wait=True)
+
+
+@pytest.mark.parametrize(
+    "direction, move_size, expected_value",
+    [
+        ("in", "small", -0.0200),
+        ("in", "big", -0.1200),
+        ("out", "small", 0.0200),
+        ("out", "big", 0.1200),
+    ],
+)
+async def test_focus_on_oav_view(
+    direction, move_size, expected_value, pmac, run_engine
+):
+    run_engine(focus_on_oav_view(FocusDirection(direction), MoveSize(move_size), pmac))
+    assert await pmac.z.user_readback.get_value() == expected_value

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/tests/unit_tests/common/external_interaction/xray_centre/test_ispyb_callback.py

@@ -53,6 +53,7 @@ EXPECTED_DATA_COLLECTION_3D_XY = {
     "xBeam": 150.0,
     "yBeam": 160.0,
     "startTime": EXPECTED_START_TIME,
+    "sampleId": 364758,
 }
 
 EXPECTED_DATA_COLLECTION_3D_XZ = EXPECTED_DATA_COLLECTION_3D_XY | {
@@ -192,6 +193,7 @@ class TestXrayCentreISPyBCallback:
             "resolution": 1.1830593331191241,
             "beamSizeAtSampleX": 0.05,
             "beamSizeAtSampleY": 0.02,
+            "detectorMode": "ROI",
         }
         assert update_dc_requests[0].dcid == TEST_DATA_COLLECTION_IDS[0]
         assert update_dc_requests[1].dcid == TEST_DATA_COLLECTION_IDS[1]

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/tests/unit_tests/conftest.py

@@ -158,6 +158,7 @@ BASIC_POST_SETUP_DOC = {
     "dcm-energy_in_keV": 11.105,
     "beamsize-x_um": 50.0,
     "beamsize-y_um": 20.0,
+    "eiger_cam_roi_mode": True,
 }
 
 

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/tests/unit_tests/hyperion/experiment_plans/test_udc_default_state.py

@@ -53,6 +53,7 @@ async def default_devices(
     cryostream_gantry,
     robot,
     smargon,
+    oav,
     sim_run_engine,
     run_engine,
 ):
@@ -75,6 +76,7 @@ async def default_devices(
             robot=robot,
             scintillator=scintillator,
             smargon=smargon,
+            oav=oav,
             **beamstop_check_devices.__dict__,
         )
         sim_run_engine.add_read_handler_for(
@@ -264,6 +266,10 @@ def test_udc_pre_and_post_groups_contains_expected_items_and_are_waited_on_befor
         default_devices.cryojet.fine, CryoInOut.IN, post_beamstop_group
     )
 
+    msgs = assert_expected_set(
+        default_devices.oav.zoom_controller, "1.0x", post_beamstop_group
+    )
+
     msgs = assert_message_and_return_remaining(
         msgs,
         lambda msg: msg.command == "wait"

{mx_bluesky-1.5.14 → mx_bluesky-1.5.15}/tests/unit_tests/hyperion/external_interaction/callbacks/rotation/test_ispyb_callback.py

@@ -49,6 +49,7 @@ EXPECTED_DATA_COLLECTION = {
     "startTime": EXPECTED_START_TIME,
     "fileTemplate": "file_name_1_master.h5",
     "numberOfImages": 1800,
+    "sampleId": 123456,
 }
 
 
@@ -163,6 +164,7 @@ def test_flux_read_events(
         "transmission": 98,
         "flux": 9.81,
         "resolution": 1.1830593331191241,
+        "detectorMode": "FULL",
     }