dls-dodal 1.65.0__tar.gz → 1.66.0__tar.gz

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/.github/workflows/_dist.yml

@@ -7,7 +7,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -18,7 +18,7 @@ jobs:
           pipx run build
 
       - name: Upload sdist and wheel as artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: dist
           path: dist

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/.github/workflows/_docs.yml

@@ -12,7 +12,7 @@ jobs:
         run: sleep 60
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -30,7 +30,7 @@ jobs:
         run: rm build/html/.doctrees/environment.pickle
 
       - name: Upload built docs artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: docs
           path: build

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/.github/workflows/_pypi.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Download dist artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: dist
           path: dist

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/.github/workflows/_release.yml

@@ -7,7 +7,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           merge-multiple: true
 
@@ -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@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/.github/workflows/_test.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -38,7 +38,7 @@ jobs:
 
       - if: inputs.python-version == 'dev'
         name: Upload dev-requirements.txt
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: dev-requirements
           path: /tmp/dev-requirements.txt
@@ -58,13 +58,13 @@ jobs:
           python .github/scripts/check_test_durations.py unit-report.json 1
 
       - name: Checkout simulated devices
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: epics-containers/example-services
           path: example-services
 
       - name: Run docker compose
-        uses: hoverkraft-tech/compose-action@v2.3.0
+        uses: hoverkraft-tech/compose-action@v2.4.1
         with:
           compose-file: "./example-services/compose.yaml"
           services: |

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/.github/workflows/_tox.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.65.0
+Version: 1.66.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 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
@@ -215,10 +215,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.5
+Requires-Dist: ophyd-async[ca,pva]>=v0.14.0
 Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
-Requires-Dist: dataclasses-json
 Requires-Dist: pillow
 Requires-Dist: zocalo>=1.0.0
 Requires-Dist: requests
@@ -240,7 +239,7 @@ Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: ispyb; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: ophyd_async[sim]; extra == "dev"
+Requires-Dist: ophyd_async[sim]>=v0.14.0; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

dls_dodal-1.66.0/docs/how-to/tidy-docs.md

@@ -0,0 +1,35 @@
+Tidying the dodal docs
+======================
+
+The dodal documentation gradually accumulates a quantity of "ghost" files in the
+`main` folder of the `gh-pages` branch that are not deleted, due to operation of 
+the `gh-pages` github action to support multiple versions of the documentation.
+
+To remedy this, create a separate workspace using `git worktree` and prune the excess pages by doing the following (replace 1.62.0 with whatever the most recent version is):
+
+```
+git worktree add ../gh-pages --checkout gh-pages
+cd ../gh-pages
+diff -rq 1.62.0 main | grep "Only in main" > diff.txt
+
+```
+
+In your favourite editor, find and replace the output in diff.txt with the following regex
+
+`Only in (main[^:] *): (.*)` replace with `$1/$2`
+
+then after saving it
+
+```commandline
+for f in `cat diff.txt`; do rm -r $f; done
+git add -u main
+git status # Check the files over to make sure this is what you expect
+git commit --no-verify
+git push
+```
+
+Once pushed, GitHub CI should automatically run and push the pages to github docs.
+
+In order to avoid potentially removing some files due to differences between main and the 
+last release, ideally do this just after a fresh release). Although any files thus missing 
+should reappear after then next PR merge.

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/docs/how-to/write-tests.md

@@ -7,7 +7,7 @@ Testing is essential to maintain the integrity and reliability of the codebase.
 - **Unit Tests**: Place unit tests for individual components in the `tests` directory, but take care to mirror the file structure of the `src` folder with the corresponding code files. Use the `test_*.py` naming convention for test files.
 - **System Tests**: Tests that interact with DLS infrastructure, network, and filesystem should be placed in the top-level `systems_test` folder. This separation ensures that these tests are easily identifiable and can be run independently from unit tests.
 
-Useful functions for testing that can be reused across multiple tests for common devices and for external plan repositories belong in the `dodal/testing` directory. For example, when mocking a `Motor` device, all of the signals will default to zero, which will cause errors when trying to move. The `patch_motor` and `patch_all_motors` functions, found in `dodal.testing`, will populate the mocked motor with useful default values for the signals so that it can still be used in tests.
+Useful functions for testing that can be reused across multiple tests for common devices and for external plan repositories belong in the `dodal/testing` directory.
 
 
 ## Writing a test for a device

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/pyproject.toml

@@ -14,10 +14,9 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async[ca,pva]>=0.13.5",
+    "ophyd-async[ca,pva]>=v0.14.0",
     "bluesky>=1.14.5",
     "pyepics",
-    "dataclasses-json",
     "pillow",
     "zocalo>=1.0.0",
     "requests",
@@ -49,7 +48,7 @@ dev = [
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
     "myst-parser",
-    "ophyd_async[sim]",
+    "ophyd_async[sim]>=v0.14.0",
     "pipdeptree",
     "pre-commit",
     "psutil",

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.65.0
+Version: 1.66.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 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
@@ -215,10 +215,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.5
+Requires-Dist: ophyd-async[ca,pva]>=v0.14.0
 Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
-Requires-Dist: dataclasses-json
 Requires-Dist: pillow
 Requires-Dist: zocalo>=1.0.0
 Requires-Dist: requests
@@ -240,7 +239,7 @@ Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: ispyb; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
-Requires-Dist: ophyd_async[sim]; extra == "dev"
+Requires-Dist: ophyd_async[sim]>=v0.14.0; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ docs/how-to/move-code.md
 docs/how-to/pypi.md
 docs/how-to/run-tests.md
 docs/how-to/static-analysis.md
+docs/how-to/tidy-docs.md
 docs/how-to/update-template.md
 docs/how-to/write-tests.md
 docs/how-to/zocalo.md
@@ -91,7 +92,6 @@ src/dodal/cli.py
 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
@@ -109,6 +109,7 @@ src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
 src/dodal/beamlines/i05.py
 src/dodal/beamlines/i05_1.py
+src/dodal/beamlines/i06.py
 src/dodal/beamlines/i07.py
 src/dodal/beamlines/i09.py
 src/dodal/beamlines/i09_1.py
@@ -215,6 +216,8 @@ 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
+src/dodal/devices/beamsize/__init__.py
+src/dodal/devices/beamsize/beamsize.py
 src/dodal/devices/current_amplifiers/__init__.py
 src/dodal/devices/current_amplifiers/current_amplifier.py
 src/dodal/devices/current_amplifiers/current_amplifier_detector.py
@@ -253,9 +256,12 @@ src/dodal/devices/i02_1/fast_grid_scan.py
 src/dodal/devices/i02_1/sample_motors.py
 src/dodal/devices/i02_2/__init__.py
 src/dodal/devices/i03/__init__.py
+src/dodal/devices/i03/beamsize.py
+src/dodal/devices/i03/constants.py
 src/dodal/devices/i03/dcm.py
 src/dodal/devices/i03/undulator_dcm.py
 src/dodal/devices/i04/__init__.py
+src/dodal/devices/i04/beamsize.py
 src/dodal/devices/i04/constants.py
 src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
@@ -263,6 +269,7 @@ src/dodal/devices/i05/__init__.py
 src/dodal/devices/i05/enums.py
 src/dodal/devices/i07/__init__.py
 src/dodal/devices/i07/dcm.py
+src/dodal/devices/i07/id.py
 src/dodal/devices/i09/__init__.py
 src/dodal/devices/i09/enums.py
 src/dodal/devices/i09_1/__init__.py
@@ -358,6 +365,7 @@ src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
 src/dodal/devices/util/lookup_tables.py
+src/dodal/devices/util/lookup_tables_apple2.py
 src/dodal/devices/xspress3/__init__.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
@@ -379,14 +387,13 @@ src/dodal/plan_stubs/wrapped.py
 src/dodal/plans/__init__.py
 src/dodal/plans/bimorph.py
 src/dodal/plans/configure_arm_trigger_and_disarm_detector.py
+src/dodal/plans/load_panda_yaml.py
 src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
 src/dodal/plans/verify_undulator_gap.py
 src/dodal/plans/wrapped.py
 src/dodal/plans/preprocessors/__init__.py
 src/dodal/plans/preprocessors/verify_undulator_gap.py
-src/dodal/testing/__init__.py
-src/dodal/testing/setup.py
 src/dodal/testing/electron_analyser/__init__.py
 src/dodal/testing/electron_analyser/device_factory.py
 src/dodal/testing/fixtures/__init__.py
@@ -428,6 +435,7 @@ tests/common/beamlines/test_beamline_utils.py
 tests/common/beamlines/test_commissioning_mode.py
 tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
+tests/devices/conftest.py
 tests/devices/test_aperture.py
 tests/devices/test_aperture_scatterguard.py
 tests/devices/test_apple2_undulator.py
@@ -507,13 +515,18 @@ tests/devices/electron_analyser/vgscienta/test_region.py
 tests/devices/i02_1/__init__.py
 tests/devices/i02_1/test_fast_grid_scan.py
 tests/devices/i03/__init__.py
+tests/devices/i03/test_beamsize.py
 tests/devices/i03/test_dcm.py
 tests/devices/i03/test_undulator_dcm.py
 tests/devices/i04/__init__.py
+tests/devices/i04/conftest.py
+tests/devices/i04/test_beamsize.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
+tests/devices/i07/IIDCalibrationTable.txt
 tests/devices/i07/__init__.py
 tests/devices/i07/test_dcm.py
+tests/devices/i07/test_id.py
 tests/devices/i09/__init__.py
 tests/devices/i09_1/__init__.py
 tests/devices/i09_1_shared/__init__.py
@@ -525,10 +538,10 @@ tests/devices/i10/test_i10_apple2.py
 tests/devices/i10/test_data/IDEnergy2GapCalibrations.csv
 tests/devices/i10/test_data/IDEnergy2PhaseCalibrations.csv
 tests/devices/i10/test_data/__init__.py
-tests/devices/i10/test_data/expectedIDEnergy2GapCalibrationsIdd.pkl
-tests/devices/i10/test_data/expectedIDEnergy2GapCalibrationsIdu.pkl
-tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidd.pkl
-tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidu.pkl
+tests/devices/i10/test_data/expectedIDEnergy2GapCalibrationsIdd.json
+tests/devices/i10/test_data/expectedIDEnergy2GapCalibrationsIdu.json
+tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidd.json
+tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidu.json
 tests/devices/i11/__init__.py
 tests/devices/i11/test_i11devices.py
 tests/devices/i11/test_mythen.py
@@ -594,8 +607,8 @@ tests/devices/test_data/test_beamline_undulator_to_gap_lookup_table.txt
 tests/devices/test_data/test_lookup_table.txt
 tests/devices/util/__init__.py
 tests/devices/util/test_adjuster_plans.py
-tests/devices/util/test_beamline_specific_utils.py
 tests/devices/util/test_lookup_tables.py
+tests/devices/util/test_lookup_tables_apple2.py
 tests/devices/util/test_data/__init__.py
 tests/devices/util/test_data/test_beamline_dcm_roll_converter.txt
 tests/devices/util/test_data/test_beamline_dcm_roll_converter_non_monotonic.txt
@@ -617,6 +630,7 @@ tests/plans/conftest.py
 tests/plans/test_bimorph.py
 tests/plans/test_compliance.py
 tests/plans/test_configure_arm_trigger_and_disarm_detector.py
+tests/plans/test_load_panda_yaml.py
 tests/plans/test_save_panda.py
 tests/plans/test_scanspec.py
 tests/plans/test_verify_undulator_gap_plan.py

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,9 +1,8 @@
 click
 ophyd
-ophyd-async[ca,pva]>=0.13.5
+ophyd-async[ca,pva]>=v0.14.0
 bluesky>=1.14.5
 pyepics
-dataclasses-json
 pillow
 zocalo>=1.0.0
 requests
@@ -26,7 +25,7 @@ import-linter
 ispyb
 mypy
 myst-parser
-ophyd_async[sim]
+ophyd_async[sim]>=v0.14.0
 pipdeptree
 pre-commit
 psutil

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.65.0'
-__version_tuple__ = version_tuple = (1, 65, 0)
+__version__ = version = '1.66.0'
+__version_tuple__ = version_tuple = (1, 66, 0)
 
-__commit_id__ = commit_id = 'g5fe631f29'
+__commit_id__ = commit_id = 'g400fe8430'

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/src/dodal/beamlines/aithre.py

@@ -7,12 +7,19 @@ from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 ZOOM_PARAMS_FILE = "/dls_sw/i23/software/aithre/aithre_oav.xml"
 DISPLAY_CONFIG = "/dls_sw/i23/software/aithre/aithre_display.configuration"
 
+
 PREFIX = "LA18L"
 
 
 @device_factory()
 def goniometer() -> Goniometer:
-    return Goniometer(f"{PREFIX}-MO-LSR-01:")
+    return Goniometer(
+        f"{PREFIX}-MO-LSR-01:",
+        y_infix="SAMPZ",
+        z_infix="SAMPY",
+        sampy_infix="Y",
+        sampz_infix="Z",
+    )
 
 
 @device_factory()
@@ -22,8 +29,20 @@ def robot() -> LaserRobot:
 
 @device_factory()
 def oav(params: OAVConfigBeamCentre | None = None) -> OAVBeamCentreFile:
+    config = (
+        params
+        if params is not None
+        else OAVConfigBeamCentre(
+            zoom_params_file=ZOOM_PARAMS_FILE, display_config_file=DISPLAY_CONFIG
+        )
+    )
     return OAVBeamCentreFile(
         prefix=f"{PREFIX}-DI-OAV-01:",
-        config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        config=config,
         zoom_controller=NullZoomController(),
+        mjpg_x_size_pv="ArraySize0_RBV",
+        mjpg_y_size_pv="ArraySize1_RBV",
+        x_direction=-1,
+        y_direction=-1,
+        z_direction=-1,
     )

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/src/dodal/beamlines/i03.py

@@ -31,8 +31,10 @@ from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i03 import Beamstop
+from dodal.devices.i03.beamsize import Beamsize
 from dodal.devices.i03.dcm import DCM
 from dodal.devices.i03.undulator_dcm import UndulatorDCM
+from dodal.devices.ipin import IPin
 from dodal.devices.motors import XYZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
@@ -44,7 +46,7 @@ from dodal.devices.scintillator import Scintillator
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 from dodal.devices.webcam import Webcam
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.xspress3.xspress3 import Xspress3
@@ -256,11 +258,11 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def undulator(daq_configuration_path: str | None = None) -> Undulator:
+def undulator(daq_configuration_path: str | None = None) -> UndulatorInKeV:
     """Get the i03 undulator device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
     """
-    return Undulator(
+    return UndulatorInKeV(
         f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
         # evaluate here not as parameter default to enable post-import mocking
         id_gap_lookup_table_path=f"{daq_configuration_path or DAQ_CONFIGURATION_PATH}/lookup/BeamLine_Undulator_toGap.txt",
@@ -456,3 +458,21 @@ def collimation_table() -> CollimationTable:
     If this is called when already instantiated in i03, it will return the existing object.
     """
     return CollimationTable(prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-01")
+
+
+@device_factory()
+def beamsize() -> Beamsize:
+    """Get the i03 beamsize device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i03, it will return the existing object.
+    """
+    return Beamsize(
+        aperture_scatterguard=aperture_scatterguard(),
+    )
+
+
+@device_factory()
+def ipin() -> IPin:
+    """Get the i03 ipin device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return IPin(f"{PREFIX.beamline_prefix}-EA-PIN-01:")

{dls_dodal-1.65.0 → dls_dodal-1.66.0}/src/dodal/beamlines/i04.py

@@ -20,6 +20,7 @@ from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import ZebraFastGridScanThreeD
 from dodal.devices.flux import Flux
 from dodal.devices.i03.dcm import DCM
+from dodal.devices.i04.beamsize import Beamsize
 from dodal.devices.i04.constants import RedisConstants
 from dodal.devices.i04.murko_results import MurkoResultsDevice
 from dodal.devices.i04.transfocator import Transfocator
@@ -36,7 +37,7 @@ from dodal.devices.scintillator import Scintillator
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
@@ -228,11 +229,11 @@ def s4_slit_gaps() -> S4SlitGaps:
 
 
 @device_factory()
-def undulator() -> Undulator:
+def undulator() -> UndulatorInKeV:
     """Get the i04 undulator device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return Undulator(
+    return UndulatorInKeV(
         prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         id_gap_lookup_table_path="/dls_sw/i04/software/daq_configuration/lookup/BeamLine_Undulator_toGap.txt",
     )
@@ -281,6 +282,7 @@ def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         config=params or OAVConfig(ZOOM_PARAMS_FILE),
         overlay_channel=3,
+        mjpeg_prefix="XTAL",
     )
 
 
@@ -320,6 +322,8 @@ def oav_to_redis_forwarder() -> OAVToRedisForwarder:
     """
     return OAVToRedisForwarder(
         f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        oav_roi=oav(),
+        oav_fs=oav_full_screen(),
         redis_host=RedisConstants.REDIS_HOST,
         redis_password=RedisConstants.REDIS_PASSWORD,
         redis_db=RedisConstants.MURKO_REDIS_DB,
@@ -374,3 +378,14 @@ def scintillator() -> Scintillator:
         Reference(aperture_scatterguard()),
         get_beamline_parameters(),
     )
+
+
+@device_factory()
+def beamsize() -> Beamsize:
+    """Get the i04 beamsize device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return Beamsize(
+        transfocator=transfocator(),
+        aperture_scatterguard=aperture_scatterguard(),
+    )

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

@@ -0,0 +1,49 @@
+from dodal.beamline_specific_utils.i05_shared import pgm as i05_pgm
+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.apple2_undulator import (
+    Apple2,
+    UndulatorGap,
+    UndulatorLockedPhaseAxes,
+)
+from dodal.devices.pgm import PlaneGratingMonochromator
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i05")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def pgm() -> PlaneGratingMonochromator:
+    return i05_pgm()
+
+
+@device_factory()
+def id_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def id_phase() -> UndulatorLockedPhaseAxes:
+    return UndulatorLockedPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PL",
+        btm_inner="PU",
+    )
+
+
+@device_factory()
+def id() -> Apple2:
+    """i05 insertion device."""
+    return Apple2(id_gap=id_gap(), id_phase=id_phase())