Merge branch 'main' into 1119_apply_panda_hotfix

setup.cfg

@@ -35,7 +35,7 @@ install_requires =
     xarray
     doct
     databroker
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@0aabdb389f65a30e629cec60a36c3b5298b7647f
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@90d0e19427a6a22818deb3b2cff108ea6d1c1efa
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
     pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103

src/hyperion/experiment_plans/flyscan_xray_centre_plan.py

@@ -214,6 +214,8 @@ def do_fgs():
             total_exposure,
             30.0,
         )
+        LOGGER.info("Wait for all moves with no assigned group")
+        yield from bps.wait()
         LOGGER.info("kicking off FGS")
         yield from bps.kickoff(fgs_motors)
         LOGGER.info("Waiting for Zocalo device queue to have been cleared...")

src/hyperion/experiment_plans/panda_flyscan_xray_centre_plan.py

@@ -130,7 +130,6 @@ def run_gridscan(
         else_plan=lambda: (yield from bps.unstage(fgs_composite.eiger)),
     )
     def do_fgs():
-        yield from bps.wait()  # Wait for all moves to complete
         # Check topup gate
         total_exposure = (
             parameters.experiment_params.get_num_images()
@@ -141,7 +140,11 @@ def do_fgs():
             total_exposure,
             30.0,
         )
-        yield from bps.wait()  # Wait for all moves with no explicitly signed group
+
+
+        LOGGER.info("Wait for all moves with no assigned group")
+        yield from bps.wait()
+
         LOGGER.info("kicking off FGS")
         yield from bps.kickoff(fgs_motors)
         LOGGER.info("Waiting for Zocalo device queue to have been cleared...")

tests/conftest.py

@@ -133,8 +133,8 @@ def mock_set(motor: EpicsMotor, val):
     return Status(done=True, success=True)
 
 
-def patch_motor(motor):
-    return patch.object(motor, "set", partial(mock_set, motor))
+def patch_motor(motor: EpicsMotor):
+    return patch.object(motor, "set", MagicMock(side_effect=partial(mock_set, motor)))
 
 
 @pytest.fixture
@@ -212,13 +212,19 @@ def smargon() -> Generator[Smargon, None, None]:
 
     with patch_motor(smargon.omega), patch_motor(smargon.x), patch_motor(
         smargon.y
-    ), patch_motor(smargon.z):
+    ), patch_motor(smargon.z), patch_motor(smargon.chi), patch_motor(smargon.phi):
         yield smargon
 
 
 @pytest.fixture
 def zebra():
-    return i03.zebra(fake_with_ophyd_sim=True)
+    zebra = i03.zebra(fake_with_ophyd_sim=True)
+    mock_arm = MagicMock(
+        side_effect=zebra.pc.arm.armed.set,
+        return_value=Status(done=True, success=True),
+    )
+    with patch.object(zebra.pc.arm.arm_set, "set", mock_arm):
+        return i03.zebra(fake_with_ophyd_sim=True)
 
 
 @pytest.fixture