dls-dodal 1.50.0__tar.gz → 1.51.0__tar.gz

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.copier-answers.yml

@@ -1,6 +1,6 @@
 # Changes here will be overwritten by Copier
-_commit: 2.5.0
-_src_path: gh:DiamondLightSource/python-copier-template
+_commit: 4.0.1
+_src_path: https://github.com/DiamondLightSource/python-copier-template
 author_email: dominic.oram@diamond.ac.uk
 author_name: Dominic Oram
 component_lifecycle: production
@@ -15,4 +15,5 @@ github_org: DiamondLightSource
 package_name: dodal
 pypi: true
 repo_name: dodal
+strict_typing: false
 type_checker: pyright

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.devcontainer/devcontainer.json

@@ -28,11 +28,11 @@
         }
     },
     "features": {
-        // Some default things like git config
-        "ghcr.io/devcontainers/features/common-utils:2": {
-            "upgradePackages": false
-        }
+        // add in eternal history and other bash features
+        "ghcr.io/diamondlightsource/devcontainer-features/bash-config:1": {}
     },
+    // Create the config folder for the bash-config feature
+    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/bash-config",
     "runArgs": [
         // Allow the container to access the host X11 display and EPICS CA
         "--net=host",

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.github/CONTRIBUTING.md

@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
 
 This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
 
-For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/2.5.0/how-to.html).
+For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/4.0.1/how-to.html).

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.github/actions/install_requirements/action.yml

@@ -15,7 +15,8 @@ runs:
       run: |
         PYTHON_VERSION="${{ inputs.python-version }}"
         if [ $PYTHON_VERSION == "dev" ]; then
-          PYTHON_VERSION=$(sed -n "s/ARG PYTHON_VERSION=//p" Dockerfile)
+          # python version from Dockerfile, removing potential pinned sha
+          PYTHON_VERSION=$(sed -Ene "s/ARG PYTHON_VERSION=([0-9\.]+).*/\1/p" Dockerfile)
         fi
         echo "PYTHON_VERSION=$PYTHON_VERSION" >> "$GITHUB_ENV"
       shell: bash

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.github/dependabot.yml

@@ -13,6 +13,8 @@ updates:
       actions:
         patterns:
           - "*"
+    commit-message:
+      prefix: "chore"
 
   - package-ecosystem: "pip"
     directory: "/"
@@ -22,3 +24,5 @@ updates:
       dev-dependencies:
         patterns:
           - "*"
+    commit-message:
+      prefix: "chore"

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.github/workflows/_docs.yml

@@ -1,6 +1,7 @@
 on:
   workflow_call:
 
+
 jobs:
   build:
     runs-on: ubuntu-latest

{dls_dodal-1.50.0 → dls_dodal-1.51.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@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
+        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.github/workflows/_test.yml

@@ -80,7 +80,7 @@ jobs:
           python .github/scripts/check_test_durations.py system-report.json 5
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
           files: ./unit_cov.xml,./system_cov.xml

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.github/workflows/ci.yml

@@ -2,26 +2,24 @@ name: CI
 
 on:
   push:
+    branches:
+      - main
+    tags:
+      - '*'
   pull_request:
 
 jobs:
-  check:
-    uses: ./.github/workflows/_check.yml
 
   lint:
-    needs: check
-    if: needs.check.outputs.branch-pr == ''
     uses: ./.github/workflows/_tox.yml
     with:
       tox: pre-commit,type-checking
 
   test:
-    needs: check
-    if: needs.check.outputs.branch-pr == ''
     strategy:
       matrix:
         runs-on: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12"]
         include:
           # Include one that runs in the dev environment
           - runs-on: "ubuntu-latest"
@@ -35,25 +33,22 @@ jobs:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   docs:
-    needs: check
-    if: needs.check.outputs.branch-pr == ''
     uses: ./.github/workflows/_docs.yml
 
+
   dist:
-    needs: check
-    if: needs.check.outputs.branch-pr == ''
     uses: ./.github/workflows/_dist.yml
 
   pypi:
+    needs: [dist, test]
     if: github.ref_type == 'tag'
-    needs: dist
     uses: ./.github/workflows/_pypi.yml
     permissions:
       id-token: write
 
   release:
+    needs: [dist, test, docs]
     if: github.ref_type == 'tag'
-    needs: [dist, docs]
     uses: ./.github/workflows/_release.yml
     permissions:
       contents: write

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-yaml
@@ -12,7 +12,7 @@ repos:
       - id: ruff
         name: lint with ruff
         language: system
-        entry: ruff check --force-exclude
+        entry: ruff check --force-exclude --fix
         types: [python]
         require_serial: true
 

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/.vscode/launch.json

@@ -16,8 +16,6 @@
             "console": "integratedTerminal",
             "preLaunchTask": "load_dials_env",
             "env": {
-                // Enable break on exception when debugging tests (see: tests/conftest.py)
-                "PYTEST_RAISE": "1",
                 "PYTEST_ADDOPTS": "--no-cov -vv"
             },
         }

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.50.0
+Version: 1.51.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -208,10 +208,9 @@ License:                                  Apache License
 Project-URL: GitHub, https://github.com/DiamondLightSource/dodal
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
@@ -232,9 +231,9 @@ Requires-Dist: numpy
 Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
-Requires-Dist: deepdiff
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: event-model>=1.23
+Requires-Dist: pyzmq==26.3.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/conftest.py

@@ -1,12 +1,10 @@
 import asyncio
 import logging
-import os
 import sys
 import time
 from collections.abc import Mapping
 from os import environ
 from pathlib import Path
-from typing import Any
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -63,24 +61,6 @@ def patch_open_to_prevent_dls_reads_in_tests():
         yield []
 
 
-# Prevent pytest from catching exceptions when debugging in vscode so that break on
-# exception works correctly (see: https://github.com/pytest-dev/pytest/issues/7409)
-if os.getenv("PYTEST_RAISE", "0") == "1":
-
-    @pytest.hookimpl(tryfirst=True)
-    def pytest_exception_interact(call: pytest.CallInfo[Any]):
-        if call.excinfo is not None:
-            raise call.excinfo.value
-        else:
-            raise RuntimeError(
-                f"{call} has no exception data, an unknown error has occurred"
-            )
-
-    @pytest.hookimpl(tryfirst=True)
-    def pytest_internalerror(excinfo: pytest.ExceptionInfo[Any]):
-        raise excinfo.value
-
-
 def pytest_runtest_setup(item):
     beamline_utils.clear_devices()
     if LOGGER.handlers == []:

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/docs/how-to/create-device.md

@@ -8,6 +8,10 @@ Reusing an existing class
 
 When creating a new device, first check if there is a device class that claims to support the device: e.g. all EPICS Motor records should use the [Motor](https://github.com/bluesky/ophyd-async/blob/main/src/ophyd_async/epics/motor.py) type; for reading or monitoring signals from the storage ring the [Synchrotron](https://github.com/DiamondLightSource/dodal/blob/main/src/dodal/devices/synchrotron.py) device should be used; AreaDetectors should use the [StandardDetector](https://github.com/bluesky/ophyd-async/blob/main/src/ophyd_async/core/_detector.py) type- of which there are examples in ophyd_async and in dodal.
 
+The module `dodal.devices.motors` defines a series of `Stage`s or groups of motors- a `Stage` represents a physical relationship between motors. For example, an `XYStage` is two perpendicular motors and should not be used for two motors that run parallel to each other (e.g. a coarse motor and a fine adjustment motor in the same axis) or that are unrelated (e.g. attached to different stages with no common frame of reference). Already defined are some relationships with linear and rotational stages. Any device that is a groups of motors only should be additionally defined there, if possible making re-use of the existing classes. Classes that define physical stages but also define additional signals may then extend the `Stage` class outside of the `motors` module for additional behaviour.
+
+Device classes that take a list of devices of a type may make use of the ophyd-async `DeviceVector`, and those that use other collections (e.g. a dict of Motors) to set attributes on themselves at runtime should be avoided- these device classes may appear tempting for their genericness and extensibility, but they will be a hindrance when trying to write plans. When writing plans, the device class is all that is available to the IDE, not the instance that you "just know" has specific fields. Making use of type checking and hints should make writing plans and debugging them a much less frustrating experience, while also enabling discoverability of the devices that are in use.
+
 If there is a compatible device class it should be used- adding it to the [the beamline](./create-beamline.rst)- this prevents reimplementing the device, and allows improvements to be shared. Improving the device to meet your use case is better than starting again.
 
 If a device class is incompatible due to differences in PV address only, first request that an alias is added to the EPICS support module for the IOC - or request support in making that change. Only if it is not possible to add an alias, for example the support module is proprietary, add configurability to the dodal device class, taking care not to break existing devices- e.g. make new fields have a default that matches the existing pattern, and ensure that `dodal connect` is still able to connect to the device for the existing instances.

dls_dodal-1.51.0/docs/how-to/run-tests.md

@@ -0,0 +1,44 @@
+(using-pytest)=
+
+# Run the tests using pytest
+
+Testing is done with [pytest]. It will find functions in the project that [look like tests][look like tests], and run them to check for errors. You can run it with:
+
+```
+$ pytest
+```
+
+When you have some fully working tests then you can run it with coverage:
+
+```
+$ tox -e tests
+```
+
+It will also report coverage to the commandline and to `cov.xml`.
+
+[look like tests]: https://docs.pytest.org/explanation/goodpractices.html#test-discovery
+[pytest]: https://pytest.org/
+
+# Run the system tests locally
+
+The system tests require the ``example-services`` project:
+
+```commandline
+git clone git@github.com:epics-containers/example-services.git
+```
+
+Then you need to launch some of the example ioc containers. Please note, this requires docker-compose not 
+podman-compose:
+
+```commandline
+module load docker-compose
+cd example-services
+. ./environment.sh
+podman compose up -d bl01t-di-cam-01 bl01t-mo-sim-01 ca-gateway
+```
+
+Once this is done, then the system tests can be run:
+
+```commandline
+tox -e system-report
+```

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/docs/tutorials/installation.md

@@ -2,7 +2,7 @@
 
 ## Check your version of python
 
-You will need python 3.10 or later. You can check your version of python by
+You will need python 3.11 or later. You can check your version of python by
 typing into a terminal:
 
 ```

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/pyproject.toml

@@ -7,7 +7,6 @@ name = "dls-dodal"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
@@ -31,15 +30,15 @@ dependencies = [
     "aiofiles",
     "aiohttp",
     "redis",
-    "deepdiff",
     "scanspec>=0.7.3",
-    "event-model>=1.23",  # Until bluesky pins it https://github.com/DiamondLightSource/dodal/issues/1278
+    "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
 ]
 
 dynamic = ["version"]
 license.file = "LICENSE"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 [project.optional-dependencies]
 dev = [

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.50.0
+Version: 1.51.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -208,10 +208,9 @@ License:                                  Apache License
 Project-URL: GitHub, https://github.com/DiamondLightSource/dodal
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
@@ -232,9 +231,9 @@ Requires-Dist: numpy
 Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
-Requires-Dist: deepdiff
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: event-model>=1.23
+Requires-Dist: pyzmq==26.3.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -17,7 +17,6 @@ pyproject.toml
 .github/pages/index.html
 .github/pages/make_switcher.py
 .github/scripts/check_test_durations.py
-.github/workflows/_check.yml
 .github/workflows/_dist.yml
 .github/workflows/_docs.yml
 .github/workflows/_pypi.yml
@@ -100,11 +99,13 @@ src/dodal/beamlines/b07.py
 src/dodal/beamlines/b07_1.py
 src/dodal/beamlines/b16.py
 src/dodal/beamlines/b18.py
+src/dodal/beamlines/b21.py
 src/dodal/beamlines/i02_1.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
 src/dodal/beamlines/i09.py
 src/dodal/beamlines/i09_1.py
+src/dodal/beamlines/i09_2.py
 src/dodal/beamlines/i10.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i18.py
@@ -135,7 +136,6 @@ src/dodal/common/beamlines/beamline_utils.py
 src/dodal/common/beamlines/device_helpers.py
 src/dodal/devices/CTAB.py
 src/dodal/devices/__init__.py
-src/dodal/devices/adsim.py
 src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
 src/dodal/devices/apple2_undulator.py
@@ -162,7 +162,6 @@ src/dodal/devices/pressure_jump_cell.py
 src/dodal/devices/qbpm.py
 src/dodal/devices/robot.py
 src/dodal/devices/s4_slit_gaps.py
-src/dodal/devices/scatterguard.py
 src/dodal/devices/scintillator.py
 src/dodal/devices/slits.py
 src/dodal/devices/smargon.py
@@ -182,6 +181,10 @@ src/dodal/devices/areadetector/plugins/MJPG.py
 src/dodal/devices/attenuator/attenuator.py
 src/dodal/devices/attenuator/filter.py
 src/dodal/devices/attenuator/filter_selections.py
+src/dodal/devices/b07/__init__.py
+src/dodal/devices/b07/grating.py
+src/dodal/devices/b07_1/__init__.py
+src/dodal/devices/b07_1/grating.py
 src/dodal/devices/b16/__init__.py
 src/dodal/devices/b16/detector.py
 src/dodal/devices/current_amplifiers/__init__.py
@@ -222,6 +225,9 @@ 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/i09/__init__.py
+src/dodal/devices/i09/dcm.py
+src/dodal/devices/i09/grating.py
 src/dodal/devices/i10/__init__.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
@@ -236,8 +242,6 @@ src/dodal/devices/i13_1/merlin.py
 src/dodal/devices/i13_1/merlin_controller.py
 src/dodal/devices/i18/KBMirror.py
 src/dodal/devices/i18/diode.py
-src/dodal/devices/i18/table.py
-src/dodal/devices/i18/thor_labs_stage.py
 src/dodal/devices/i19/__init__.py
 src/dodal/devices/i19/beamstop.py
 src/dodal/devices/i19/blueapi_device.py
@@ -254,7 +258,6 @@ src/dodal/devices/i24/beamstop.py
 src/dodal/devices/i24/dcm.py
 src/dodal/devices/i24/dual_backlight.py
 src/dodal/devices/i24/focus_mirrors.py
-src/dodal/devices/i24/i24_detector_motion.py
 src/dodal/devices/i24/pilatus_metadata.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
@@ -272,11 +275,11 @@ src/dodal/devices/oav/snapshots/grid_overlay.py
 src/dodal/devices/oav/snapshots/snapshot.py
 src/dodal/devices/oav/snapshots/snapshot_image_processing.py
 src/dodal/devices/oav/snapshots/snapshot_with_grid.py
+src/dodal/devices/p60/__init__.py
+src/dodal/devices/p60/lab_xray_source.py
 src/dodal/devices/p99/__init__.py
 src/dodal/devices/p99/andor2_point.py
 src/dodal/devices/p99/sample_stage.py
-src/dodal/devices/training_rig/__init__.py
-src/dodal/devices/training_rig/sample_stage.py
 src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
@@ -344,6 +347,7 @@ tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
 tests/devices/test_common_dcm.py
 tests/devices/test_diamond_filter.py
+tests/devices/test_motors.py
 tests/devices/aithre_lasershaping/test_goniometer.py
 tests/devices/i03/__init__.py
 tests/devices/i04/__init__.py
@@ -358,8 +362,6 @@ tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidd.pkl
 tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidu.pkl
 tests/devices/i13_1/test_merlin.py
 tests/devices/i18/test_kb_mirror.py
-tests/devices/i18/test_table.py
-tests/devices/i18/test_thor_labs_stage.py
 tests/devices/i19/__init__.py
 tests/devices/i19/test_beamstop.py
 tests/devices/i19/test_shutter.py
@@ -368,7 +370,6 @@ tests/devices/i22/test_fswitch.py
 tests/devices/i22/test_metadataholder.py
 tests/devices/mx_phase1/__init__.py
 tests/devices/mx_phase1/test_beamstop.py
-tests/devices/training_rig/test_sample_stage.py
 tests/devices/unit_tests/__init__.py
 tests/devices/unit_tests/test_OAVCentring.json
 tests/devices/unit_tests/test_aperture.py
@@ -436,6 +437,8 @@ tests/devices/unit_tests/electron_analyser/vgscienta/test_region.py
 tests/devices/unit_tests/i03/__init__.py
 tests/devices/unit_tests/i03/test_dcm.py
 tests/devices/unit_tests/i03/test_undulator_dcm.py
+tests/devices/unit_tests/i09/__init__.py
+tests/devices/unit_tests/i09/test_dcm.py
 tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_focus_mirrors.py
@@ -453,6 +456,7 @@ tests/devices/unit_tests/oav/test_snapshot_image_processing.py
 tests/devices/unit_tests/oav/test_snapshots.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect_utils.py
+tests/devices/unit_tests/p60/test_lab_xray_source.py
 tests/devices/unit_tests/p99/test_p99_stage.py
 tests/devices/unit_tests/test_daq_configuration/domain/beamlineParameters
 tests/devices/unit_tests/test_daq_configuration/lookup/BeamLineEnergy_DCM_Pitch_converter.txt

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/src/dls_dodal.egg-info/requires.txt

@@ -16,9 +16,9 @@ numpy
 aiofiles
 aiohttp
 redis
-deepdiff
 scanspec>=0.7.3
 event-model>=1.23
+pyzmq==26.3.0
 
 [dev]
 black

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.50.0'
-__version_tuple__ = version_tuple = (1, 50, 0)
+__version__ = version = '1.51.0'
+__version_tuple__ = version_tuple = (1, 51, 0)

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/src/dodal/beamlines/adsim.py

@@ -10,7 +10,7 @@ from dodal.common.beamlines.beamline_utils import (
 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.adsim import SimStage
+from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
 
@@ -62,8 +62,10 @@ RE(count([d], num=10))
 
 
 @device_factory()
-def stage() -> SimStage:
-    return SimStage(f"{PREFIX.beamline_prefix}-MO-SIMC-01:")
+def stage() -> XThetaStage:
+    return XThetaStage(
+        f"{PREFIX.beamline_prefix}-MO-SIMC-01:", x_infix="M1", theta_infix="M2"
+    )
 
 
 @device_factory()

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/src/dodal/beamlines/b01_1.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.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
-from dodal.devices.motors import XYZPositioner
+from dodal.devices.motors import XYZStage
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -42,8 +42,13 @@ https://argocd.diamond.ac.uk/applications?showFavorites=false&proj=&sync=&autoSy
 
 @device_factory()
 def panda() -> HDFPanda:
+    """Provides triggering of the detectors.
+
+    Returns:
+        HDFPanda: The HDF5-based detector trigger device.
+    """
     return HDFPanda(
-        f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
+        f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
         path_provider=get_path_provider(),
     )
 
@@ -54,7 +59,16 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def manta() -> AravisDetector:
+def oav() -> AravisDetector:
+    """The Manta camera for the spectroscopy experiment.
+
+    Looks at the spectroscopy screen and visualises light
+    transmitted through the sample after it has gone through
+    the diffraction grating.
+
+    Returns:
+        AravisDetector: The spectroscopy camera device.
+    """
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-02:",
         path_provider=get_path_provider(),
@@ -64,7 +78,29 @@ def manta() -> AravisDetector:
 
 
 @device_factory()
-def sample_stage() -> XYZPositioner:
-    return XYZPositioner(
+def sample_det() -> AravisDetector:
+    """The Mako camera for the imaging experiment.
+
+    Looks at the on-axis viewing screen.
+
+    Returns:
+        AravisDetector: The imaging camera device.
+    """
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
+        path_provider=get_path_provider(),
+        drv_suffix=CAM_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+@device_factory()
+def sample_stage() -> XYZStage:
+    """An XYZ stage holding the sample.
+
+    Returns:
+        XYZStage: The XYZ sample stage device.
+    """
+    return XYZStage(
         f"{PREFIX.beamline_prefix}-MO-PPMAC-01:",
     )

{dls_dodal-1.50.0 → dls_dodal-1.51.0}/src/dodal/beamlines/b07.py

@@ -2,7 +2,9 @@ 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 B07BGrating
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
+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
@@ -18,6 +20,14 @@ def synchrotron() -> Synchrotron:
     return Synchrotron()
 
 
+@device_factory()
+def pgm() -> PGM:
+    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=B07BGrating)
+
+
 @device_factory()
 def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")
+    return SpecsAnalyserDriverIO(
+        f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
+        {"source1": pgm().energy.user_readback},
+    )