dls-dodal 1.56.0__py3-none-any.whl → 1.57.0__py3-none-any.whl

{dls_dodal-1.56.0.dist-info → dls_dodal-1.57.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.56.0
+Version: 1.57.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,7 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.0
+Requires-Dist: ophyd-async[ca,pva]>=0.13.2
 Requires-Dist: bluesky==1.14.2
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.56.0.dist-info → dls_dodal-1.57.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dls_dodal-1.56.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.57.0.dist-info/licenses/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
 dodal/__init__.py,sha256=Ksms_WJF8LTkbm38gEpm1jBpGqcQ8NGvmb2ZJlOE1j8,198
 dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=-Q-x6fbTDcv8A0qE6FFdxYCjVSPznhUJwbWxT9so9xg,706
+dodal/_version.py,sha256=UMWpFq_XEVs_RQua2c3vn_WoxKKPZqViS9Btwn1PIkY,706
 dodal/cli.py,sha256=yi8dXOp0hqzlg4ZZXCRGU-LpDa_ydaropDjyREWbZ5Y,4152
 dodal/log.py,sha256=Rt5O3hFZfMnJvQueZvgagQuXnPqHrFxhponOvVkpfrk,9871
 dodal/utils.py,sha256=abGitd4FLpLnmckF7lUqOKYUL88r5Ex_NGSVgO4gOf4,19305
@@ -29,14 +29,15 @@ dodal/beamlines/i09_2.py,sha256=lyYO1rOaIsXNuVOL39Psh-8jQjkhQBXEQMpbXa-Zcw0,713
 dodal/beamlines/i10.py,sha256=0rSWOlIihkDtq7ZZaJ5O2jkMBrteRYjl4Hhqe8EP1Yc,5697
 dodal/beamlines/i11.py,sha256=rjb5iARfbToNzeP-gewYljTu0f__V7bYj3JkJ5bWkGE,4349
 dodal/beamlines/i13_1.py,sha256=VYVqMN8-njy7YSI08gskRccT-K2paRC9edAx0ah-Cwo,1602
+dodal/beamlines/i17.py,sha256=Nickt8CKQ9JcQ1D_ulNICUT4jjLF1Aib7D9jblSnzA4,987
 dodal/beamlines/i18.py,sha256=FuU8G-q1piu6BRou-Shj3BQEbNtsF7CUsSIqqkvCKZc,3615
 dodal/beamlines/i19_1.py,sha256=tg3eALJTn9p686VFV7GjfUvChGS1mrh8-98uzjdLj_g,2934
 dodal/beamlines/i19_2.py,sha256=xSMS2Vhk_6V5WYyefVo1SWXbC4UUyaqru7JVK8VTg00,2554
 dodal/beamlines/i19_optics.py,sha256=8hdlDAAMgFrhcXrp5xCPZtLUlrDUEC9VwKnnuUAMbbU,1150
 dodal/beamlines/i20_1.py,sha256=Zsr1lsH7ySbOgK7RhMVMWzNWZAV-fuYW0iAjSEJZicY,2625
-dodal/beamlines/i22.py,sha256=VU5gz0q_K1D4zBHb88xnd1nAISAIBZOF6o8_YrGPGck,8103
+dodal/beamlines/i22.py,sha256=009Tk5cYyHfmm1DfIwR562WzomXRvyv_5chiBbPgQUs,8100
 dodal/beamlines/i23.py,sha256=ZXvPEiMA4mPbRTXOxvL1NcoVWDg4Deyl8k57cveDg90,3060
-dodal/beamlines/i24.py,sha256=f6SeNbMdxviurfTAnKps8S9NNbDpU7SFzr-J1_c0yn8,6833
+dodal/beamlines/i24.py,sha256=FvK7MqC_dX_alUFMEoS8L4HACThky9lQ7w7rwy0gXdA,6259
 dodal/beamlines/k11.py,sha256=sBOl-MLk7FMo10KFykuK5aLqH1zyW4FnI0XXmtQhUfg,978
 dodal/beamlines/p38.py,sha256=lxFGzmQhth0JhOFbTrZd9LEbUgvKmQdMtiHDW6UJgDs,5763
 dodal/beamlines/p45.py,sha256=tQ7EkWfr7o2okK7Prw1C7DNGYdKPU2ofqjm98wu_-G0,2158
@@ -90,15 +91,15 @@ dodal/devices/robot.py,sha256=k4Vkjpd3R-wXWf6YbYC1225sSdjvTrZS54v5v6Qy_EU,7003
 dodal/devices/s4_slit_gaps.py,sha256=4KdarIQoRqX4ry3LUS1Km7fkjUFahA0VuTd2DvYEqQ8,446
 dodal/devices/scintillator.py,sha256=JresF8SY_-t1raibzR4f0UoMXnFi-Abh3ywGm2DjhKs,3003
 dodal/devices/slits.py,sha256=b_7ku2sHlzhMHTvWrwiRwee6ufrbxNX9JB_Z0lvk15o,1105
-dodal/devices/smargon.py,sha256=TC1ye35mDT1gLlrjIe3CcGeE2vEb78Cu7f0DbzUQR8M,5813
+dodal/devices/smargon.py,sha256=48oOBOKlsvPhlUlK41ozXzCMUKMp3QkQx-pVqKL2Xts,6569
 dodal/devices/status.py,sha256=hVrJS1yooQo6PRumRACoIEh-SKBUKxvBlQl-MtLFUMQ,327
 dodal/devices/synchrotron.py,sha256=OHBrTrm4K39XE8BrE9b_Jn_ZfMRyDp9CHCwvmiV-KOc,1989
 dodal/devices/tetramm.py,sha256=qBu2ClXRM4RFO-y4C2pXVKsp5sX4VpOelbVHOAkkUHQ,8936
-dodal/devices/thawer.py,sha256=UtikbirSZZGjcbZEDWO33n5CIsd_dSvmohIS4R65xWg,1571
+dodal/devices/thawer.py,sha256=HexahKZ1rUxF9jBMeULruqYt6I7fsl6OgXkvcxPQY3M,1963
 dodal/devices/turbo_slit.py,sha256=xhcnhfbdcTYSYozogw6Li4fF4ofoPsc350rEyrRdaNE,1460
 dodal/devices/undulator.py,sha256=3IRn1iOF1PLOuIzaMpsNLVYx-rGvAnr-PG7C3YupW-w,5266
 dodal/devices/watsonmarlow323_pump.py,sha256=xNwjoxW3NJIDkeDWHfb0A8Yj95_KKRXMD9AghvX-WLk,1337
-dodal/devices/webcam.py,sha256=QUfOwblZr_xUGVqt5cMhTwfyQAL-jhSJ2ORQRNmZBrM,2436
+dodal/devices/webcam.py,sha256=UAx2KF0mKi6I-mJJUb5z56MHY-Wd89-tqyPcFbouQFg,2491
 dodal/devices/xbpm_feedback.py,sha256=Uv_jML9gkMT5OcpUrckzxDmsBmktEwV1lga6USxeRyY,1065
 dodal/devices/aithre_lasershaping/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/aithre_lasershaping/goniometer.py,sha256=-2ewYMcdzB1DqP9sMpr4L1i4KeTCrGAJfngAt9-eFWw,1005
@@ -192,12 +193,11 @@ dodal/devices/i22/fswitch.py,sha256=kpgegs4Wv_weBSzbrlXLXqXOOZdzTn3X9k5PlEN5F6c,
 dodal/devices/i22/nxsas.py,sha256=093GCM2H2LESt28RF-JfxEljJ8QzRPkL1ByXI2XVhoA,6012
 dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i24/aperture.py,sha256=dlH_g7OPTBc5QRMd-ADU3_GDTKh668kkMHo4k_JxUcY,770
-dodal/devices/i24/beam_center.py,sha256=m6LWsG9e_lhtPfZ8pc_hoLNyTYQQGGdRNav8J_2scTo,483
+dodal/devices/i24/beam_center.py,sha256=nQyOif6JtlU_qP7kZP-8wN1ldW81MIbFUykPC1bEm70,446
 dodal/devices/i24/beamstop.py,sha256=6tbiQLlcTlp4PCPhHJ_mlHtkv0kz5ArQ99zg9rwTnrw,1133
 dodal/devices/i24/dcm.py,sha256=l7qbJh2JKL-5ANlMYXDeU5EBYY6mDiLxn7kp_Z9KNaM,1206
 dodal/devices/i24/dual_backlight.py,sha256=N0R7M1mHPRmQ4fks5lGU1wrXjOvcW_ZKIXaRoC8aLDE,2084
 dodal/devices/i24/focus_mirrors.py,sha256=DYiYLpDw8FJ1LYHxLOxE_om5qGfUo2itzskgqhmQZlg,1763
-dodal/devices/i24/pilatus_metadata.py,sha256=I-AR8vd67qf6p0vZnRPTv4aNPN5T4KpSt2Iog4_jvn0,1781
 dodal/devices/i24/pmac.py,sha256=-HYf2HPzaqWvszp4T8TXohdp40-xmKqQq4V0mLvVri8,7028
 dodal/devices/i24/vgonio.py,sha256=sxSmcYZayVJPJz_D_91j9PmNor7Tbl1RGQFRrdtESlw,533
 dodal/devices/mx_phase1/beamstop.py,sha256=GeHLqHVf3XwJSszUHuxZ2JBwQlcDiFs6jVpdHuw7snM,3127
@@ -224,7 +224,6 @@ dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 dodal/devices/util/adjuster_plans.py,sha256=c40PFZpXFw0YmJLh9jU4VIb8vRxHyafZlmvprTKAOhM,824
 dodal/devices/util/epics_util.py,sha256=4useFL8ngsVF08fhOn48BlnO4oh0T4sEKqjdS6mjvG0,4687
 dodal/devices/util/lookup_tables.py,sha256=jH9f_D8JbTSqzL-RKHUWOORLt8lEoNQL3o9HpXE98TY,3476
-dodal/devices/util/test_utils.py,sha256=tnKKmSBaHEyx-qTQjoR3COqraRMmTdRJe9s-pWjuTPk,1176
 dodal/devices/xspress3/xspress3.py,sha256=OerapEy-IuK7EFz13B5z0BzBmESVl6pYUlqAWHIwJck,4555
 dodal/devices/xspress3/xspress3_channel.py,sha256=w8tAx2lz5kJ_LeJ_eb_4o--Dtt8MRijsYNgDG6oEIVg,1626
 dodal/devices/zebra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -250,11 +249,12 @@ dodal/plans/verify_undulator_gap.py,sha256=OcDN09-eCoMzsmhKGxvzsH5EapG2zYz0yGCqU
 dodal/plans/wrapped.py,sha256=BPMw__RcWvk9v5XnhMsi9_k4KsDEbmXogzD2n1ecbUg,2098
 dodal/plans/preprocessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/plans/preprocessors/verify_undulator_gap.py,sha256=cBZEGq8TW1jrXFXB00iClQVXSEaE_jP_rHMY9WTgYyY,1813
-dodal/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dodal/testing/__init__.py,sha256=AUYZKAvVOs7ZvxO1dVhL0pDTleRO34FQlO5MNe_cwgU,96
+dodal/testing/setup.py,sha256=8cQnrzE5MQD4Etf0eqMarmtr-opsUOMQww-k1V7DzIQ,2442
 dodal/testing/electron_analyser/__init__.py,sha256=-lc1opD2dCv0x678-J-ApOhHtvEvcslfOQ7E613U8-Y,118
 dodal/testing/electron_analyser/device_factory.py,sha256=tkMY6fW3iI02DTD1XXHi4lH6sjo8RHHZBGDHSuTdmNU,2243
-dls_dodal-1.56.0.dist-info/METADATA,sha256=NqXV5pD4dRmGxYRSjy-i--y0scKO6E0V14rJRehyguw,16928
-dls_dodal-1.56.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dls_dodal-1.56.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
-dls_dodal-1.56.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.56.0.dist-info/RECORD,,
+dls_dodal-1.57.0.dist-info/METADATA,sha256=8uZwtRMSABZLLYumDM2RDWn4zaE5IJ6N5H5zMk5Vz1w,16928
+dls_dodal-1.57.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dls_dodal-1.57.0.dist-info/entry_points.txt,sha256=bycw_EKUzup_rxfCetOwcauXV4kLln_OPpPT8jEnr-I,94
+dls_dodal-1.57.0.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.57.0.dist-info/RECORD,,

dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.56.0'
-__version_tuple__ = version_tuple = (1, 56, 0)
+__version__ = version = '1.57.0'
+__version_tuple__ = version_tuple = (1, 57, 0)
 
 __commit_id__ = commit_id = None

dodal/beamlines/i17.py

@@ -0,0 +1,37 @@
+"""The I17 hardware doesn't exist yet, but this configuration file is useful for
+creating plans in sm-bluesky as devices build up."""
+
+from ophyd_async.core import StrictEnum
+
+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.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("i17")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+class I17Grating(StrictEnum):
+    AU_400 = "400 line/mm Au"
+    SI_400 = "400 line/mm Si"
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory(skip=True)
+def pgm() -> PGM:
+    return PGM(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        grating=I17Grating,
+        gratingPv="NLINES2",
+    )

dodal/beamlines/i22.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adaravis import AravisDetector
-from ophyd_async.epics.adcore import NDPluginStatsIO
+from ophyd_async.epics.adcore import NDPluginBaseIO
 from ophyd_async.epics.adpilatus import PilatusDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
@@ -103,7 +103,7 @@ def i0() -> TetrammDetector:
         path_provider=get_path_provider(),
         type="Cividec Diamond XBPM",
         plugins={
-            "stats": NDPluginStatsIO(
+            "stats": NDPluginBaseIO(
                 prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:SumAll:"
             )
         },
@@ -117,7 +117,7 @@ def it() -> TetrammDetector:
         path_provider=get_path_provider(),
         type="PIN Diode",
         plugins={
-            "stats": NDPluginStatsIO(
+            "stats": NDPluginBaseIO(
                 prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:SumAll:"
             )
         },

dodal/beamlines/i24.py

@@ -11,7 +11,6 @@ from dodal.devices.i24.beamstop import Beamstop
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
-from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.i24.vgonio import VerticalGoniometer
 from dodal.devices.motors import YZStage
@@ -100,8 +99,8 @@ def dcm() -> DCM:
     If this is called when already instantiated in i24, it will return the existing object.
     """
     return DCM(
-        prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01",
-        motion_prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01",
+        prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01:",
+        motion_prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
     )
 
 
@@ -188,21 +187,3 @@ def eiger_beam_center() -> DetectorBeamCenter:
         f"{PREFIX.beamline_prefix}-EA-EIGER-01:CAM:",
         "eiger_bc",
     )
-
-
-@device_factory()
-def pilatus_beam_center() -> DetectorBeamCenter:
-    """A device for setting/reading the beamcenter from the pilatus on i24."""
-    return DetectorBeamCenter(
-        f"{PREFIX.beamline_prefix}-EA-PILAT-01:cam1:",
-        "pilatus_bc",
-    )
-
-
-@device_factory()
-def pilatus_metadata() -> PilatusMetadata:
-    """A small pilatus driver device for figuring out the filename template."""
-    return PilatusMetadata(
-        f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
-        "pilatus_meta",
-    )

dodal/devices/i24/beam_center.py

@@ -1,5 +1,4 @@
-"""A small temporary device to get the beam center positions from \
-    eiger or pilatus detector on i24"""
+"""A small temporary device to get the beam center positions on i24"""
 
 from ophyd_async.core import StandardReadable
 from ophyd_async.epics.core import epics_signal_rw

dodal/devices/smargon.py

@@ -3,7 +3,7 @@ from collections.abc import Collection, Generator
 from dataclasses import dataclass
 from enum import Enum
 from math import isclose
-from typing import NotRequired, TypedDict, cast
+from typing import TypedDict, cast
 
 from bluesky import plan_stubs as bps
 from bluesky.protocols import Movable
@@ -12,6 +12,7 @@ from ophyd_async.core import (
     AsyncStatus,
     Device,
     StrictEnum,
+    set_and_wait_for_value,
     wait_for_value,
 )
 from ophyd_async.epics.core import epics_signal_r, epics_signal_rw
@@ -104,15 +105,15 @@ class DeferMoves(StrictEnum):
     OFF = "Defer Off"
 
 
-class CombinedMove(TypedDict):
+class CombinedMove(TypedDict, total=False):
     """A move on multiple axes at once using a deferred move"""
 
-    x: NotRequired[float | None]
-    y: NotRequired[float | None]
-    z: NotRequired[float | None]
-    omega: NotRequired[float | None]
-    phi: NotRequired[float | None]
-    chi: NotRequired[float | None]
+    x: float | None
+    y: float | None
+    z: float | None
+    omega: float | None
+    phi: float | None
+    chi: float | None
 
 
 class Smargon(XYZStage, Movable):
@@ -123,6 +124,8 @@ class Smargon(XYZStage, Movable):
     Robot loading can nudge these and lead to errors.
     """
 
+    DEFERRED_MOVE_SET_TIMEOUT = 5
+
     def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.chi = Motor(prefix + "CHI")
@@ -161,15 +164,29 @@ class Smargon(XYZStage, Movable):
 
     @AsyncStatus.wrap
     async def set(self, value: CombinedMove):
+        """This will move all motion together in a deferred move.
+
+        Once defer_move is on, sets to any axis do not immediately move the axis. Instead
+        the setpoint will go to that value. Then, when defer_move is switched off all
+        axes will move at the same time. The put callbacks on the axes themselves will
+        only come back after the motion on that axis finished.
+        """
         await self.defer_move.set(DeferMoves.ON)
         try:
-            tasks = []
-            for k, v in value.items():
-                if v is not None:
-                    tasks.append(getattr(self, k).set(v))
+            finished_moving = []
+            for motor_name, new_setpoint in value.items():
+                if new_setpoint is not None and isinstance(new_setpoint, int | float):
+                    axis: Motor = getattr(self, motor_name)
+                    await axis.check_motor_limit(
+                        await axis.user_setpoint.get_value(), new_setpoint
+                    )
+                    put_completion = await set_and_wait_for_value(
+                        axis.user_setpoint,
+                        new_setpoint,
+                        timeout=self.DEFERRED_MOVE_SET_TIMEOUT,
+                        wait_for_set_completion=False,
+                    )
+                    finished_moving.append(put_completion)
         finally:
             await self.defer_move.set(DeferMoves.OFF)
-        # The set() coroutines will not complete until after defer moves has been
-        # switched back off so we cannot wait for them until this point.
-        # see https://github.com/DiamondLightSource/dodal/issues/1315
-        await asyncio.gather(*tasks)
+        await asyncio.gather(*finished_moving)

dodal/devices/thawer.py

@@ -1,4 +1,4 @@
-from asyncio import Task, create_task, sleep
+from asyncio import CancelledError, Task, create_task, sleep
 
 from bluesky.protocols import Movable, Stoppable
 from ophyd_async.core import (
@@ -11,6 +11,8 @@ from ophyd_async.core import (
 )
 from ophyd_async.epics.core import epics_signal_rw
 
+from dodal.log import LOGGER
+
 
 class ThawingException(Exception):
     pass
@@ -24,19 +26,29 @@ class ThawingTimer(Device, Stoppable, Movable[float]):
 
     @AsyncStatus.wrap
     async def set(self, value: float):
-        await self._control_signal_ref().set(OnOff.ON)
-        if self._thawing_task and not self._thawing_task.done():
-            raise ThawingException("Thawing task already in progress")
+        if self._thawing_task:
+            LOGGER.info("Thawing task already in progress, resetting timer")
+            self._thawing_task.cancel()
+        else:
+            LOGGER.info("Thawing started")
+            await self._control_signal_ref().set(OnOff.ON)
         self._thawing_task = create_task(sleep(value))
         try:
             await self._thawing_task
-        finally:
+        except CancelledError:
+            LOGGER.info("Timer task cancelled.")
+            raise
+        else:
+            LOGGER.info("Thawing completed")
             await self._control_signal_ref().set(OnOff.OFF)
 
     @AsyncStatus.wrap
     async def stop(self, *args, **kwargs):
         if self._thawing_task:
             self._thawing_task.cancel()
+            self._thawing_task = None
+        LOGGER.info("Thawer stopped.")
+        await self._control_signal_ref().set(OnOff.OFF)
 
 
 class Thawer(StandardReadable, Stoppable):

dodal/devices/webcam.py

@@ -51,6 +51,7 @@ class Webcam(StandardReadable, Triggerable):
                     )
                 try:
                     data = await response.read()
+                    Image.open(BytesIO(data)).verify()
                     LOGGER.info(f"Saving webcam image from {self.url} to {file_path}")
                 except Exception as e:
                     LOGGER.warning(

dodal/testing/__init__.py

@@ -0,0 +1,3 @@
+from .setup import patch_all_motors, patch_motor
+
+__all__ = ["patch_motor", "patch_all_motors"]

dodal/testing/setup.py

@@ -0,0 +1,67 @@
+from contextlib import ExitStack
+
+from ophyd_async.core import Device
+from ophyd_async.epics.motor import Motor
+from ophyd_async.testing import (
+    callback_on_mock_put,
+    set_mock_value,
+)
+
+
+def patch_motor(
+    motor: Motor,
+    initial_position: float = 0,
+    deadband: float = 0.001,
+    velocity: float = 3,
+    max_velocity: float = 5,
+    low_limit_travel: float = float("-inf"),
+    high_limit_travel: float = float("inf"),
+):
+    """
+    Patch a mock motor with sensible default values so that it can still be used in
+    tests and plans without running into errors as default values are zero.
+
+    Parameters:
+        motor: The mock motor to set mock values with.
+        initial_position: The default initial position of the motor to be set.
+        deadband: The tolerance between readback value and demand setpoint which the
+                  motor is considered at position.
+        velocity: Requested move speed when the mock motor moves.
+        max_velocity: The maximum allowable velocity that can be set for the motor.
+        low_limit_travel: The lower limit that the motor can move to.
+        high_limit_travel: The higher limit that the motor can move to.
+    """
+    set_mock_value(motor.user_setpoint, initial_position)
+    set_mock_value(motor.user_readback, initial_position)
+    set_mock_value(motor.deadband, deadband)
+    set_mock_value(motor.motor_done_move, 1)
+    set_mock_value(motor.velocity, velocity)
+    set_mock_value(motor.max_velocity, max_velocity)
+    set_mock_value(motor.low_limit_travel, low_limit_travel)
+    set_mock_value(motor.high_limit_travel, high_limit_travel)
+    return callback_on_mock_put(
+        motor.user_setpoint,
+        lambda pos, *args, **kwargs: set_mock_value(motor.user_readback, pos),
+    )
+
+
+def patch_all_motors(parent_device: Device):
+    """
+    Check all children of a device and patch any motors with mock values.
+
+    Parameters:
+        parent_device: The device that hold motor(s) as children.
+    """
+    motors = []
+
+    def recursively_find_motors(device: Device):
+        for _, child_device in device.children():
+            if isinstance(child_device, Motor):
+                motors.append(child_device)
+            recursively_find_motors(child_device)
+
+    recursively_find_motors(parent_device)
+    motor_patch_stack = ExitStack()
+    for motor in motors:
+        motor_patch_stack.enter_context(patch_motor(motor))
+    return motor_patch_stack

dodal/devices/i24/pilatus_metadata.py

@@ -1,44 +0,0 @@
-"""A small temporary device to set and read the filename template from the pilatus"""
-
-import re
-
-from ophyd_async.core import StandardReadable, derived_signal_r
-from ophyd_async.epics.core import epics_signal_r, epics_signal_rw
-
-
-class PilatusMetadata(StandardReadable):
-    def __init__(self, prefix: str, name: str = "") -> None:
-        self.filename = epics_signal_rw(str, prefix + "cam1:FileName")
-        self.template = epics_signal_r(str, prefix + "cam1:FileTemplate_RBV")
-        self.filenumber = epics_signal_r(int, prefix + "cam1:FileNumber_RBV")
-        with self.add_children_as_readables():
-            self.filename_template = derived_signal_r(
-                self._get_full_filename_template,
-                filename=self.filename,
-                filename_template=self.template,
-                file_number=self.filenumber,
-            )
-        super().__init__(name)
-
-    def _get_full_filename_template(
-        self, filename: str, filename_template: str, file_number: int
-    ) -> str:
-        """
-        Get the template file path by querying the detector PVs.
-        Mirror the construction that the PPU does.
-
-        Returns: A template string, with the image numbers replaced with '#'
-        """
-        # Exploit fact that passing negative numbers will put the - before the 0's
-        expected_filename = str(
-            filename_template % (filename, f"{file_number:05d}_", -9)
-        )
-        # Now, find the -09 part of this
-        numberpart = re.search(r"(-0+9)", expected_filename)
-        assert numberpart is not None
-        template_fill = "#" * len(numberpart.group(0))
-        return (
-            expected_filename[: numberpart.start()]
-            + template_fill
-            + expected_filename[numberpart.end() :]
-        )

dodal/devices/util/test_utils.py

@@ -1,37 +0,0 @@
-from contextlib import ExitStack
-
-from ophyd_async.core import Device
-from ophyd_async.epics.motor import Motor
-from ophyd_async.testing import (
-    callback_on_mock_put,
-    set_mock_value,
-)
-
-
-def patch_motor(motor: Motor, initial_position=0):
-    set_mock_value(motor.user_setpoint, initial_position)
-    set_mock_value(motor.user_readback, initial_position)
-    set_mock_value(motor.deadband, 0.001)
-    set_mock_value(motor.motor_done_move, 1)
-    set_mock_value(motor.velocity, 3)
-    set_mock_value(motor.max_velocity, 5)
-    return callback_on_mock_put(
-        motor.user_setpoint,
-        lambda pos, *args, **kwargs: set_mock_value(motor.user_readback, pos),
-    )
-
-
-def patch_all_motors(parent_device: Device):
-    motors = []
-
-    def recursively_find_motors(device: Device):
-        for _, child_device in device.children():
-            if isinstance(child_device, Motor):
-                motors.append(child_device)
-            recursively_find_motors(child_device)
-
-    recursively_find_motors(parent_device)
-    motor_patch_stack = ExitStack()
-    for motor in motors:
-        motor_patch_stack.enter_context(patch_motor(motor))
-    return motor_patch_stack