mx-bluesky 1.4.3__tar.gz → 1.4.4__tar.gz

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mx-bluesky
-Version: 1.4.3
+Version: 1.4.4
 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
-Requires-Dist: dls-dodal==1.38.0
+Requires-Dist: dls-dodal==1.39.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
     "ophyd == 1.9.0",
     "ophyd-async >= 0.8a5",
     "bluesky >= 1.13",
-    "dls-dodal == 1.38.0",
+    "dls-dodal == 1.39.0",
 ]
 
 

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.3'
-__version_tuple__ = version_tuple = (1, 4, 3)
+__version__ = version = '1.4.4'
+__version_tuple__ = version_tuple = (1, 4, 4)

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py

@@ -7,7 +7,6 @@ from dodal.devices.zocalo import ZocaloStartInfo, ZocaloTrigger
 
 from mx_bluesky.common.parameters.constants import (
     DocDescriptorNames,
-    TriggerConstants,
 )
 from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMade
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER
@@ -30,27 +29,17 @@ class ZocaloCallback(CallbackBase):
 
     def _reset_state(self):
         self.run_uid: str | None = None
-        self.triggering_plan: str | None = None
-        self.zocalo_interactor: ZocaloTrigger | None = None
         self.zocalo_info: list[ZocaloStartInfo] = []
         self.descriptors: dict[str, EventDescriptor] = {}
 
-    def __init__(
-        self,
-    ):
+    def __init__(self, triggering_plan: str, zocalo_environment: str):
         super().__init__()
+        self.triggering_plan = triggering_plan
+        self.zocalo_interactor = ZocaloTrigger(zocalo_environment)
         self._reset_state()
 
     def start(self, doc: RunStart):
         ISPYB_ZOCALO_CALLBACK_LOGGER.info("Zocalo handler received start document.")
-        if triggering_plan := doc.get(TriggerConstants.ZOCALO):
-            self.triggering_plan = triggering_plan
-            assert isinstance(zocalo_environment := doc.get("zocalo_environment"), str)
-            ISPYB_ZOCALO_CALLBACK_LOGGER.info(
-                f"Zocalo environment set to {zocalo_environment}."
-            )
-            self.zocalo_interactor = ZocaloTrigger(zocalo_environment)
-
         if self.triggering_plan and doc.get("subplan_name") == self.triggering_plan:
             self.run_uid = doc.get("uid")
             assert isinstance(scan_points := doc.get("scan_points"), list)
@@ -58,6 +47,7 @@ class ZocaloCallback(CallbackBase):
                 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))
                 start_frame = 0
                 self.zocalo_info = []
@@ -82,7 +72,6 @@ class ZocaloCallback(CallbackBase):
             filename = doc["data"]["eiger_odin_file_writer_id"]
             for start_info in self.zocalo_info:
                 start_info.filename = filename
-                assert self.zocalo_interactor is not None
                 self.zocalo_interactor.run_start(start_info)
         return doc
 

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/common/parameters/components.py

@@ -93,7 +93,6 @@ class IspybExperimentType(StrEnum):
 
 class MxBlueskyParameters(BaseModel):
     model_config = ConfigDict(
-        arbitrary_types_allowed=True,
         extra="allow",
     )
 

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/common/parameters/gridscan.py

@@ -29,8 +29,13 @@ class GridCommon(
     DiffractionExperimentWithSample,
     OptionalGonioAngleStarts,
 ):
-    """Parameters used in every MX diffraction experiment using grids. This model should be used by plans which have no knowledge of the grid specifications - i.e before automatic grid detection has completed"""
+    """
+    Parameters used in every MX diffraction experiment using grids. This model should
+    be used by plans which have no knowledge of the grid specifications - i.e before
+    automatic grid detection has completed
+    """
 
+    box_size_um: float = Field(default=GridscanParamConstants.BOX_WIDTH_UM)
     grid_width_um: float = Field(default=GridscanParamConstants.WIDTH_UM)
     exposure_time_s: float = Field(default=GridscanParamConstants.EXPOSURE_TIME_S)
 

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/common/plans/do_fgs.py

@@ -18,9 +18,7 @@ from mx_bluesky.common.device_setup_plans.read_hardware_for_setup import (
     read_hardware_for_zocalo,
 )
 from mx_bluesky.common.parameters.constants import (
-    EnvironmentConstants,
     PlanNameConstants,
-    TriggerConstants,
 )
 from mx_bluesky.common.utils.tracing import TRACER
 
@@ -70,7 +68,6 @@ def kickoff_and_complete_gridscan(
     scan_points: list[AxesPoints[Axis]],
     scan_start_indices: list[int],
     plan_during_collection: Callable[[], MsgGenerator] | None = None,
-    zocalo_environment: str = EnvironmentConstants.ZOCALO_ENV,
 ):
     """Triggers a grid scan motion program and waits for completion, accounting for synchrotron topup.
     If the RunEngine is subscribed to ZocaloCallback, this plan will also trigger Zocalo.
@@ -86,7 +83,6 @@ def kickoff_and_complete_gridscan(
         scan_start_indices (list[int]):         Contains the first index of each grid scan
         plan_during_collection (Optional, MsgGenerator): Generic plan called in between kickoff and completion,
                                                 eg waiting on zocalo.
-        zocalo_environment (Optional, str)      Used for zocalo connection
     """
 
     assert len(scan_points) == len(scan_start_indices), (
@@ -100,10 +96,8 @@ def kickoff_and_complete_gridscan(
     @bpp.run_decorator(
         md={
             "subplan_name": plan_name,
-            TriggerConstants.ZOCALO: plan_name,
             "scan_points": scan_points,
             "scan_start_indices": scan_start_indices,
-            "zocalo_environment": zocalo_environment,
         }
     )
     @bpp.contingency_decorator(

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -368,8 +368,6 @@ def rotation_scan(
     @bpp.run_decorator(  # attach experiment metadata to the start document
         md={
             "subplan_name": CONST.PLAN.ROTATION_OUTER,
-            CONST.TRIGGER.ZOCALO: CONST.PLAN.ROTATION_MAIN,
-            "zocalo_environment": CONST.ZOCALO_ENV,
             "mx_bluesky_parameters": parameters.model_dump_json(),
             "activate_callbacks": [
                 "RotationISPyBCallback",
@@ -443,7 +441,6 @@ def multi_rotation_scan(
             @bpp.run_decorator(  # attach experiment metadata to the start document
                 md={
                     "subplan_name": CONST.PLAN.ROTATION_OUTER,
-                    CONST.TRIGGER.ZOCALO: CONST.PLAN.ROTATION_MAIN,
                     "mx_bluesky_parameters": single_scan.model_dump_json(),
                 }
             )

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/hyperion/external_interaction/callbacks/__main__.py

@@ -49,14 +49,16 @@ ERROR_LOG_BUFFER_LINES = 5000
 
 
 def setup_callbacks():
-    zocalo = ZocaloCallback()
     return [
         GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
         GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams, emit=zocalo
+            param_type=GridCommonWithHyperionDetectorParams,
+            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
         ),
         RotationNexusFileCallback(),
-        RotationISPyBCallback(emit=zocalo),
+        RotationISPyBCallback(
+            emit=ZocaloCallback(CONST.PLAN.ROTATION_MAIN, CONST.ZOCALO_ENV)
+        ),
         LogUidTaggingCallback(),
         RobotLoadISPyBCallback(),
         SampleHandlingCallback(),

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/hyperion/external_interaction/callbacks/common/callback_util.py

@@ -23,6 +23,7 @@ from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback
 from mx_bluesky.hyperion.external_interaction.callbacks.sample_handling.sample_handling_callback import (
     SampleHandlingCallback,
 )
+from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.gridscan import (
     GridCommonWithHyperionDetectorParams,
     HyperionSpecifiedThreeDGridScan,
@@ -34,10 +35,12 @@ CallbacksFactory = Callable[[], tuple[CallbackBase, ...]]
 def create_robot_load_and_centre_callbacks() -> tuple[
     GridscanNexusFileCallback, GridscanISPyBCallback, RobotLoadISPyBCallback
 ]:
+    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
     return (
         GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
         GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams, emit=ZocaloCallback()
+            param_type=GridCommonWithHyperionDetectorParams,
+            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
         ),
         RobotLoadISPyBCallback(),
     )
@@ -46,10 +49,12 @@ def create_robot_load_and_centre_callbacks() -> tuple[
 def create_gridscan_callbacks() -> tuple[
     GridscanNexusFileCallback, GridscanISPyBCallback
 ]:
+    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
     return (
         GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
         GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams, emit=ZocaloCallback()
+            param_type=GridCommonWithHyperionDetectorParams,
+            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
         ),
     )
 
@@ -57,7 +62,13 @@ def create_gridscan_callbacks() -> tuple[
 def create_rotation_callbacks() -> tuple[
     RotationNexusFileCallback, RotationISPyBCallback
 ]:
-    return (RotationNexusFileCallback(), RotationISPyBCallback(emit=ZocaloCallback()))
+    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
+    return (
+        RotationNexusFileCallback(),
+        RotationISPyBCallback(
+            emit=ZocaloCallback(CONST.PLAN.ROTATION_MAIN, CONST.ZOCALO_ENV)
+        ),
+    )
 
 
 def create_load_centre_collect_callbacks() -> tuple[
@@ -68,13 +79,17 @@ def create_load_centre_collect_callbacks() -> tuple[
     RotationISPyBCallback,
     SampleHandlingCallback,
 ]:
+    """Note: This is not actually used in production, see https://github.com/DiamondLightSource/mx-bluesky/issues/516"""
     return (
         GridscanNexusFileCallback(param_type=HyperionSpecifiedThreeDGridScan),
         GridscanISPyBCallback(
-            param_type=GridCommonWithHyperionDetectorParams, emit=ZocaloCallback()
+            param_type=GridCommonWithHyperionDetectorParams,
+            emit=ZocaloCallback(CONST.PLAN.DO_FGS, CONST.ZOCALO_ENV),
         ),
         RobotLoadISPyBCallback(),
         RotationNexusFileCallback(),
-        RotationISPyBCallback(emit=ZocaloCallback()),
+        RotationISPyBCallback(
+            emit=ZocaloCallback(CONST.PLAN.ROTATION_MAIN, CONST.ZOCALO_ENV)
+        ),
         SampleHandlingCallback(),
     )

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky/hyperion/parameters/gridscan.py

@@ -7,9 +7,7 @@ from dodal.devices.fast_grid_scan import (
     PandAGridScanParams,
     ZebraGridScanParams,
 )
-from pydantic import Field
 
-from mx_bluesky.common.parameters.constants import GridscanParamConstants
 from mx_bluesky.common.parameters.gridscan import (
     GridCommon,
     SpecifiedThreeDGridScan,
@@ -146,4 +144,4 @@ class PinTipCentreThenXrayCentre(
 class GridScanWithEdgeDetect(
     GridCommonWithHyperionDetectorParams, WithHyperionUDCFeatures
 ):
-    box_size_um: float = Field(default=GridscanParamConstants.BOX_WIDTH_UM)
+    pass

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mx-bluesky
-Version: 1.4.3
+Version: 1.4.4
 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
-Requires-Dist: dls-dodal==1.38.0
+Requires-Dist: dls-dodal==1.39.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: build; extra == "dev"

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky.egg-info/SOURCES.txt

@@ -316,6 +316,7 @@ tests/test_data/scratch/README
 tests/test_data/test_daq_configuration/domain/beamlineParameters
 tests/test_data/test_daq_configuration/lookup/BeamLineEnergy_DCM_Pitch_converter.txt
 tests/test_data/test_daq_configuration/lookup/BeamLineEnergy_DCM_Roll_converter.txt
+tests/test_data/test_daq_configuration/lookup/BeamLine_Undulator_toGap.txt
 tests/test_data/test_daq_configuration/lookup/test_det_dist_converter.txt
 tests/unit_tests/__init__.py
 tests/unit_tests/conftest.py

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/src/mx_bluesky.egg-info/requires.txt

@@ -24,7 +24,7 @@ daq-config-server>=0.1.1
 ophyd==1.9.0
 ophyd-async>=0.8a5
 bluesky>=1.13
-dls-dodal==1.38.0
+dls-dodal==1.39.0
 
 [dev]
 black

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/conftest.py

@@ -527,10 +527,11 @@ def mirror_voltages():
 
 @pytest.fixture
 def undulator_dcm(RE, sim_run_engine, dcm):
-    undulator_dcm = i03.undulator_dcm(fake_with_ophyd_sim=True)
+    undulator_dcm = i03.undulator_dcm(
+        fake_with_ophyd_sim=True,
+        daq_configuration_path="tests/test_data/test_daq_configuration",
+    )
     set_up_dcm(undulator_dcm.dcm_ref(), sim_run_engine)
-    undulator_dcm.roll_energy_table_path = "tests/test_data/test_daq_configuration/lookup/BeamLineEnergy_DCM_Roll_converter.txt"
-    undulator_dcm.pitch_energy_table_path = "tests/test_data/test_daq_configuration/lookup/BeamLineEnergy_DCM_Pitch_converter.txt"
     yield undulator_dcm
     beamline_utils.clear_devices()
 

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/test_data/parameter_json_files/good_test_grid_with_edge_detect_parameters.json

@@ -13,5 +13,6 @@
     "omega_start_deg": 0.0,
     "grid_width_um": 290.6,
     "transmission_frac": 1.0,
-    "visit": "cm31105-4"
+    "visit": "cm31105-4",
+    "box_size_um": 20
 }

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/test_data/parameter_json_files/good_test_load_centre_collect_params.json

@@ -17,7 +17,8 @@
         "demand_energy_ev": 11100,
         "run_number": 0,
         "features": {"use_panda_for_gridscan": false, "compare_cpu_and_gpu_zocalo": true},
-        "panda_runup_distance_mm": 0.17
+        "panda_runup_distance_mm": 0.17,
+        "box_size_um": 20
     },
     "multi_rotation_scan": {
         "comment": "Rotation",

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/test_data/parameter_json_files/good_test_pin_centre_then_xray_centre_parameters.json

@@ -14,5 +14,6 @@
     "tip_offset_um": 108.9,
     "grid_width_um": 290.6,
     "transmission_frac": 1.0,
-    "visit": "cm31105-4"
+    "visit": "cm31105-4",
+    "box_size_um": 20
 }

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/test_data/parameter_json_files/good_test_robot_load_and_centre_params.json

@@ -16,5 +16,6 @@
     "sample_id": 12345,
     "sample_puck": 40,
     "sample_pin": 3,
-    "comment": "Descriptive comment."
+    "comment": "Descriptive comment.",
+    "box_size_um": 20
 }

mx_bluesky-1.4.4/tests/test_data/test_daq_configuration/lookup/BeamLine_Undulator_toGap.txt

@@ -0,0 +1,60 @@
+#######################
+#                     #
+# 5.5mm CPMU 20/11/22 #
+#                     #
+#######################
+# Used to convert from energy to gap. Constructed from tables for 3rd, 5th and 7th harmonic.
+# It is important that at the point of change from one harmonic to another that there is
+# point for the same energy from both harmomics to prevent invalid interpolation.
+# run reloadLookupTables() when done
+Units eV mm
+5700    5.4606
+5760	5.5		
+6000	5.681
+6500	6.045
+7000	6.404
+7500	6.765
+8000	7.124
+8500	7.491
+9000	7.872
+9500	8.258
+9700	8.424
+9700	5.542	
+10000	5.675
+10500	5.895
+11000	6.113
+11500	6.328
+12000	6.545
+12500	6.758
+12700	6.83
+13000	6.98
+13443	7.168
+13443	5.5
+13500	5.517
+14000	5.674
+14500	5.831
+15000	5.987
+15500	6.139
+16000	6.294
+16500	6.447
+17000	6.603
+17320	6.697
+17320	5.5
+17500	5.552
+18000	5.674
+18500	5.794
+19000	5.912
+19500	6.037
+20000	6.157
+20500	6.277
+20939	6.378
+20939	5.5
+21000	5.517
+21500	5.577
+22000	5.674
+22500	5.773
+23000	5.871
+23500	5.97
+24000	6.072
+24500	6.167
+25000	6.264

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/unit_tests/common/external_interaction/callbacks/test_zocalo_handler.py

@@ -35,16 +35,9 @@ def start_dict(plan_name: str = "test_plan_name", env: str = "test_env"):
 
 class TestZocaloHandler:
     def _setup_handler(self):
-        zocalo_handler = ZocaloCallback()
-        assert zocalo_handler.triggering_plan is None
-        zocalo_handler.start(start_dict())  # type: ignore
-        assert zocalo_handler.triggering_plan == "test_plan_name"
-        assert zocalo_handler.zocalo_interactor is not None
+        zocalo_handler = ZocaloCallback("test_plan_name", "test_env")
         return zocalo_handler
 
-    def test_handler_gets_plan_name_from_start_doc(self):
-        self._setup_handler()
-
     def test_handler_doesnt_trigger_on_wrong_plan(self):
         zocalo_handler = self._setup_handler()
         zocalo_handler.start(start_dict("_not_test_plan_name"))  # type: ignore

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/unit_tests/common/plan_stubs/test_do_fgs.py

@@ -17,9 +17,7 @@ from ophyd_async.core import DeviceCollector
 from ophyd_async.testing import set_mock_value
 
 from mx_bluesky.common.parameters.constants import (
-    EnvironmentConstants,
     PlanNameConstants,
-    TriggerConstants,
 )
 from mx_bluesky.common.plans.do_fgs import kickoff_and_complete_gridscan
 
@@ -109,11 +107,9 @@ def test_kickoff_and_complete_gridscan_with_run_engine_correct_documents(
 ):
     class TestCallback(CallbackBase):
         def start(self, doc: RunStart):
-            self.trigger_plan = doc.get(TriggerConstants.ZOCALO)
             self.subplan_name = doc.get("subplan_name")
             self.scan_points = doc.get("scan_points")
             self.scan_start_indices = doc.get("scan_start_indices")
-            self.zocalo_environment = doc.get("zocalo_environment")
 
         def event(self, doc: Event):
             self.event_data = list(doc.get("data").keys())
@@ -142,11 +138,9 @@ def test_kickoff_and_complete_gridscan_with_run_engine_correct_documents(
             )
         )
 
-    assert test_callback.trigger_plan == PlanNameConstants.DO_FGS
     assert test_callback.subplan_name == PlanNameConstants.DO_FGS
     assert test_callback.scan_points == []
     assert test_callback.scan_start_indices == []
-    assert test_callback.zocalo_environment == EnvironmentConstants.ZOCALO_ENV
     assert len(test_callback.event_data) == 1
     assert test_callback.event_data[0] == "eiger_odin_file_writer_id"
 

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/unit_tests/hyperion/experiment_plans/conftest.py

@@ -1,4 +1,3 @@
-from collections.abc import Callable
 from functools import partial
 from unittest.mock import MagicMock, patch
 
@@ -19,7 +18,7 @@ from dodal.devices.robot import BartRobot
 from dodal.devices.s4_slit_gaps import S4SlitGaps
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron, SynchrotronMode
-from dodal.devices.zocalo import ZocaloResults, ZocaloTrigger
+from dodal.devices.zocalo import ZocaloResults
 from event_model import Event
 from ophyd.sim import NullStatus
 from ophyd_async.core import AsyncStatus
@@ -213,13 +212,6 @@ def run_generic_ispyb_handler_setup(
     )
 
 
-def modified_interactor_mock(assign_run_end: Callable | None = None):
-    mock = MagicMock(spec=ZocaloTrigger)
-    if assign_run_end:
-        mock.run_end = assign_run_end
-    return mock
-
-
 def modified_store_grid_scan_mock(*args, dcids=(0, 0), dcgid=0, **kwargs):
     mock = MagicMock(spec=StoreInIspyb)
     mock.begin_deposition.return_value = IspybIds(
@@ -236,7 +228,7 @@ def mock_subscriptions(test_fgs_params):
     with (
         patch(
             "mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback.ZocaloTrigger",
-            modified_interactor_mock,
+            autospec=True,
         ),
         patch(
             "mx_bluesky.common.external_interaction.callbacks.xray_centre.ispyb_callback.StoreInIspyb.append_to_comment"
@@ -294,7 +286,7 @@ def robot_load_composite(
     backlight,
     detector_motion,
     flux,
-    ophyd_pin_tip_detection,
+    pin_tip_detection_with_found_pin,
     zocalo,
     synchrotron,
     sample_shutter,
@@ -305,6 +297,7 @@ def robot_load_composite(
     set_mock_value(dcm.energy_in_kev.user_readback, 11.105)
     smargon.stub_offsets.set = MagicMock(return_value=NullStatus())
     aperture_scatterguard.set = MagicMock(return_value=NullStatus())
+    set_mock_value(smargon.omega.max_velocity, 131)
     return RobotLoadThenCentreComposite(
         xbpm_feedback=xbpm_feedback,
         attenuator=attenuator,
@@ -316,7 +309,7 @@ def robot_load_composite(
         zebra_fast_grid_scan=fast_grid_scan,
         flux=flux,
         oav=oav,
-        pin_tip_detection=ophyd_pin_tip_detection,
+        pin_tip_detection=pin_tip_detection_with_found_pin,
         smargon=smargon,
         synchrotron=synchrotron,
         s4_slit_gaps=s4_slit_gaps,
@@ -376,3 +369,27 @@ def sim_fire_event_on_open_run(sim_run_engine: RunEngineSimulator, run_name: str
         return msg.run == run_name
 
     sim_run_engine.add_handler("open_run", fire_event, msg_maches_run)
+
+
+@pytest.fixture
+def grid_detection_callback_with_detected_grid():
+    with patch(
+        "mx_bluesky.hyperion.experiment_plans.grid_detect_then_xray_centre_plan.GridDetectionCallback",
+        autospec=True,
+    ) as callback:
+        callback.return_value.get_grid_parameters.return_value = {
+            "transmission_frac": 1.0,
+            "exposure_time_s": 0,
+            "x_start_um": 0,
+            "y_start_um": 0,
+            "y2_start_um": 0,
+            "z_start_um": 0,
+            "z2_start_um": 0,
+            "x_steps": 10,
+            "y_steps": 10,
+            "z_steps": 10,
+            "x_step_size_um": 0.1,
+            "y_step_size_um": 0.1,
+            "z_step_size_um": 0.1,
+        }
+        yield callback

{mx_bluesky-1.4.3 → mx_bluesky-1.4.4}/tests/unit_tests/hyperion/experiment_plans/test_flyscan_xray_centre_plan.py

@@ -88,7 +88,6 @@ from ....system_tests.hyperion.external_interaction.conftest import (
 from .conftest import (
     assert_event,
     mock_zocalo_trigger,
-    modified_interactor_mock,
     modified_store_grid_scan_mock,
     run_generic_ispyb_handler_setup,
 )
@@ -482,10 +481,11 @@ class TestFlyscanXrayCentrePlan:
     )
     @patch(
         "mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback.ZocaloTrigger",
-        modified_interactor_mock,
+        autospec=True,
     )
     def test_individual_plans_triggered_once_and_only_once_in_composite_run(
         self,
+        mock_zocalo_trigger: MagicMock,
         move_xyz: MagicMock,
         run_gridscan: MagicMock,
         move_aperture: MagicMock,
@@ -793,6 +793,8 @@ class TestFlyscanXrayCentrePlan:
         # Put both mocks in a parent to easily capture order
         mock_parent = MagicMock()
         fake_fgs_composite.eiger.disarm_detector = mock_parent.disarm
+        assert isinstance(ispyb_cb.emit_cb, ZocaloCallback)
+        ispyb_cb.emit_cb.zocalo_interactor.run_end = mock_parent.run_end
 
         fake_fgs_composite.eiger.filewriters_finished = NullStatus()  # type: ignore
         fake_fgs_composite.eiger.odin.check_and_wait_for_odin_state = MagicMock(
@@ -804,15 +806,9 @@ class TestFlyscanXrayCentrePlan:
         )
         set_mock_value(fake_fgs_composite.xbpm_feedback.pos_stable, True)
 
-        with (
-            patch(
-                "mx_bluesky.common.external_interaction.callbacks.xray_centre.nexus_callback.NexusWriter.create_nexus_file",
-                autospec=True,
-            ),
-            patch(
-                "mx_bluesky.common.external_interaction.callbacks.common.zocalo_callback.ZocaloTrigger",
-                lambda _: modified_interactor_mock(mock_parent.run_end),
-            ),
+        with patch(
+            "mx_bluesky.common.external_interaction.callbacks.xray_centre.nexus_callback.NexusWriter.create_nexus_file",
+            autospec=True,
         ):
             [RE.subscribe(cb) for cb in (nexus_cb, ispyb_cb)]
             RE(flyscan_xray_centre(fake_fgs_composite, test_fgs_params))
@@ -1003,9 +999,8 @@ class TestFlyscanXrayCentrePlan:
         ispyb_cb.params = MagicMock()
         ispyb_cb.ispyb_ids.data_collection_ids = (id_1, id_2)
         assert isinstance(ispyb_cb.emit_cb, ZocaloCallback)
-        zocalo_env = "dev_env"
 
-        mock_zocalo_trigger_class.return_value = (mock_zocalo_trigger := MagicMock())
+        mock_zocalo_trigger = ispyb_cb.emit_cb.zocalo_interactor
 
         fake_fgs_composite.eiger.unstage = MagicMock()
         fake_fgs_composite.eiger.odin.file_writer.id.sim_put("test/filename")  # type: ignore
@@ -1021,10 +1016,8 @@ class TestFlyscanXrayCentrePlan:
                 fake_fgs_composite.synchrotron,
                 scan_points=create_dummy_scan_spec(x_steps, y_steps, z_steps),
                 scan_start_indices=[0, x_steps * y_steps],
-                zocalo_environment=zocalo_env,
             )
         )
-        mock_zocalo_trigger_class.assert_called_once_with(zocalo_env)
 
         expected_start_infos = [
             ZocaloStartInfo(id_1, "test/filename", 0, x_steps * y_steps, 0),
@@ -1038,11 +1031,11 @@ class TestFlyscanXrayCentrePlan:
             call(expected_start_infos[1]),
         ]
 
-        assert mock_zocalo_trigger.run_start.call_count == 2
-        assert mock_zocalo_trigger.run_start.mock_calls == expected_start_calls
+        assert mock_zocalo_trigger.run_start.call_count == 2  # type: ignore
+        assert mock_zocalo_trigger.run_start.mock_calls == expected_start_calls  # type: ignore
 
-        assert mock_zocalo_trigger.run_end.call_count == 2
-        assert mock_zocalo_trigger.run_end.mock_calls == [call(id_1), call(id_2)]
+        assert mock_zocalo_trigger.run_end.call_count == 2  # type: ignore
+        assert mock_zocalo_trigger.run_end.mock_calls == [call(id_1), call(id_2)]  # type: ignore
 
     @patch(
         "mx_bluesky.common.plans.do_fgs.check_topup_and_wait_if_necessary",