Fix more panda uri/prefix changes, beamstop enum

DiamondLightSource · Oct 25, 2024 · 3732d8f · 3732d8f
1 parent 0e602dd
commit 3732d8f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/dodal/beamlines/i22.py b/src/dodal/beamlines/i22.py
@@ -197,7 +197,6 @@ def fswitch() -> FSwitch:
 @device_factory()
 def panda1() -> HDFPanda:
     return HDFPanda(
-        prefix="",
         uri=f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
         path_provider=get_path_provider(),
     )
@@ -206,7 +205,6 @@ def panda1() -> HDFPanda:
 @device_factory(skip=True)
 def panda2() -> HDFPanda:
     return HDFPanda(
-        prefix="",
         uri=f"{PREFIX.beamline_prefix}-EA-PANDA-02:",
         path_provider=get_path_provider(),
     )
@@ -215,7 +213,6 @@ def panda2() -> HDFPanda:
 @device_factory(skip=True)
 def panda3() -> HDFPanda:
     return HDFPanda(
-        prefix="",
         uri=f"{PREFIX.beamline_prefix}-EA-PANDA-03:",
         path_provider=get_path_provider(),
     )
@@ -224,7 +221,6 @@ def panda3() -> HDFPanda:
 @device_factory(skip=True)
 def panda4() -> HDFPanda:
     return HDFPanda(
-        prefix="",
         uri=f"{PREFIX.beamline_prefix}-EA-PANDA-04:",
         path_provider=get_path_provider(),
     )

diff --git a/src/dodal/devices/i24/beamstop.py b/src/dodal/devices/i24/beamstop.py
@@ -1,11 +1,9 @@
-from enum import Enum
-
-from ophyd_async.core import StandardReadable
+from ophyd_async.core import StandardReadable, StrictEnum
 from ophyd_async.epics.motor import Motor
 from ophyd_async.epics.signal import epics_signal_rw
 
 
-class BeamstopPositions(str, Enum):
+class BeamstopPositions(StrictEnum):
     CHECK_BEAM = "CheckBeam"
     DATA_COLLECTION = "Data Collection"
     DATA_COLLECTION_FAR = "Data Collection Far"