Merge pull request #13 from DiamondLightSource/fix-exp-time

Wait on prepare when setting exposure time

Author: callumforrester

configuration/b01-1-blueapi-client.yaml

@@ -4,8 +4,5 @@ stomp:
   auth:
     username: guest
     password: guest
-  url: http://b01-1-rabbitmq-daq.diamond.ac.uk:61613
+  url: tcp://b01-1-rabbitmq-daq.diamond.ac.uk:61613
   enabled: true
-oidc:
-  well_known_url: https://authn.diamond.ac.uk/realms/master/.well-known/openid-configuration
-  client_id: blueapi-cli

src/test_rig_bluesky/plans.py

@@ -35,7 +35,9 @@ def spectroscopy(
     metadata: dict[str, Any] | None = None,
 ) -> MsgGenerator[None]:
     """Do a spectroscopy scan."""
-    yield from bps.prepare(spectroscopy_detector, TriggerInfo(livetime=exposure_time))
+    yield from bps.prepare(
+        spectroscopy_detector, TriggerInfo(livetime=exposure_time), wait=True
+    )
 
     spec = spec or Line(sample_stage.x, 0, 5, 5)
 

tests/unit_tests/test_plans.py

@@ -124,3 +124,11 @@ async def test_spectroscopy_defaults(RE: RunEngine):
         "sample_stage-y": 0.0,
         "sample_stage-z": 0.0,
     }
+
+
+def test_spectroscopy_prepares_and_waits_before_doing_anything_else(RE: RunEngine):
+    plan = spectroscopy()
+    message_1, message_2 = next(plan), next(plan)
+
+    assert message_1.command == "prepare"
+    assert message_2.command == "wait"