dls-dodal 1.68.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

dodal/beamlines/b01_1.py

@@ -1,3 +1,6 @@
+from pathlib import Path
+
+from ophyd_async.core import StaticPathProvider, UUIDFilenameProvider
 from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.epics.adcore import NDROIStatIO
 from ophyd_async.fastcs.panda import HDFPanda
@@ -5,6 +8,7 @@ from ophyd_async.fastcs.panda import HDFPanda
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
     get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
@@ -28,6 +32,13 @@ See the IOC status here:
 https://argocd.diamond.ac.uk/applications?showFavorites=false&proj=&sync=&autoSync=&health=&namespace=&cluster=&labels=
 """
 
+# This should be removed when the DeviceManager is adopted
+try:
+    get_path_provider()
+except NameError:
+    # If one hasn't already been set, use a default to stop things crashing
+    set_path_provider(StaticPathProvider(UUIDFilenameProvider(), Path("/tmp")))
+
 
 @device_factory()
 def panda() -> HDFPanda:

dodal/beamlines/b07.py

@@ -1,46 +1,42 @@
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-)
+from dodal.beamlines.b07_shared import devices as b07_shared_devices
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.devices.b07 import Grating, LensMode, PsuMode
+from dodal.device_manager import DeviceManager
+from dodal.devices.beamlines.b07 import Grating, LensMode, PsuMode
 from dodal.devices.electron_analyser.base import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PlaneGratingMonochromator
-from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
 BL = get_beamline_name("b07")
-PREFIX = BeamlinePrefix(BL, suffix="B")
+B_PREFIX = BeamlinePrefix(BL, suffix="B")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+devices = DeviceManager()
+devices.include(b07_shared_devices)
 
-@device_factory()
-def synchrotron() -> Synchrotron:
-    return Synchrotron()
 
-
-@device_factory()
+@devices.factory()
 def pgm() -> PlaneGratingMonochromator:
     return PlaneGratingMonochromator(
-        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        prefix=f"{B_PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=Grating,
     )
 
 
-@device_factory()
-def energy_source() -> EnergySource:
-    return EnergySource(pgm().energy.user_readback)
+@devices.factory()
+def energy_source(pgm: PlaneGratingMonochromator) -> EnergySource:
+    return EnergySource(pgm.energy.user_readback)
 
 
-# Connect will work again after this work completed
-# https://jira.diamond.ac.uk/browse/B07-1104
-@device_factory()
-def analyser() -> SpecsDetector[LensMode, PsuMode]:
+# CAM:IMAGE will fail to connect outside the beamline network,
+# see https://github.com/DiamondLightSource/dodal/issues/1852
+@devices.factory()
+def analyser(energy_source: EnergySource) -> SpecsDetector[LensMode, PsuMode]:
     return SpecsDetector[LensMode, PsuMode](
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        prefix=f"{B_PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
-        energy_source=energy_source(),
+        energy_source=energy_source,
     )

dodal/beamlines/b07_1.py

@@ -1,7 +1,8 @@
-from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.beamlines.b07_shared import devices as b07_shared_devices
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.devices.b07 import PsuMode
-from dodal.devices.b07_1 import (
+from dodal.device_manager import DeviceManager
+from dodal.devices.beamlines.b07 import PsuMode
+from dodal.devices.beamlines.b07_1 import (
     ChannelCutMonochromator,
     Grating,
     LensMode,
@@ -9,46 +10,43 @@ from dodal.devices.b07_1 import (
 from dodal.devices.electron_analyser.base import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PlaneGratingMonochromator
-from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
 BL = get_beamline_name("b07-1")
-PREFIX = BeamlinePrefix(BL, suffix="C")
+C_PREFIX = BeamlinePrefix(BL, suffix="C")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+devices = DeviceManager()
+devices.include(b07_shared_devices)
 
-@device_factory()
-def synchrotron() -> Synchrotron:
-    return Synchrotron()
 
-
-@device_factory()
+@devices.factory()
 def pgm() -> PlaneGratingMonochromator:
     return PlaneGratingMonochromator(
-        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        prefix=f"{C_PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=Grating,
     )
 
 
-# Connect will work again after this work completed
-# https://jira.diamond.ac.uk/browse/B07-1104
-@device_factory()
+@devices.factory()
 def ccmc() -> ChannelCutMonochromator:
-    return ChannelCutMonochromator(prefix=f"{PREFIX.beamline_prefix}-OP-CCM-01:")
+    return ChannelCutMonochromator(prefix=f"{C_PREFIX.beamline_prefix}-OP-CCM-01:")
 
 
-@device_factory()
-def energy_source() -> EnergySource:
-    return EnergySource(pgm().energy.user_readback)
+@devices.factory()
+def energy_source(pgm: PlaneGratingMonochromator) -> EnergySource:
+    return EnergySource(pgm.energy.user_readback)
 
 
-@device_factory()
-def analyser() -> SpecsDetector[LensMode, PsuMode]:
+# CAM:IMAGE will fail to connect outside the beamline network,
+# see https://github.com/DiamondLightSource/dodal/issues/1852
+@devices.factory()
+def analyser(energy_source: EnergySource) -> SpecsDetector[LensMode, PsuMode]:
     return SpecsDetector[LensMode, PsuMode](
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        prefix=f"{C_PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
-        energy_source=energy_source(),
+        energy_source=energy_source,
     )

dodal/beamlines/b07_shared.py

@@ -0,0 +1,12 @@
+from dodal.device_manager import DeviceManager
+from dodal.devices.synchrotron import Synchrotron
+from dodal.utils import get_beamline_name
+
+BL = get_beamline_name("b07-shared")
+
+devices = DeviceManager()
+
+
+@devices.factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

dodal/beamlines/b16.py

@@ -11,7 +11,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
-from dodal.devices.b16.detector import (
+from dodal.devices.beamlines.b16.detector import (
     software_triggered_tiff_area_detector,
 )
 from dodal.devices.motors import XYZStage

dodal/beamlines/b21.py

@@ -1,3 +1,6 @@
+from pathlib import Path
+
+from ophyd_async.core import StaticPathProvider, UUIDFilenameProvider
 from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.fastcs.eiger import EigerDetector
 from ophyd_async.fastcs.panda import HDFPanda
@@ -5,11 +8,12 @@ from ophyd_async.fastcs.panda import HDFPanda
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
     get_path_provider,
+    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
+from dodal.devices.beamlines.i22.nxsas import NXSasMetadataHolder, NXSasOAV
 from dodal.devices.focusing_mirror import SimpleMirror
-from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV
 from dodal.devices.linkam3 import Linkam3
 from dodal.devices.motors import XYStage
 from dodal.devices.slits import Slits
@@ -23,6 +27,13 @@ PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+# This should be removed when the DeviceManager is adopted
+try:
+    get_path_provider()
+except NameError:
+    # If one hasn't already been set, use a default to stop things crashing
+    set_path_provider(StaticPathProvider(UUIDFilenameProvider(), Path("/tmp")))
+
 
 @device_factory()
 def saxs() -> EigerDetector:
@@ -95,9 +106,8 @@ def slits_3() -> Slits:
     return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:")
 
 
-"""
-Slits 4 was removed from B21 after the camera length was fixed, it is not used anymore.
-"""
+"""Slits 4 was removed from B21 after the camera length was fixed, it is not used
+anymore."""
 
 
 @device_factory()
@@ -112,8 +122,7 @@ def slits_6() -> Slits:
 
 @device_factory()
 def slits_7() -> Slits:
-    """
-    Compact JJ slits device is used for B21 slits 7. PV's operate in same way
+    """Compact JJ slits device is used for B21 slits 7. PV's operate in same way
     but physically different to other slits, and uses X:GAP nomenclature.
     """
     return Slits(

dodal/beamlines/i02_1.py

@@ -1,10 +1,7 @@
-"""Beamline i02-1 is also known as VMXm, or I02J"""
+"""Beamline i02-1 is also known as VMXm, or I02J."""
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-    device_instantiation,
-)
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
 from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
 from dodal.devices.attenuator.filter_selections import (
     I02_1FilterFourSelections,
@@ -12,9 +9,9 @@ from dodal.devices.attenuator.filter_selections import (
     I02_1FilterThreeSelections,
     I02_1FilterTwoSelections,
 )
+from dodal.devices.beamlines.i02_1.fast_grid_scan import ZebraFastGridScanTwoD
+from dodal.devices.beamlines.i02_1.sample_motors import SampleMotors
 from dodal.devices.eiger import EigerDetector
-from dodal.devices.i02_1.fast_grid_scan import ZebraFastGridScanTwoD
-from dodal.devices.i02_1.sample_motors import SampleMotors
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
@@ -37,46 +34,31 @@ I02_1_ZEBRA_MAPPING = ZebraMapping(
     sources=ZebraSources(),
 )
 
+devices = DeviceManager()
 
-@device_factory()
-def eiger(mock: bool = False) -> EigerDetector:
-    """Get the i02-1 Eiger device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
-    return device_instantiation(
-        device_factory=EigerDetector,
-        prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:",
-        bl_prefix=False,
-        wait=False,
-        fake=mock,
-        name="eiger",
-    )
 
+@devices.v1_init(
+    EigerDetector, prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:", wait=False
+)
+def eiger(eiger: EigerDetector) -> EigerDetector:
+    return eiger
 
-@device_factory()
+
+@devices.factory()
 def zebra_fast_grid_scan() -> ZebraFastGridScanTwoD:
-    """Get the i02-1 zebra_fast_grid_scan device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return ZebraFastGridScanTwoD(
         prefix=f"{PREFIX.beamline_prefix}-MO-SAMP-11:",
         motion_controller_prefix="BL02J-MO-STEP-11:",
     )
 
 
-@device_factory()
+@devices.factory()
 def synchrotron() -> Synchrotron:
-    """Get the i02-1 synchrotron device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return Synchrotron()
 
 
-@device_factory()
+@devices.factory()
 def zebra() -> Zebra:
-    """Get the i02-1 zebra device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return Zebra(
         prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
         mapping=I02_1_ZEBRA_MAPPING,
@@ -84,28 +66,18 @@ def zebra() -> Zebra:
 
 
 # Device not needed after https://github.com/DiamondLightSource/mx-bluesky/issues/1299
-@device_factory()
+@devices.factory()
 def zocalo() -> ZocaloResults:
-    """Get the i02-1 ZocaloResults device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return ZocaloResults()
 
 
-@device_factory()
+@devices.factory()
 def goniometer() -> SampleMotors:
-    """Get the i02-1 goniometer device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
     return SampleMotors(f"{PREFIX.beamline_prefix}-MO-SAMP-01:")
 
 
-@device_factory()
+@devices.factory()
 def attenuator() -> EnumFilterAttenuator:
-    """Get the i02-1 attenuator device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-1, it will return the existing object.
-    """
-
     return EnumFilterAttenuator(
         f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
         (

dodal/beamlines/i02_2.py

@@ -1,9 +1,7 @@
-"""Beamline i02-2 is also known as VMXi, or I02I"""
+"""Beamline i02-2 is also known as VMXi, or I02I."""
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-)
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
 from dodal.devices.motors import XYStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -15,18 +13,14 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 DAQ_CONFIGURATION_PATH = "/dls_sw/i02-2/software/daq_configuration"
 
+devices = DeviceManager()
 
-@device_factory()
+
+@devices.factory()
 def synchrotron() -> Synchrotron:
-    """Get the i02-2 synchrotron device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-2, it will return the existing object.
-    """
     return Synchrotron()
 
 
-@device_factory()
+@devices.factory()
 def sample_motors() -> XYStage:
-    """Get the i02-2 goniometer device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i02-2, it will return the existing object.
-    """
     return XYStage(f"{PREFIX.beamline_prefix}-MO-GONIO-01:SAMPLE:")

dodal/beamlines/i03.py

@@ -17,6 +17,10 @@ from dodal.devices.aperturescatterguard import (
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.baton import Baton
+from dodal.devices.beamlines.i03 import Beamstop
+from dodal.devices.beamlines.i03.beamsize import Beamsize
+from dodal.devices.beamlines.i03.dcm import DCM
+from dodal.devices.beamlines.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.collimation_table import CollimationTable
 from dodal.devices.cryostream import (
     CryoStreamGantry,
@@ -31,10 +35,6 @@ from dodal.devices.fluorescence_detector_motion import FluorescenceDetector
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.hutch_shutter import HutchShutter
-from dodal.devices.i03 import Beamstop
-from dodal.devices.i03.beamsize import Beamsize
-from dodal.devices.i03.dcm import DCM
-from dodal.devices.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.ipin import IPin
 from dodal.devices.motors import XYZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
@@ -157,8 +157,11 @@ def detector_motion() -> DetectorMotion:
     )
 
 
-@devices.v1_init(EigerDetector, prefix="BL03I-EA-EIGER-01:", wait=False)
+@devices.v1_init(
+    EigerDetector, prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:", wait=False
+)
 def eiger(eiger: EigerDetector) -> EigerDetector:
+    eiger.detector_id = 78
     return eiger
 
 

dodal/beamlines/i03_supervisor.py

@@ -0,0 +1,19 @@
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.device_manager import DeviceManager
+from dodal.devices.baton import Baton
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i03")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+PREFIX = BeamlinePrefix(BL)
+
+
+devices = DeviceManager()
+
+
+@devices.factory()
+def baton() -> Baton:
+    return Baton(f"{PREFIX.beamline_prefix}-CS-BATON-01:")