dls-dodal 1.58.0__py3-none-any.whl → 1.60.0__py3-none-any.whl

dodal/beamlines/i09_1.py

@@ -2,8 +2,8 @@ from dodal.common.beamlines.beamline_utils import (
     device_factory,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.devices.electron_analyser import SelectedSource
-from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
+from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.i09.dcm import DCM
 from dodal.devices.i09_1 import LensMode, PsuMode
 from dodal.devices.synchrotron import Synchrotron
@@ -26,13 +26,18 @@ def dcm() -> DCM:
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
+@device_factory()
+def energy_source() -> EnergySource:
+    return EnergySource(dcm().energy_in_ev)
+
+
 # Connect will work again after this work completed
 # https://jira.diamond.ac.uk/browse/I09-651
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
-    return SpecsAnalyserDriverIO[LensMode, PsuMode](
+def analyser() -> SpecsDetector[LensMode, PsuMode]:
+    return SpecsDetector[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
-        energy_sources={SelectedSource.SOURCE1: dcm().energy_in_ev},
+        energy_source=energy_source(),
     )

dodal/beamlines/i10-1.py

@@ -0,0 +1,25 @@
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.synchrotron import Synchrotron
+from dodal.devices.temperture_controller import Lakeshore336
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i10-1")
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def em_temperature_controller() -> Lakeshore336:
+    return Lakeshore336(
+        prefix=f"{PREFIX.beamline_prefix}-EA-TCTRL-41:",
+    )

dodal/beamlines/i10.py

@@ -6,6 +6,8 @@ note:
     idd == id1,    idu == id2.
 """
 
+from daq_config_server.client import ConfigServer
+
 from dodal.common.beamlines.beamline_utils import device_factory
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.current_amplifiers import CurrentAmpDet
@@ -25,6 +27,9 @@ from dodal.devices.i10.rasor.rasor_scaler_cards import RasorScalerCard1
 from dodal.devices.i10.slits import I10Slits, I10SlitsDrainCurrent
 from dodal.devices.motors import XYStage, XYZStage
 from dodal.devices.pgm import PGM
+from dodal.devices.temperture_controller import (
+    Lakeshore340,
+)
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -33,8 +38,10 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 PREFIX = BeamlinePrefix(BL)
 
+I10_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
 
-LOOK_UPTABLE_DIR = "/dls_sw/i10/software/blueapi/scratch/i10-config/lookupTables/"
+
+LOOK_UPTABLE_DIR = "/dls_sw/i10/software/gda/workspace_git/gda-diamond.git/configurations/i10-shared/lookupTables/"
 
 
 @device_factory()
@@ -60,6 +67,7 @@ def idd() -> I10Id:
         pgm=pgm(),
         look_up_table_dir=LOOK_UPTABLE_DIR,
         source=("Source", "idd"),
+        config_client=I10_CONF_CLIENT,
     )
 
 
@@ -76,6 +84,7 @@ def idu() -> I10Id:
         pgm=pgm(),
         look_up_table_dir=LOOK_UPTABLE_DIR,
         source=("Source", "idu"),
+        config_client=I10_CONF_CLIENT,
     )
 
 
@@ -153,6 +162,13 @@ def sample_stage() -> XYZStage:
     return XYZStage(prefix="ME01D-MO-CRYO-01:")
 
 
+@device_factory()
+def rasor_temperature_controller() -> Lakeshore340:
+    return Lakeshore340(
+        prefix="ME01D-EA-TCTRL-01:",
+    )
+
+
 @device_factory()
 def rasor_femto() -> RasorFemto:
     return RasorFemto(

dodal/beamlines/i11.py

@@ -1,13 +1,9 @@
-from pathlib import Path
-
 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 DET_SUFFIX
-from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.cryostream import OxfordCryoStream
 from dodal.devices.eurotherm import (
     EurothermGeneral,
@@ -34,19 +30,6 @@ PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-# Currently we must hard-code the visit, determining the visit at runtime requires
-# infrastructure that is still WIP.
-# Communication with GDA is also WIP so for now we determine an arbitrary scan number
-# locally and write the commissioning directory. The scan number is not guaranteed to
-# be unique and the data is at risk - this configuration is for testing only.
-set_path_provider(
-    StaticVisitPathProvider(
-        BL,
-        Path(f"/dls/{BL}/data/2025/cm40625-3/bluesky"),
-        client=RemoteDirectoryServiceClient(f"http://{BL}-control:8088/api"),
-    )
-)
-
 
 @device_factory()
 def mythen3() -> Mythen3:

dodal/beamlines/i15.py

@@ -0,0 +1,242 @@
+from ophyd_async.epics.motor import Motor
+
+from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.i15.dcm import DCM
+from dodal.devices.i15.focussing_mirror import (
+    FocusingMirror,
+    FocusingMirrorHorizontal,
+    FocusingMirrorVertical,
+    FocusingMirrorWithRoll,
+)
+from dodal.devices.i15.jack import JackX, JackY
+from dodal.devices.i15.motors import UpstreamDownstreamPair
+from dodal.devices.motors import (
+    SixAxisGonioKappaPhi,
+    XYStage,
+    XYZPitchYawStage,
+    XYZStage,
+)
+from dodal.devices.slits import Slits, SlitsY
+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("i15")  # Default used when not on a live beamline
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)  # Configure logging and util functions
+set_utils_beamline(BL)
+
+"""
+Define device factory functions below this point.
+A device factory function is any function that has a return type which conforms
+to one or more Bluesky Protocols.
+"""
+
+
+@device_factory()
+def arm() -> UpstreamDownstreamPair:
+    return UpstreamDownstreamPair(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:ARM:")
+
+
+@device_factory()
+def beamstop() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-RS-ABSB-04:")
+
+
+@device_factory()
+def bs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-RS-ABSB-08:")
+
+
+@device_factory()
+def bs3() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-RS-ABSB-09:")
+
+
+@device_factory()
+def dcm() -> DCM:
+    return DCM(f"{PREFIX.beamline_prefix}-OP-DCM-01:")
+
+
+@device_factory()
+def det1z() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-DIFF-01:ARM:DETECTOR:Z")
+
+
+@device_factory()
+def det2z() -> Motor:
+    """Deliberately the same as eht2dtx"""
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-03:DETECTOR2:Z")
+
+
+@device_factory()
+def diffractometer() -> SixAxisGonioKappaPhi:
+    return SixAxisGonioKappaPhi(
+        prefix=f"{PREFIX.beamline_prefix}-MO-DIFF-01:SAMPLE:",
+        phi_infix="KPHI",
+    )
+
+
+@device_factory()
+def djack1() -> JackX:
+    return JackX(f"{PREFIX.beamline_prefix}-MO-DIFF-01:BASE:")
+
+
+@device_factory()
+def eht2dtx() -> Motor:
+    """Deliberately the same as det2z"""
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-03:DETECTOR2:Z")
+
+
+@device_factory()
+def f2x() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-RS-ABSB-10:X")
+
+
+@device_factory()
+def fs() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
+
+
+@device_factory()
+def fs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-EA-SHTR-02:")
+
+
+@device_factory()
+def hfm() -> FocusingMirrorWithRoll:
+    return FocusingMirrorWithRoll(f"{PREFIX.beamline_prefix}-OP-HFM-01:")
+
+
+@device_factory()
+def laserboard() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:")
+
+
+@device_factory()
+def obj() -> UpstreamDownstreamPair:
+    return UpstreamDownstreamPair(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OBJ:")
+
+
+@device_factory()
+def opticds() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OPTIC:DS:")
+
+
+@device_factory()
+def opticus() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OPTIC:US:")
+
+
+@device_factory()
+def pin3() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-AL-APTR-03:")
+
+
+@device_factory()
+def pin() -> XYZPitchYawStage:
+    return XYZPitchYawStage(f"{PREFIX.beamline_prefix}-AL-APTR-02:")
+
+
+@device_factory()
+def qbpm1() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-DI-QBPM-01:")
+
+
+@device_factory()
+def qbpm2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-DI-QBPM-02:")
+
+
+@device_factory()
+def s1() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s2() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s4() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s5() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s6() -> SlitsY:
+    return SlitsY(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s7() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-07:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def shd() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-SHEAD-01:")
+
+
+@device_factory()
+def shd2() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-SHEAD-02:")
+
+
+@device_factory()
+def shfm() -> FocusingMirrorHorizontal:
+    return FocusingMirrorHorizontal(f"{PREFIX.beamline_prefix}-OP-MIRR-03:HFM:")
+
+
+@device_factory()
+def skb() -> JackY:
+    return JackY(f"{PREFIX.beamline_prefix}-OP-MIRR-03:BASE:")
+
+
+@device_factory()
+def svfm() -> FocusingMirrorVertical:
+    return FocusingMirrorVertical(f"{PREFIX.beamline_prefix}-OP-MIRR-03:VFM:")
+
+
+@device_factory()
+def tab2jack() -> JackX:
+    return JackX(f"{PREFIX.beamline_prefix}-MO-TABLE-03:BASE:")
+
+
+@device_factory()
+def vfm() -> FocusingMirror:
+    return FocusingMirror(f"{PREFIX.beamline_prefix}-OP-VFM-01:")
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

dodal/beamlines/i15_1.py

@@ -0,0 +1,156 @@
+from ophyd_async.epics.motor import Motor
+
+from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.i15.laue import LaueMonochrometer
+from dodal.devices.i15.motors import NumberedTripleAxisStage
+from dodal.devices.i15.multilayer_mirror import MultiLayerMirror
+from dodal.devices.i15.rail import Rail
+from dodal.devices.motors import XYPhiStage, XYStage, YZStage
+from dodal.devices.slits import Slits
+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("i15-1")  # Default used when not on a live beamline
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)  # Configure logging and util functions
+set_utils_beamline(BL)
+
+"""
+Define device factory functions below this point.
+A device factory function is any function that has a return type which conforms
+to one or more Bluesky Protocols.
+"""
+
+
+@device_factory()
+def attY() -> NumberedTripleAxisStage:
+    return NumberedTripleAxisStage(
+        f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
+        axis1_infix="STICK1",
+        axis2_infix="STICK2",
+        axis3_infix="STICK3",
+    )
+
+
+@device_factory()
+def baseY() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:Y")
+
+
+@device_factory()
+def blowerY() -> Motor:
+    """Same motor as blowerZ"""
+    return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")
+
+
+@device_factory()
+def blowerZ() -> Motor:
+    """Same motor as blowerY"""
+    return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")
+
+
+@device_factory()
+def bs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-SMAR-02:")
+
+
+@device_factory()
+def clean() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-ABSB-01:CLEAN:")
+
+
+@device_factory()
+def det2() -> YZStage:
+    return YZStage(f"{PREFIX.beamline_prefix}-EA-DET-02:")
+
+
+@device_factory()
+def envX() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:ENV:X")
+
+
+@device_factory()
+def f2y() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-OP-ATTN-02:Y")
+
+
+@device_factory()
+def m1() -> MultiLayerMirror:
+    return MultiLayerMirror(f"{PREFIX.beamline_prefix}-OP-MIRR-01:")
+
+
+@device_factory()
+def rail() -> Rail:
+    return Rail(f"{PREFIX.beamline_prefix}-MO-RAIL-01:")
+
+
+@device_factory(skip=True)
+def sam() -> XYPhiStage:
+    return XYPhiStage(f"{PREFIX.beamline_prefix}-MO-TABLE-01:SAMPLE:", phi_infix="PHI2")
+
+
+@device_factory()
+def slits_1() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_2() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_3() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_4() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_5() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def tth() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:TTH")
+
+
+@device_factory()
+def trans() -> XYPhiStage:
+    return XYPhiStage(prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-01:TRANS:")
+
+
+@device_factory()
+def xtal() -> LaueMonochrometer:
+    return LaueMonochrometer(prefix=f"{PREFIX.beamline_prefix}-OP-LAUE-01:")

dodal/beamlines/i19_1.py

@@ -58,6 +58,8 @@ def oav() -> OAVBeamCentreFile:
     )
 
 
+# NOTE EH1 uses the Zebra 2 box. While a Zebra 1 box exists and is connected
+# on the beamline, it is currently not in use
 @device_factory()
 def zebra() -> Zebra:
     """Get the i19-1 zebra device, instantiate it if it hasn't already been.
@@ -65,7 +67,7 @@ def zebra() -> Zebra:
     """
     return Zebra(
         mapping=I19_1_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-02:",
     )
 
 

dodal/beamlines/i19_2.py

@@ -1,5 +1,8 @@
+from ophyd_async.fastcs.panda import HDFPanda
+
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
+    get_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
@@ -54,7 +57,7 @@ def zebra() -> Zebra:
     """
     return Zebra(
         mapping=I19_2_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
     )
 
 
@@ -84,3 +87,11 @@ def backlight() -> BacklightPosition:
     If this is called when already instantiated in i19-2, it will return the existing object.
     """
     return BacklightPosition(prefix=f"{PREFIX.beamline_prefix}-EA-IOC-12:")
+
+
+@device_factory()
+def panda() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
+        path_provider=get_path_provider(),
+    )

dodal/beamlines/i21.py

@@ -0,0 +1,27 @@
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.i21 import Grating
+from dodal.devices.pgm import PGM
+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("i21")
+PREFIX = BeamlinePrefix(BL, suffix="I")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def pgm() -> PGM:
+    return PGM(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        grating=Grating,
+    )

dodal/beamlines/i22.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adaravis import AravisDetector
-from ophyd_async.epics.adcore import NDPluginBaseIO
+from ophyd_async.epics.adcore import NDPluginBaseIO, NDPluginStatsIO
 from ophyd_async.epics.adpilatus import PilatusDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
@@ -68,6 +68,11 @@ def saxs() -> PilatusDetector:
         drv_suffix=CAM_SUFFIX,
         fileio_suffix=HDF5_SUFFIX,
         metadata_holder=metadata_holder,
+        plugins={
+            "stats": NDPluginStatsIO(
+                prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:STAT:"
+            )
+        },
     )
 
 
@@ -93,6 +98,11 @@ def waxs() -> PilatusDetector:
         drv_suffix=CAM_SUFFIX,
         fileio_suffix=HDF5_SUFFIX,
         metadata_holder=metadata_holder,
+        plugins={
+            "stats": NDPluginStatsIO(
+                prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-03:STAT:"
+            )
+        },
     )
 
 
@@ -272,7 +282,7 @@ def linkam() -> Linkam3:
     return Linkam3(prefix=f"{PREFIX.beamline_prefix}-EA-TEMPC-05:")
 
 
-@device_factory()
+@device_factory(skip=True)
 def ppump() -> WatsonMarlow323Pump:
     """Sample Environment Peristaltic Pump"""
     return WatsonMarlow323Pump(f"{PREFIX.beamline_prefix}-EA-PUMP-01:")