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

dodal/devices/zocalo/zocalo_results.py

@@ -125,19 +125,17 @@ class ZocaloResults(StandardReadable, Triggerable):
 
     def __init__(
         self,
-        name: str = "zocalo",
+        name: str = "",
         zocalo_environment: str = ZOCALO_ENV,
         channel: str = "xrc.i03",
         sort_key: str = DEFAULT_SORT_KEY.value,
         timeout_s: float = DEFAULT_TIMEOUT,
-        prefix: str = "",
         results_source: ZocaloSource = ZocaloSource.CPU,
     ) -> None:
         self.zocalo_environment = zocalo_environment
         self.sort_key = SortKeys[sort_key]
         self.channel = channel
         self.timeout_s = timeout_s
-        self._prefix = prefix
         self._raw_results_received: Queue = Queue()
         self.transport: CommonTransport | None = None
         self.results_source = results_source

dodal/testing/electron_analyser/__init__.py

@@ -0,0 +1,6 @@
+from .device_factory import create_detector, create_driver
+
+__all__ = [
+    "create_detector",
+    "create_driver",
+]

dodal/testing/electron_analyser/device_factory.py

@@ -0,0 +1,59 @@
+from typing import Any, get_args, get_origin
+
+from dodal.devices.electron_analyser.abstract import (
+    TAbstractAnalyserDriverIO,
+)
+from dodal.devices.electron_analyser.detector import TElectronAnalyserDetector
+from dodal.devices.electron_analyser.vgscienta import (
+    VGScientaAnalyserDriverIO,
+    VGScientaDetector,
+)
+
+
+async def create_driver(
+    driver_class: type[TAbstractAnalyserDriverIO],
+    **kwargs: Any,
+) -> TAbstractAnalyserDriverIO:
+    """
+    Helper function that helps to reduce the code to setup an analyser driver. The
+    parameters used for the enum types are taken directly from the subscripts of the
+    class so the user only needs to provide it in one place.
+
+    Args:
+        driver_class: The class for the driver which must include the enums in the
+                      subscript, for example MyDriverClass[MyLensMode, ...]
+        kwargs: Additional key worded arguments that the driver needs for initalisation.
+    """
+    parameters = {
+        "lens_mode_type": get_args(driver_class)[0],
+        "psu_mode_type": get_args(driver_class)[1],
+    }
+    if get_origin(driver_class) is VGScientaAnalyserDriverIO:
+        parameters["pass_energy_type"] = get_args(driver_class)[2]
+
+    return driver_class(**(parameters | kwargs))
+
+
+async def create_detector(
+    detector_class: type[TElectronAnalyserDetector],
+    **kwargs: Any,
+) -> TElectronAnalyserDetector:
+    """
+    Helper function that helps to reduce the code to setup an analyser detector. The
+    parameters used for the enum types are taken directly from the subscripts of the
+    class so the user only needs to provide it in one place.
+
+    Args:
+        detector_class: The class for the detector which must include the enums in the
+                        subscript, for example MyDetectorClass[MyLensMode, ...]
+        kwargs: Additional key worded arguments that the detector needs for
+                initalisation.
+    """
+    parameters = {
+        "lens_mode_type": get_args(detector_class)[0],
+        "psu_mode_type": get_args(detector_class)[1],
+    }
+    if get_origin(detector_class) is VGScientaDetector:
+        parameters["pass_energy_type"] = get_args(detector_class)[2]
+
+    return detector_class(**(parameters | kwargs))

dodal/devices/CTAB.py

@@ -1,41 +0,0 @@
-from ophyd_async.core import StandardReadable
-from ophyd_async.epics.core import epics_signal_r
-from ophyd_async.epics.motor import Motor
-
-
-class CTAB(StandardReadable):
-    """Basic collimantion table (CTAB) device for motion plus the motion disable signal
-    when laser curtain triggered and hutch not locked.
-
-    CTAB has 3 physical vertical motors, the jacks. 1 upstream and 2 downstream.
-    The two downstream jacks are labelled as outboard (away from the ring) and
-    inboard (towards the ring).
-    Together these 3 jacks provide compound motion for vertical motion and pitch/roll.
-    There are 2 physical horizontal motors 1 upstream, 1 downstream. These provide yaw.
-
-    CTAB motion is disabled by an object being within the laser curtain area and can be
-    overriden by use of the dead man's handle device or locking the hutch. The effect of
-    these disabling systems is to cut power to the motors - signal for this is crate_power
-    """
-
-    def __init__(self, prefix: str, name: str = ""):
-        with self.add_children_as_readables():
-            self.inboard_y = Motor(prefix + "-MO-TABLE-01:INBOARDY")
-            self.outboard_y = Motor(prefix + "-MO-TABLE-01:OUTBOARDY")
-            self.upstream_y = Motor(prefix + "-MO-TABLE-01:UPSTREAMY")
-            self.combined_downstream_y = Motor(prefix + "-MO-TABLE-01:DOWNSTREAMY")
-            self.combined_all_y = Motor(prefix + "-MO-TABLE-01:Y")
-
-            self.downstream_x = Motor(prefix + "-MO-TABLE-01:DOWNSTREAMX")
-            self.upstream_x = Motor(prefix + "-MO-TABLE-01:UPSTREAMX")
-            self.combined_all_x = Motor(prefix + "-MO-TABLE-01:X")
-
-            self.pitch = Motor(prefix + "-MO-TABLE-01:PITCH")
-            self.roll = Motor(prefix + "-MO-TABLE-01:ROLL")
-            self.yaw = Motor(prefix + "-MO-TABLE-01:YAW")
-
-            self.crate_power = epics_signal_r(
-                int, prefix + "-MO-PMAC-02:CRATE2_HEALTHY"
-            )  # returns 0 if no power
-
-            super().__init__(name)