dls-dodal 1.52.0__tar.gz → 1.54.0__tar.gz

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/.github/workflows/_release.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Create GitHub Release
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/.github/workflows/_test.yml

@@ -64,7 +64,7 @@ jobs:
           path: example-services
 
       - name: Run docker compose
-        uses: hoverkraft-tech/compose-action@v2.2.0
+        uses: hoverkraft-tech/compose-action@v2.3.0
         with:
           compose-file: "./example-services/compose.yaml"
           services: |

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.52.0
+Version: 1.54.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
-Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
+Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
@@ -215,8 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.11
-Requires-Dist: epicscorelibs<=7.0.7.99.1.2a1
+Requires-Dist: ophyd-async[ca,pva]>=0.12.3
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -226,8 +225,6 @@ Requires-Dist: requests
 Requires-Dist: graypy
 Requires-Dist: pydantic>=2.0
 Requires-Dist: opencv-python-headless
-Requires-Dist: aioca
-Requires-Dist: p4p
 Requires-Dist: numpy
 Requires-Dist: aiofiles
 Requires-Dist: aiohttp
@@ -235,6 +232,7 @@ Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
+Requires-Dist: deepdiff
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/docs/how-to/dev-install.md

@@ -8,16 +8,20 @@ First clone the repository locally using [Git](https://git-scm.com/downloads). T
 
 ## Install dependencies
 
-You can choose to either develop on the host machine using a `venv` (which requires python 3.10 or later) or to run 
+You can choose to either develop on the host machine using a `venv` (which requires python 3.11 or later) or to run 
 in a container under [VSCode](https://code.visualstudio.com/)
 
 <!-- https://sphinx-design.readthedocs.io/en/latest/tabs.html# -->
 ::::{tab-set}
 
 :::{tab-item} Local virtualenv
+
+If on a DLS machine make sure you have python >3.11 running by doing `module load python/3.11`
+
 ```
 python3 -m venv venv
 source venv/bin/activate
+pip install --upgrade pip
 pip install -e '.[dev]'
 ```
 

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/docs/reference/standards.rst

@@ -29,7 +29,7 @@ Supported Python Versions
 As a standard for the python versions to support, we should be matching the deprecation policy at 
 https://numpy.org/neps/nep-0029-deprecation_policy.html.
 
-Currently supported versions are: 3.10, 3.11, 3.12. (As of the last edit of this document.)
+Currently supported versions are: 3.11, 3.12. (As of the last edit of this document.)
 
 .. _documentation_standards:
 

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/pyproject.toml

@@ -14,8 +14,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async>=0.11",
-    "epicscorelibs<=7.0.7.99.1.2a1",  # Pending https://github.com/epics-base/epicscorelibs/issues/41
+    "ophyd-async[ca,pva]>=0.12.3",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -24,16 +23,15 @@ dependencies = [
     "requests",
     "graypy",
     "pydantic>=2.0",
-    "opencv-python-headless", # For pin-tip detection.
-    "aioca",                  # Required for CA support with ophyd-async.
-    "p4p",                    # Required for PVA support with ophyd-async.
+    "opencv-python-headless",        # For pin-tip detection.
     "numpy",
     "aiofiles",
     "aiohttp",
     "redis",
     "scanspec>=0.7.3",
-    "event-model>=1.23",      # Until bluesky pins it https://github.com/DiamondLightSource/dodal/issues/1278
-    "pyzmq==26.3.0",          # Until we can move to RHEL 8 https://github.com/DiamondLightSource/mx-bluesky/issues/1139
+    "event-model>=1.23",             # Until bluesky pins it https://github.com/DiamondLightSource/dodal/issues/1278
+    "pyzmq==26.3.0",                 # Until we can move to RHEL 8 https://github.com/DiamondLightSource/mx-bluesky/issues/1139
+    "deepdiff",
 ]
 
 dynamic = ["version"]
@@ -83,10 +81,22 @@ save-panda = "dodal.devices.util.save_panda:main"
 [project.urls]
 GitHub = "https://github.com/DiamondLightSource/dodal"
 
-[[project.authors]] # Further authors may be added by duplicating this section
+[[project.authors]]
 email = "dominic.oram@diamond.ac.uk"
 name = "Dominic Oram"
 
+[[project.authors]]
+email = "joseph.ware@diamond.ac.uk"
+name = "Joseph Ware"
+
+[[project.authors]]
+email = "Oliver.Silvester@diamond.ac.uk"
+name = "Oliver Silvester"
+
+[[project.authors]]
+email = "noemi.frisina@diamond.ac.uk"
+name = "Noemi Frisina"
+
 [tool.setuptools.packages.find]
 where = ["src"]
 

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.52.0
+Version: 1.54.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
-Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
+Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
                                    Version 2.0, January 2004
                                 http://www.apache.org/licenses/
@@ -215,8 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.11
-Requires-Dist: epicscorelibs<=7.0.7.99.1.2a1
+Requires-Dist: ophyd-async[ca,pva]>=0.12.3
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -226,8 +225,6 @@ Requires-Dist: requests
 Requires-Dist: graypy
 Requires-Dist: pydantic>=2.0
 Requires-Dist: opencv-python-headless
-Requires-Dist: aioca
-Requires-Dist: p4p
 Requires-Dist: numpy
 Requires-Dist: aiofiles
 Requires-Dist: aiohttp
@@ -235,6 +232,7 @@ Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
+Requires-Dist: deepdiff
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -103,6 +103,8 @@ src/dodal/beamlines/b21.py
 src/dodal/beamlines/i02_1.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
+src/dodal/beamlines/i05.py
+src/dodal/beamlines/i05_1.py
 src/dodal/beamlines/i09.py
 src/dodal/beamlines/i09_1.py
 src/dodal/beamlines/i09_2.py
@@ -185,6 +187,7 @@ src/dodal/devices/attenuator/filter_selections.py
 src/dodal/devices/b07/__init__.py
 src/dodal/devices/b07/enums.py
 src/dodal/devices/b07_1/__init__.py
+src/dodal/devices/b07_1/ccmc.py
 src/dodal/devices/b07_1/enums.py
 src/dodal/devices/b16/__init__.py
 src/dodal/devices/b16/detector.py
@@ -209,6 +212,7 @@ src/dodal/devices/electron_analyser/abstract/__init__.py
 src/dodal/devices/electron_analyser/abstract/base_detector.py
 src/dodal/devices/electron_analyser/abstract/base_driver_io.py
 src/dodal/devices/electron_analyser/abstract/base_region.py
+src/dodal/devices/electron_analyser/abstract/types.py
 src/dodal/devices/electron_analyser/specs/__init__.py
 src/dodal/devices/electron_analyser/specs/detector.py
 src/dodal/devices/electron_analyser/specs/driver_io.py
@@ -226,6 +230,8 @@ src/dodal/devices/i04/__init__.py
 src/dodal/devices/i04/constants.py
 src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
+src/dodal/devices/i05/__init__.py
+src/dodal/devices/i05/enums.py
 src/dodal/devices/i09/__init__.py
 src/dodal/devices/i09/dcm.py
 src/dodal/devices/i09/enums.py
@@ -417,6 +423,7 @@ tests/devices/unit_tests/test_zebra_constants_mapping.py
 tests/devices/unit_tests/test_zebra_shutter.py
 tests/devices/unit_tests/test_zocalo_interaction.py
 tests/devices/unit_tests/test_zocalo_results.py
+tests/devices/unit_tests/b07_1/test_ccmc.py
 tests/devices/unit_tests/current_amplifier/test_femto.py
 tests/devices/unit_tests/current_amplifier/test_sr570.py
 tests/devices/unit_tests/detector/test_det_dim_constants.py
@@ -429,6 +436,7 @@ tests/devices/unit_tests/electron_analyser/util.py
 tests/devices/unit_tests/electron_analyser/abstract/__init__.py
 tests/devices/unit_tests/electron_analyser/abstract/test_base_detector.py
 tests/devices/unit_tests/electron_analyser/abstract/test_base_driver_io.py
+tests/devices/unit_tests/electron_analyser/abstract/test_base_region.py
 tests/devices/unit_tests/electron_analyser/specs/__init__.py
 tests/devices/unit_tests/electron_analyser/specs/test_detector.py
 tests/devices/unit_tests/electron_analyser/specs/test_driver_io.py

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,7 +1,6 @@
 click
 ophyd
-ophyd-async>=0.11
-epicscorelibs<=7.0.7.99.1.2a1
+ophyd-async[ca,pva]>=0.12.3
 bluesky
 pyepics
 dataclasses-json
@@ -11,8 +10,6 @@ requests
 graypy
 pydantic>=2.0
 opencv-python-headless
-aioca
-p4p
 numpy
 aiofiles
 aiohttp
@@ -20,6 +17,7 @@ redis
 scanspec>=0.7.3
 event-model>=1.23
 pyzmq==26.3.0
+deepdiff
 
 [dev]
 black

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.52.0'
-__version_tuple__ = version_tuple = (1, 52, 0)
+__version__ = version = '1.54.0'
+__version_tuple__ = version_tuple = (1, 54, 0)

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/__init__.py

@@ -9,6 +9,7 @@ from pathlib import Path
 # module name. Add any new beamlines whose name differs from their module name to this
 # dictionary, which maps ${BEAMLINE} to dodal.beamlines.<MODULE NAME>
 _BEAMLINE_NAME_OVERRIDES = {
+    "i05-1": "i05_1",
     "b07-1": "b07_1",
     "i09-1": "i09_1",
     "i13-1": "i13_1",

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/adsim.py

@@ -1,15 +1,11 @@
-from pathlib import Path
-
 from ophyd_async.epics.adsimdetector import SimDetector
 
 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, HDF5_SUFFIX
-from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -19,13 +15,6 @@ PREFIX = BeamlinePrefix("t01")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_path_provider(
-    StaticVisitPathProvider(
-        BL,
-        Path("/tmp"),
-        client=LocalDirectoryServiceClient(),
-    )
-)
 
 """
 Beamline module for use with the simulated AreaDetector and motors.
@@ -47,11 +36,23 @@ How to use the devices in a plan:
 In an ipython terminal run:
 
 ```python
+from pathlib import Path
+
 from bluesky.run_engine import RunEngine
+from ophyd_async.core import StaticPathProvider, UUIDFilenameProvider
 
 from dodal.beamlines.adsim import det, stage
+from dodal.common.beamlines.beamline_utils import set_path_provider
 from dodal.plans import count
 
+
+set_path_provider(
+    StaticPathProvider(
+        UUIDFilenameProvider(),
+        "/tmp", # The directory for `det` to write to- may be mounted as a volume
+    )
+)
+
 RE = RunEngine()
 d = det(connect_immediately=True)
 s = stage(connect_immediately=True)

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/b01_1.py

@@ -59,7 +59,7 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def oav() -> AravisDetector:
+def spectroscopy_detector() -> AravisDetector:
     """The Manta camera for the spectroscopy experiment.
 
     Looks at the spectroscopy screen and visualises light
@@ -78,7 +78,7 @@ def oav() -> AravisDetector:
 
 
 @device_factory()
-def sample_det() -> AravisDetector:
+def imaging_detector() -> AravisDetector:
     """The Mako camera for the imaging experiment.
 
     Looks at the on-axis viewing screen.

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/b07.py

@@ -2,7 +2,7 @@ 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.b07 import Grating, LensMode
+from dodal.devices.b07 import Grating, LensMode, PsuMode
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -25,10 +25,13 @@ def pgm() -> PGM:
     return PGM(prefix=f"{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()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
-    return SpecsAnalyserDriverIO[LensMode](
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
+    return SpecsAnalyserDriverIO[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
         energy_sources={"source1": pgm().energy.user_readback},
     )

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/b07_1.py

@@ -1,8 +1,11 @@
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-)
+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.b07_1 import Grating, LensMode
+from dodal.devices.b07 import PsuMode
+from dodal.devices.b07_1 import (
+    ChannelCutMonochromator,
+    Grating,
+    LensMode,
+)
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -25,10 +28,18 @@ def pgm() -> PGM:
     return PGM(prefix=f"{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()
+def ccmc() -> ChannelCutMonochromator:
+    return ChannelCutMonochromator(prefix=f"{PREFIX.beamline_prefix}-OP-CCM-01:")
+
+
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
-    return SpecsAnalyserDriverIO[LensMode](
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
+    return SpecsAnalyserDriverIO[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
         energy_sources={"source1": pgm().energy.user_readback},
     )

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/b21.py

@@ -41,25 +41,25 @@ set_path_provider(
 )
 
 
-@device_factory(skip=True)
+@device_factory()
 def saxs() -> EigerDetector:
     return EigerDetector(
         prefix=PREFIX.beamline_prefix,
         path_provider=get_path_provider(),
         drv_suffix="-EA-EIGER-01:",
         hdf_suffix="-EA-EIGER-01:OD:",
-        # odin_nodes=1, # TODO: https://github.com/bluesky/ophyd-async/issues/923
+        odin_nodes=1,
     )
 
 
-@device_factory(skip=True)
+@device_factory()
 def waxs() -> EigerDetector:
     return EigerDetector(
         prefix=PREFIX.beamline_prefix,
         path_provider=get_path_provider(),
         drv_suffix="-EA-EIGER-02:",
         hdf_suffix="-EA-EIGER-02:OD:",
-        # odin_nodes=1, # TODO: https://github.com/bluesky/ophyd-async/issues/923
+        odin_nodes=1,
     )
 
 

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/i04.py

@@ -46,10 +46,9 @@ from dodal.devices.zocalo import ZocaloResults
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
-ZOOM_PARAMS_FILE = (
-    "/dls_sw/i04/software/gda/configurations/i04-config/xml/jCameraManZoomLevels.xml"
-)
-DISPLAY_CONFIG = "/dls_sw/i04/software/gda_versions/var/display.configuration"
+# Use BlueAPI scratch until https://github.com/DiamondLightSource/mx-bluesky/issues/1097 is done
+ZOOM_PARAMS_FILE = "/dls_sw/i04/software/bluesky/scratch/jCameraManZoomLevels.xml"
+DISPLAY_CONFIG = "/dls_sw/i04/software/bluesky/scratch/display.configuration"
 DAQ_CONFIGURATION_PATH = "/dls_sw/i04/software/daq_configuration"
 
 
@@ -296,7 +295,9 @@ def zebra() -> Zebra:
     )
 
 
-@device_factory(skip=BL == "s04")
+@device_factory(
+    skip=BL == "s04",
+)
 def oav(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     """Get the i04 OAV device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
@@ -307,7 +308,9 @@ def oav(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     )
 
 
-@device_factory(skip=BL == "s04")
+@device_factory(
+    skip=BL == "s04",
+)
 def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     """Get the i04 OAV device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
@@ -319,7 +322,9 @@ def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     )
 
 
-@device_factory(skip=BL == "s04")
+@device_factory(
+    skip=BL == "s04",
+)
 def detector_motion() -> DetectorMotion:
     """Get the i04 detector motion device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.

dls_dodal-1.54.0/src/dodal/beamlines/i05.py

@@ -0,0 +1,22 @@
+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.i05 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("i05")
+PREFIX = BeamlinePrefix(BL)
+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)

dls_dodal-1.54.0/src/dodal/beamlines/i05_1.py

@@ -0,0 +1,17 @@
+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.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i05-1")
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/i09.py

@@ -3,7 +3,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.vgscienta import VGScientaAnalyserDriverIO
-from dodal.devices.i09 import DCM, Grating, LensMode
+from dodal.devices.i09 import DCM, Grating, LensMode, PassEnergy, PsuMode
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -33,14 +33,18 @@ def dcm() -> DCM:
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
+# Connect will work again after this work completed
+# https://jira.diamond.ac.uk/browse/I09-651
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode]:
+def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy]:
     energy_sources = {
         "source1": pgm().energy.user_readback,
         "source2": dcm().energy_in_ev,
     }
-    return VGScientaAnalyserDriverIO[LensMode](
+    return VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
+        pass_energy_type=PassEnergy,
         energy_sources=energy_sources,
     )

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/i09_1.py

@@ -4,7 +4,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.i09.dcm import DCM
-from dodal.devices.i09_1 import LensMode
+from dodal.devices.i09_1 import LensMode, PsuMode
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -25,10 +25,13 @@ def dcm() -> DCM:
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
+# Connect will work again after this work completed
+# https://jira.diamond.ac.uk/browse/I09-651
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode]:
-    return SpecsAnalyserDriverIO[LensMode](
+def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
+    return SpecsAnalyserDriverIO[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
         lens_mode_type=LensMode,
+        psu_mode_type=PsuMode,
         energy_sources={"source1": dcm().energy_in_ev},
     )

{dls_dodal-1.52.0 → dls_dodal-1.54.0}/src/dodal/beamlines/i19_1.py

@@ -42,7 +42,7 @@ DISPLAY_CONFIG = "/dls_sw/i19-1/software/daq_configuration/domain/display.config
 
 # Needs to wait until enum is fixed on the beamline
 # See https://github.com/DiamondLightSource/dodal/issues/1150
-@device_factory(skip=True)
+@device_factory()
 def beamstop() -> BeamStop:
     """Get the i19-1 beamstop device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i19-1, it will return the existing object.