dls-dodal 1.53.0__tar.gz → 1.55.0__tar.gz

{dls_dodal-1.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.0}/.github/workflows/_test.yml

@@ -62,9 +62,10 @@ jobs:
         with:
           repository: epics-containers/example-services
           path: example-services
+          ref: '2025.8.1'
 
       - 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.55.0/.talismanrc

@@ -0,0 +1,10 @@
+fileignoreconfig:
+# Allow CI workflows to pin to the SHA hash
+- filename: ".github/**/*.yml"
+  allowed_patterns:
+   - "uses: .*"
+# Allow use of pass_energy signal name
+- filename: "*.py"
+  allowed_patterns:
+    - pass_energy
+ 

{dls_dodal-1.53.0 → dls_dodal-1.55.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.53.0
+Version: 1.55.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.53.0 → dls_dodal-1.55.0}/docs/how-to/create-beamline.rst

@@ -63,14 +63,14 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
     """
 
     """
-    A valid factory function which:
-    - may be instantiated automatically, selectively on live beamline
-        - caches and re-uses the result for subsequent calls
-    - automatically names the device
-    - may be skipped when make_all_devices is called on this module
-    - must be explicitly connected (may be automated by tools)
-        - when connected may connect to a simulated backend
-        - may be connected concurrently (when automated by tools)
+    This decorator gives extra desirable behaviour to this factory function:
+    - it may be instantiated automatically, selectively on live beamline
+        - caching and re-using the result for subsequent calls
+    - it automatically names the device if no name is explicitly set
+    - it may be skipped when make_all_devices is called on this module
+    - it must be explicitly connected (which may be automated by tools)
+        - when connected it may connect to a simulated backend
+        - it may be connected concurrently (when automated by tools)
     """"
     @device_factory(skip = BL == "s41")
     def synchrotron() -> Synchrotron:
@@ -85,9 +85,3 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
             drv_suffix=CAM_SUFFIX,
             fileio_suffix=HDF5_SUFFIX,
         )
-
-
-``w41`` should also be added to the list of ``ALL_BEAMLINES`` in ``tests/beamlines/test_device_instantiation``.
-This test checks that the function returns a type that conforms to Bluesky protocols, 
-that it always returns the same instance of the device and that the arguments passed 
-into the Device class constructor are valid.

{dls_dodal-1.53.0 → dls_dodal-1.55.0}/docs/how-to/create-device.md

@@ -1,7 +1,7 @@
 Creating a new device
 ---------------------
 
-Devices are written using the ophyd-async framework, the hardware abstraction library at Diamond. 
+Devices are written using the ophyd-async framework, the hardware abstraction library at Diamond. Before creating your device, you should [consider where the new code should live](../reference/device-standards.rst#where_to_put_devices).
 
 Reusing an existing class
 =========================

{dls_dodal-1.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.0}/docs/reference/device-standards.rst

@@ -7,6 +7,9 @@ Some devices have been written in ``ophyd`` for historic reasons. However, all n
 ``ophyd-async`` and any old ``ophyd`` devices undergoing a large re-write should be considered for 
 conversion to ``ophyd-async``. 
 
+
+.. _where_to_put_devices:
+
 Where to put devices
 --------------------
 
@@ -19,7 +22,11 @@ should think about where to place them in the following order:
    complex device (e.g. multiple files) it should have a folder of its own e.g. ``oav``
 #. A device that is very specific to a particular beamline should go in the ``devices/ixx`` folder
 
-This is in an effort to avoid duplication across facilities/beamlines. 
+This is in an effort to avoid duplication across facilities/beamlines. You should also consider whether it is best for a piece of logic is better suited to the control system or a bluesky plan - see `ophyd-async's guide <https://blueskyproject.io/ophyd-async/main/explanations/where-device-logic.html>`_ on that.
+
+Determining where in dodal a device should live can be summarised below:
+
+.. image:: ../assets/where-to-put-dodal-logic.png
 
 Device Best Practices
 ----------------------------
@@ -27,10 +34,33 @@ Device Best Practices
 Ophyd-async directory contains a flowchart_ for a simplified decision tree about what interfaces
 should a given device implement. In addition to this the following guidelines are strongly recommended:
 
+#. Device should have their name as an optional str parameter with a default of ""- this allows ophyd-async to automatically name the device
 #. Devices should contain only the PV suffixes that are generic for any instance of the device. See `PV Suffixes`_
 #. Anything in a device that is expected to be set externally should be a signal. See `Use of signals`_
 #. Devices should not hold state, when they are read they should read the hardware. See `Holding State`_
 
+Defaulting Names
+----------------
+
+Device should provide the ability to override their name while maintaining a default name of ""-
+this allows the device to be named on connection from the name of its factory function when using
+the device_factory decorator.
+
+When a device is named in this way, all of its child devices are named appropriately.
+
+.. code-block:: python
+    class MyDevice(Device):
+        def __init__(self, prefix: str, name: str = "")
+            x = Motor(prefix + "X")
+            super().__init__(name)
+
+    @device_factory()
+    def foo() -> MyDevice:
+        return MyDevice("FOO:")
+
+    f = foo()
+    f.name == "foo"
+    f.x.name == "foo-x"
 
 PV Suffixes
 -----------
@@ -40,23 +70,22 @@ In general devices should contain only the PV suffixes that are generic for any
 .. code-block:: python
 
     class MyDevice(Device):
-        def __init__(self, name: str, prefix: str)
+        def __init__(self, prefix: str, name: str = "")
             self.bragg = Motor(prefix + "BRAGG")
-            super().__init__(name)        
-    
-    device_instantiation(MyDevice, "dcm", "-MO-DCM-01:")
+            super().__init__(name)  
 
+    MyDevice("BLXXI-MO-DCM-01:")      
 
 is preferred over
 
 .. code-block:: python
 
     class MyDevice(Device):
-        def __init__(self, name: str, prefix: str)
+        def __init__(self, prefix: str, name: str = "")
             self.bragg = Motor(prefix + "-MO-DCM-01:BRAGG")
             super().__init__(name)        
 
-    device_instantiation(MyDevice, "dcm", "")
+    MyDevice("BLXXI")
 
 This is so that a new device on say ``-MO-DCM-02`` can be easily created.
 

{dls_dodal-1.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.53.0
+Version: 1.55.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.53.0 → dls_dodal-1.55.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 .copier-answers.yml
 .gitignore
 .pre-commit-config.yaml
+.talismanrc
 Dockerfile
 LICENSE
 README.md
@@ -39,6 +40,7 @@ docs/tutorials.md
 docs/_templates/custom-module-template.rst
 docs/_templates/autosummary/class.rst
 docs/_templates/autosummary/module.rst
+docs/assets/where-to-put-dodal-logic.png
 docs/assets/zocalo.png
 docs/explanations/decisions.md
 docs/explanations/reviews.md
@@ -90,6 +92,7 @@ src/dodal/log.py
 src/dodal/utils.py
 src/dodal/beamline_specific_utils/__init__.py
 src/dodal/beamline_specific_utils/i03.py
+src/dodal/beamline_specific_utils/i05_shared.py
 src/dodal/beamlines/README.md
 src/dodal/beamlines/__init__.py
 src/dodal/beamlines/adsim.py
@@ -103,6 +106,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
@@ -175,6 +180,7 @@ src/dodal/devices/undulator.py
 src/dodal/devices/watsonmarlow323_pump.py
 src/dodal/devices/webcam.py
 src/dodal/devices/xbpm_feedback.py
+src/dodal/devices/aithre_lasershaping/__init__.py
 src/dodal/devices/aithre_lasershaping/goniometer.py
 src/dodal/devices/aithre_lasershaping/laser_robot.py
 src/dodal/devices/areadetector/plugins/CAM.py
@@ -185,6 +191,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 +216,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 +234,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
@@ -346,7 +356,6 @@ tests/common/test_visit.py
 tests/common/beamlines/__init__.py
 tests/common/beamlines/test_beamline_parameters.py
 tests/common/beamlines/test_beamline_utils.py
-tests/common/beamlines/test_device_helpers.py
 tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
 tests/devices/test_common_dcm.py
@@ -417,6 +426,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 +439,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.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.0}/src/dodal/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.53.0'
-__version_tuple__ = version_tuple = (1, 53, 0)
+__version__ = version = '1.55.0'
+__version_tuple__ = version_tuple = (1, 55, 0)
+
+__commit_id__ = commit_id = 'g9d6ec5bbb'

dls_dodal-1.55.0/src/dodal/beamline_specific_utils/i05_shared.py

@@ -0,0 +1,11 @@
+from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.devices.i05.enums import Grating
+from dodal.devices.pgm import PGM
+from dodal.utils import BeamlinePrefix
+
+PREFIX = BeamlinePrefix("i05", "I")
+
+
+@device_factory()
+def pgm() -> PGM:
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)

{dls_dodal-1.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.0}/src/dodal/beamlines/aithre.py

@@ -12,12 +12,12 @@ PREFIX = "LA18L"
 
 @device_factory()
 def goniometer() -> Goniometer:
-    return Goniometer(f"{PREFIX}-MO-LSR-01:", "goniometer")
+    return Goniometer(f"{PREFIX}-MO-LSR-01:")
 
 
 @device_factory()
 def robot() -> LaserRobot:
-    return LaserRobot("robot", f"{PREFIX}-MO-ROBOT-01:")
+    return LaserRobot(f"{PREFIX}-MO-ROBOT-01:")
 
 
 @device_factory()
@@ -25,6 +25,5 @@ def oav(params: OAVConfigBeamCentre | None = None) -> OAVBeamCentreFile:
     return OAVBeamCentreFile(
         prefix=f"{PREFIX}-DI-OAV-01:",
         config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
-        name="oav",
         zoom_controller=NullZoomController(),
     )

{dls_dodal-1.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.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.53.0 → dls_dodal-1.55.0}/src/dodal/beamlines/b16.py

@@ -62,7 +62,6 @@ def fds2() -> AreaDetector:
 def sim_stage() -> XYZStage:
     return XYZStage(
         f"{PREFIX.beamline_prefix}-MO-SIM-01:",
-        "sim_stage",
         x_infix="M1",
         y_infix="M2",
         z_infix="M3",

{dls_dodal-1.53.0 → dls_dodal-1.55.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,
     )
 
 
@@ -116,8 +116,6 @@ def slits_7() -> Slits:
         prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-07:",
         x_gap="X:GAP",
         y_gap="Y:GAP",
-        x_centre="X:CENTRE",
-        y_centre="Y:CENTRE",
     )