dls-dodal 1.54.0__py3-none-any.whl → 1.55.0__py3-none-any.whl

dodal/devices/zebra/zebra_controlled_shutter.py

@@ -28,7 +28,7 @@ class ZebraShutter(StandardReadable, Movable[ZebraShutterState]):
     by a different soft input (aliased to manual_position_setpoint). Both these AND
     gates then feed into an OR gate, which then feeds to the shutter."""
 
-    def __init__(self, prefix: str, name: str):
+    def __init__(self, prefix: str, name: str = ""):
         self._manual_position_setpoint = epics_signal_w(
             ZebraShutterState, prefix + "CTRL2"
         )

dodal/devices/zocalo/__init__.py

@@ -4,6 +4,7 @@ from dodal.devices.zocalo.zocalo_results import (
     NoZocaloSubscription,
     XrcResult,
     ZocaloResults,
+    ZocaloSource,
     get_full_processing_results,
 )
 
@@ -15,4 +16,5 @@ __all__ = [
     "NoResultsFromZocalo",
     "NoZocaloSubscription",
     "ZocaloStartInfo",
+    "ZocaloSource",
 ]

dodal/devices/zocalo/zocalo_results.py

@@ -119,8 +119,7 @@ class ZocaloResults(StandardReadable, Triggerable):
 
         prefix (str): EPICS PV prefix for the device
 
-        use_gpu (bool): When True, ZocaloResults will take the first set of
-        results that it receives (which are likely the GPU results)
+        results_source (ZocaloSource): Where to get results from, GPU or CPU analysis
 
     """
 
@@ -132,7 +131,7 @@ class ZocaloResults(StandardReadable, Triggerable):
         sort_key: str = DEFAULT_SORT_KEY.value,
         timeout_s: float = DEFAULT_TIMEOUT,
         prefix: str = "",
-        use_gpu: bool = False,
+        results_source: ZocaloSource = ZocaloSource.CPU,
     ) -> None:
         self.zocalo_environment = zocalo_environment
         self.sort_key = SortKeys[sort_key]
@@ -141,7 +140,7 @@ class ZocaloResults(StandardReadable, Triggerable):
         self._prefix = prefix
         self._raw_results_received: Queue = Queue()
         self.transport: CommonTransport | None = None
-        self.use_gpu = use_gpu
+        self.results_source = results_source
 
         self.centre_of_mass, self._com_setter = soft_signal_r_and_setter(
             Array1D[np.float64], name="centre_of_mass"
@@ -237,9 +236,6 @@ class ZocaloResults(StandardReadable, Triggerable):
             "meant for it"
         )
         if not self.transport:
-            LOGGER.warning(
-                msg  # AsyncStatus exception messages are poorly propagated, remove after https://github.com/bluesky/ophyd-async/issues/103
-            )
             raise NoZocaloSubscription(msg)
 
         try:
@@ -247,16 +243,19 @@ class ZocaloResults(StandardReadable, Triggerable):
                 f"waiting for results in queue - currently {self._raw_results_received.qsize()} items"
             )
 
-            raw_results = self._raw_results_received.get(timeout=self.timeout_s)
-            source_of_first_results = source_from_results(raw_results)
+            while True:
+                raw_results = self._raw_results_received.get(timeout=self.timeout_s)
+                source_of_results = source_from_results(raw_results)
 
-            if self.use_gpu and source_of_first_results == ZocaloSource.CPU:
-                LOGGER.warning(
-                    "Configured to use GPU results but CPU came first, using CPU results."
-                )
+                if source_of_results != self.results_source:
+                    LOGGER.warning(
+                        f"Configured to use {self.results_source} results but {source_of_results} came first, waiting for further results."
+                    )
+                else:
+                    break
 
             LOGGER.info(
-                f"Zocalo results from {source_from_results(raw_results)} processing: found {len(raw_results['results'])} crystals."
+                f"Zocalo results: found {len(raw_results['results'])} crystals."
             )
             # Sort from strongest to weakest in case of multiple crystals
             await self._put_results(
@@ -288,18 +287,9 @@ class ZocaloResults(StandardReadable, Triggerable):
 
             results = message.get("results", [])
 
-            if self.use_gpu:
-                self._raw_results_received.put(
-                    {"results": results, "recipe_parameters": recipe_parameters}
-                )
-            else:
-                # Only add to queue if results are from CPU
-                if not recipe_parameters.get("gpu"):
-                    self._raw_results_received.put(
-                        {"results": results, "recipe_parameters": recipe_parameters}
-                    )
-                else:
-                    LOGGER.warning("Discarding results as they are from GPU")
+            self._raw_results_received.put(
+                {"results": results, "recipe_parameters": recipe_parameters}
+            )
 
         subscription = workflows.recipe.wrap_subscribe(
             self.transport,