D7 positioner (#1208)

* add xyz positioner

* remove the unneeded path provider for xyz positioner

* rename to sample stage at visr

* add d7 positioner

* respond to comments

* ruff lint

* make the d7 positioner use enum

* make d7 enum all uppercase

* into positioner A and B

* add b positioner

* lint

* more lint

* positioner a test

* test for positioner b

* lint

* migrate to 1d generic positioner

* delete the two mistaken test files

* Delete tests/devices/i18/test_d7_positioner_a.py

* fix connectivity to i18 diode

* towards making the diode work

* fix the d7 epics refs

* fix trailing whitespace error

Author: stan-dot

src/dodal/beamlines/i18.py

@@ -113,7 +113,7 @@ def hfm() -> KBMirror:
 
 
 @device_factory()
-def d7diode() -> Diode:
+def d7_diode() -> Diode:
     return Diode(f"{PREFIX.beamline_prefix}-DI-PHDGN-07:")
 
 

src/dodal/devices/i18/diode.py

@@ -1,17 +1,50 @@
-from ophyd_async.core import (
-    StandardReadable,
-)
+from ophyd_async.core import StandardReadable, StrictEnum
 from ophyd_async.epics.core import epics_signal_r
 
+from dodal.devices.positioner import create_positioner
+
+
+class FilterAValues(StrictEnum):
+    """Maps from a short usable name to the string name in EPICS"""
+
+    AL_2MM = "2 mm Al"
+    AL_1_5MM = "1.5 mm Al"
+    AL_1_25MM = "1.25 mm Al"
+    AL_0_8MM = "0.8 mm Al"
+    AL_0_55MM = "0.55 mm Al"
+    AL_0_5MM = "0.5 mm Al"
+    AL_0_3MM = "0.3 mm Al"
+    AL_0_25MM = "0.25 mm Al"
+    AL_0_15MM = "0.15 mm Al"
+    AL_0_1MM = "0.1 mm Al"
+    AL_0_05MM = "0.05 mm Al"
+    AL_0_025MM = "0.025 mm Al"
+    AL_GAP = "Gap"
+
+
+class FilterBValues(StrictEnum):
+    DIAMOND_THIN = "Diamond thin"
+    DIAMOND_THICK = "Diamond thick"
+    NI_DRAIN = "ni drain"
+    AU_DRAIN = "au drain"
+    AL_DRAIN = "al drain"
+    GAP = "Gap"
+    IN_LINE_DIODE = "in line diode"
+
 
 class Diode(StandardReadable):
     def __init__(
         self,
         prefix: str,
         name: str = "",
     ):
-        self._prefix = prefix
         with self.add_children_as_readables():
             self.signal = epics_signal_r(float, prefix + "B:DIODE:I")
+            self.positioner_a = create_positioner(
+                FilterAValues, prefix + "A:MP", positioner_pv_suffix=":SELECT"
+            )  # more complex, will be fixed on Tuesday 20.05.2025
+            self.positioner_b = create_positioner(
+                FilterBValues, prefix + "B:MP", positioner_pv_suffix=":SELECT"
+            )
 
         super().__init__(name=name)