dls-dodal 1.29.3__py3-none-any.whl → 1.29.4__py3-none-any.whl

{dls_dodal-1.29.3.dist-info → dls_dodal-1.29.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.29.3
+Version: 1.29.4
 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
@@ -215,12 +215,12 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async >=0.3.1
+Requires-Dist: ophyd-async <0.4.0
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
-Requires-Dist: zocalo
+Requires-Dist: zocalo >=0.32.0
 Requires-Dist: requests
 Requires-Dist: graypy
 Requires-Dist: pydantic

{dls_dodal-1.29.3.dist-info → dls_dodal-1.29.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
 dodal/__init__.py,sha256=y-VRpfiX-Lm5nchB9N0VfMy_6dwFqVxpSn5SiAQql9I,114
 dodal/__main__.py,sha256=kP2S2RPitnOWpNGokjZ1Yq-1umOtp5sNOZk2B3tBPLM,111
-dodal/_version.py,sha256=MFlkKJKBPRaG5o-APjK5uWe00dvrrzhYEjQcU5M7B2I,413
+dodal/_version.py,sha256=dGQcJRhmSkKpwrkZVgo13Sd0AVHTIBb9i0csee9mzMo,413
 dodal/adsim.py,sha256=OW2dcS7ciD4Yq9WFw4PN_c5Bwccrmu7R-zr-u6ZCbQM,497
 dodal/cli.py,sha256=z0UBESrNrq6Kq4rttp4uHcwS1fnOnRkKBRDHSriPpGY,2058
 dodal/log.py,sha256=dfo1rfYrGG8oIm2HkNxaa_ldVs4vJKtgWSoKe1Z_Xno,8533
-dodal/utils.py,sha256=aH-W94t6NFOoGHZ7awbUKY8_k7qIYDourCFs3MKIjjA,10024
+dodal/utils.py,sha256=SFDmUOLtxLe5OdNdVgS_EftNpX0ihxduBwq6tufw8s4,10174
 dodal/beamline_specific_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/beamline_specific_utils/i03.py,sha256=Ixe1anFQl-kwRJubmQx28TIW4Zw8qDxpElNNNapWQHI,396
 dodal/beamlines/README.md,sha256=K9MkL_GomxlsoTB7Mz-_dJA5NNSbmCfMiutchGg3C8o,404
@@ -15,7 +15,7 @@ dodal/beamlines/i04_1.py,sha256=KDxSUQNhIs_NFiRaLY-Jiory0DeN7Y0ErvGuoTrwCDU,4731
 dodal/beamlines/i20_1.py,sha256=MaPgONHqpoZuBtkiKEzYtViJnKBM2_ekeP4OdbmuXHE,1158
 dodal/beamlines/i22.py,sha256=3VFdA4Wc7O40-64lwUtUBIN23fH4JVNbLKJ1JLjy9as,9870
 dodal/beamlines/i23.py,sha256=2j5qLoqE_hg9ETHqNkOVu7LLkVB8qalgXeORnVYKN_I,1075
-dodal/beamlines/i24.py,sha256=dCMQGcBZ6ADZ6_rEDFcV2BPHGKBC9iVFvfxewxVts4k,6111
+dodal/beamlines/i24.py,sha256=tPSrWArwRd0fb59HyHFRGR1FdscM7t9_hNPk0edhh4o,6583
 dodal/beamlines/p38.py,sha256=TC78u4GwEnj6X0r5cnHhqNdBbbDRnh8lY8pEucBZjEU,8006
 dodal/beamlines/p45.py,sha256=TNIkC-SBfj0ayZtlLLXW9xCSi5CzJkO8XpAMIo8fjao,2957
 dodal/common/__init__.py,sha256=ZC4ICKUDB0BDxRaVy8nmqclVmDBne-dPtk6UJsoFq6I,258
@@ -33,17 +33,17 @@ dodal/devices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/adsim.py,sha256=dMU0TKIuiODHYFHQOH4_5UvB8iJtaJEtjqaEDGjcU-w,311
 dodal/devices/aperture.py,sha256=0MtTzKMDZ5DVAz0DE0kXI0M76VCp0y9vFsrMggEMpxk,586
 dodal/devices/aperturescatterguard.py,sha256=2JJsEPJGJHrI0ztv1cSaP7H5T6qdzDfUcN-VEQ39B8o,11012
-dodal/devices/attenuator.py,sha256=OD7fElTIMHWk7ZopPqEu29lionm7WwgC0-Kvl8vBIb0,2599
+dodal/devices/attenuator.py,sha256=viK1iccNekX6ZvR_ZmSwj5JdM1j2B8pcTg8qWDdmzhQ,2584
 dodal/devices/backlight.py,sha256=vsNGZB4C_mVMafllvJlOTghsfv6UqALMKUMLXu3WZ5k,1115
 dodal/devices/beamstop.py,sha256=8L3qhlk-3ZBOp10xK1i8qZqYTGOXX1mVF1MgXoN0dfg,215
 dodal/devices/cryostream.py,sha256=6MU4rXIOL33C-8F3DVfAtv0ZnwiysTtawjkeePd5IrQ,332
 dodal/devices/dcm.py,sha256=vfyGYDzfSwTiNqlzkfNjkrL-Q1hNVSgJddvJ5Un_lvg,1610
-dodal/devices/eiger.py,sha256=NE4tHdqgUZpUxJLQbd5lLUIHZcpeotppexJGlDNByzM,13868
-dodal/devices/eiger_odin.py,sha256=U5Byb7uNwDdNscBRp7yBYQrsjKrKXl2l5WdSpL09lAw,6980
+dodal/devices/eiger.py,sha256=HpZIZ6Y8iffo9GxmuFJmnyRCa5Tl0BKSKU2_wVccHDo,14069
+dodal/devices/eiger_odin.py,sha256=zKNu5OaIQ9HkflfxKCi87Yr1kEG2gXfxzj0KPv0XzCk,6960
 dodal/devices/fast_grid_scan.py,sha256=BEj96j78r60JPPJoOMP-XXG-_9yURFTuu-pp2LcqQmY,12452
 dodal/devices/fluorescence_detector_motion.py,sha256=RrXfPmJzWnAjcjp9u0AnJEfjvWPMKburVTySB2hxYbw,181
 dodal/devices/flux.py,sha256=RtPStHw7Mad0igVKntKWVZfuZn2clokVJqH14HLix6M,198
-dodal/devices/focusing_mirror.py,sha256=aRqBkE3OgaXpH6lP3v1VbSYgHsMMbSsPPXzeyAGf_Pg,6435
+dodal/devices/focusing_mirror.py,sha256=v6TPglvmHiv9H05Lssv1LY5Nr9RBHQISLzL4SJ_QIbk,5890
 dodal/devices/hutch_shutter.py,sha256=nZ3gRbYIVJsXLlpZMWT4UEYUFFQP1MwMe8Oy304QsqE,3360
 dodal/devices/ipin.py,sha256=OGMXwAE4KDDonZRPFkUmR9Vsk6X4Ox-hEvPT5drP-mQ,208
 dodal/devices/linkam3.py,sha256=TPhiQ1D9i_HIlKHAlfnVfX7H6aPOAeXPEJLdmvwdKWQ,3776
@@ -64,7 +64,7 @@ dodal/devices/thawer.py,sha256=hIdZOzCNloY7CtSvdE2gk4vCMMoOtaIA4dPH_k0OwFg,1527
 dodal/devices/turbo_slit.py,sha256=W3ZRIqDhq4iMhr5GcIiWvl2U1GaPtGanqkL7upQOZTY,1132
 dodal/devices/undulator.py,sha256=kn84MQpuBHtQj7H7HeBoAYKXu5buGKvTgs3tf2gdEdw,2074
 dodal/devices/undulator_dcm.py,sha256=TC9fO55r1YIG_88PPbGGtzfjcRJcaoC2ny51JiDOEX4,5199
-dodal/devices/webcam.py,sha256=FXYcxQdOOCRIMAf8jMWlDVAhSEs4ycGCnoODvHb-apM,1554
+dodal/devices/webcam.py,sha256=dvNWJ6hHQR7BUsMRC9TH4XiCCofVhlgZ8HYfVCvd2og,1367
 dodal/devices/xbpm_feedback.py,sha256=8QHYKHo9ksZo30olbFM-tHpCHcJRFozgHKVJijv3Gck,1986
 dodal/devices/zebra.py,sha256=9Zkq5I3-gcP6qfDBnPEAtFU4QJ-VJyp7cHvB79ZfLHk,9186
 dodal/devices/zebra_controlled_shutter.py,sha256=MqX4KE6w0FliZRDBltswcLCNSsp6vQrD_iBY640IljI,1094
@@ -72,12 +72,12 @@ dodal/devices/areadetector/__init__.py,sha256=8IwLxuZMW0MOJpJp_ZDdlaE20hrtsH_PXW
 dodal/devices/areadetector/adaravis.py,sha256=pwbmmnakarjhD59XoyAIXJdakS-nqDG09Xmwq17AVw4,3787
 dodal/devices/areadetector/adsim.py,sha256=3U7kS93RM3Xeh-XWKjeuw5jXbIGWAbrs59LfxtvB7OU,1907
 dodal/devices/areadetector/adutils.py,sha256=JIx1_sYlehpLtEXcwOEuzVoMplsLdKVW7OWv5eiJqgE,2576
-dodal/devices/areadetector/plugins/MJPG.py,sha256=pLuEZiRGgCwJM1ONA5jdetGLo6O0OVhvmcVkkYtPeR8,4159
+dodal/devices/areadetector/plugins/MJPG.py,sha256=2ISGUg9JxJYzEH640WUIsvFwKolSTywkTyPy9wz6f_k,4064
 dodal/devices/detector/__init__.py,sha256=XEwjopgTtBq93RRuFthVVVI9DT1jUvpOJzWOHantJpU,104
 dodal/devices/detector/det_dim_constants.py,sha256=MZ4w2nsTKzj4eN7yGsSs1pqKWIuU4vc6UzcSll02uWg,2305
 dodal/devices/detector/det_dist_to_beam_converter.py,sha256=f6JFp-eEB2v8NzZg27UrN0VDP5CMjRnaPU6BTA7_n_s,1937
 dodal/devices/detector/det_resolution.py,sha256=aQkKp24LpRGiwzPAQM3wLVa4ANw32HdrKc2kftHfKQA,3253
-dodal/devices/detector/detector.py,sha256=arP27DbrgOjYZhE6Ibp9kDBglfmqZpPBk53S5ItsrvE,4756
+dodal/devices/detector/detector.py,sha256=7IYhndhT9CYCft0MrN1mAnopHqKYbaCRPRGLic76srw,4740
 dodal/devices/detector/detector_motion.py,sha256=REREva2kyPcIzOZmahN9rT0jDSuUbV0qUDl4IcBnutA,1221
 dodal/devices/i03/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i04/transfocator.py,sha256=uieByXIj0JRbmvMB_om5NOAEbEJkzfkCD24bl2aEo1g,3154
@@ -89,6 +89,7 @@ dodal/devices/i24/I24_detector_motion.py,sha256=Joqr1orgeNvRS7n01bjaO-4Yu4obb8fn
 dodal/devices/i24/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/i24/aperture.py,sha256=kKfHli5oKp-j-qZhZoXTRK81SAUNyhpI6VRvtw0SkZA,850
 dodal/devices/i24/beamstop.py,sha256=28hQowTvgN5Zw38tkDh32h2ceyN-2GE8bAaGPvDOt5U,1234
+dodal/devices/i24/dcm.py,sha256=Hx5pQ-SHEQ_bLCOnpQYDm6-t-it7nNDmUvopGyiGA2w,1991
 dodal/devices/i24/dual_backlight.py,sha256=Th-RKr28aFxE8LCT_mdN9KkRIVw0BHLGKkI0ienfRZU,2049
 dodal/devices/i24/i24_vgonio.py,sha256=Igqs7687z6lyhGVeJEDtDmPachYxU48MUH2BF0RpK9Q,461
 dodal/devices/i24/pmac.py,sha256=pN54myYvzqPl7iW0Vsp59J1EiV_gtn0xQGwbsKJpiYE,3876
@@ -96,16 +97,16 @@ dodal/devices/oav/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 dodal/devices/oav/grid_overlay.py,sha256=FRtjcFd420XY8MEQ9sWedL0i4pK-KUJOSxh2C5zM3PA,5232
 dodal/devices/oav/microns_for_zoom_levels.json,sha256=5PA71RzldFTp0eTUGPmov0MjxHe583mzvfor5f3thXI,1208
 dodal/devices/oav/oav_calculations.py,sha256=wt71vFcyQrr98FvX8oyUM2n5vmKi3K7PyOTuWp0gq5w,1665
-dodal/devices/oav/oav_detector.py,sha256=JtzRdFQVXUdVK4Qyd9knDhsfkK6tsXoD_rIWDpLdpD4,3654
+dodal/devices/oav/oav_detector.py,sha256=PlRIuMYSk46o6Aywel9tMZYh1WzMaBhfn3_GWqCas7w,3681
 dodal/devices/oav/oav_errors.py,sha256=cc4mGnaTiAc5WIlOt_BIYOc7CRSkrCdnBaavfAJ0pXY,754
 dodal/devices/oav/oav_parameters.py,sha256=4XybkhKeG7IEjPRfx0PVM9KNenuyN0rAGWBZG7H3zvQ,7941
-dodal/devices/oav/utils.py,sha256=zbUDvNETDoCtclj5jNzxz1XBt5mQlWBbxUrhRP7pZrU,3663
-dodal/devices/oav/pin_image_recognition/__init__.py,sha256=qEX3BRnrcP1BLZD-f_smHiMMPLJPkWQZQbIWTbW25JA,6499
+dodal/devices/oav/utils.py,sha256=BkTk0aTqqhIHCZInhcUAYjCRPxumPOlTg9m21skncTc,3018
+dodal/devices/oav/pin_image_recognition/__init__.py,sha256=Eve6oY9EYGOSw1x-N--xjgyIEzbZE7TTwGR-Q2NZprQ,6441
 dodal/devices/oav/pin_image_recognition/manual_test.py,sha256=h1Rto6ZDCB3jWhjSy9N8ECxRN583iYDJr9LxrTJ8kfE,903
 dodal/devices/oav/pin_image_recognition/utils.py,sha256=-7-Zs-331UVTq_AZrfdF-zwZdmMn7eitTkBSqnBrxnk,8620
 dodal/devices/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dodal/devices/util/adjuster_plans.py,sha256=2AYaywQP_LbA2KJ6Op3cok8GoRtj696utrSSDfaJtBY,875
-dodal/devices/util/epics_util.py,sha256=eQr-ImBnADpBL_6XWr3_q9yuMe55Lu0h3j9L1fG4Jws,4714
+dodal/devices/util/epics_util.py,sha256=4AOGqYjF0ITzs4c7PTZZnHge81Zheg4gZbFonVW7Lko,4728
 dodal/devices/util/lookup_tables.py,sha256=Up-0BlARt79TIEM76SkDyn9LtTFLxPUcaEPZv6D6bws,2141
 dodal/devices/util/motor_utils.py,sha256=pNY-aUk9LxaIWeDr5rpMS6udiB9j19wcCXkNDLp1uA0,257
 dodal/devices/xspress3/xspress3.py,sha256=29elzI3JtceryKeMWXhcP9nWl0tlSdnTZhltCitet6A,4668
@@ -116,9 +117,9 @@ dodal/devices/zocalo/zocalo_results.py,sha256=U4Vk4OF-eL8w0BR-fbw3k4jyRo6G3Ywaf8
 dodal/parameters/experiment_parameter_base.py,sha256=O7JamfuJ5cYHkPf9tsHJPqn-OMHTAGouigvM1cDFehE,313
 dodal/plans/check_topup.py,sha256=Pj6Eu8fa6nvoW4awrMxvzE_ftpLfYz8bN0QDLRw0Yuk,2989
 dodal/plans/data_session_metadata.py,sha256=QNx9rb1EfGBHb21eFekIi7KjNhC0PL-SVKBCggDuNeg,1650
-dls_dodal-1.29.3.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-dls_dodal-1.29.3.dist-info/METADATA,sha256=WmlVBYCSTsRn07vPGXJa_FF8x_djiThku9KSaCay3A8,16942
-dls_dodal-1.29.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-dls_dodal-1.29.3.dist-info/entry_points.txt,sha256=wpzz9FsTiYxI8OBwLKX9V9ResLwThBSmtRMcPwII0FA,46
-dls_dodal-1.29.3.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
-dls_dodal-1.29.3.dist-info/RECORD,,
+dls_dodal-1.29.4.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+dls_dodal-1.29.4.dist-info/METADATA,sha256=biJK1f1BESw8LgPh4Rl0GrxC9cMJ2WCYxP5NqGPBzak,16950
+dls_dodal-1.29.4.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
+dls_dodal-1.29.4.dist-info/entry_points.txt,sha256=wpzz9FsTiYxI8OBwLKX9V9ResLwThBSmtRMcPwII0FA,46
+dls_dodal-1.29.4.dist-info/top_level.txt,sha256=xIozdmZk_wmMV4wugpq9-6eZs0vgADNUKz3j2UAwlhc,6
+dls_dodal-1.29.4.dist-info/RECORD,,

{dls_dodal-1.29.3.dist-info → dls_dodal-1.29.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (71.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.29.3'
-__version_tuple__ = version_tuple = (1, 29, 3)
+__version__ = version = '1.29.4'
+__version_tuple__ = version_tuple = (1, 29, 4)

dodal/beamlines/i24.py

@@ -5,6 +5,7 @@ from dodal.devices.eiger import EigerDetector
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i24.aperture import Aperture
 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.I24_detector_motion import DetectorMotion
 from dodal.devices.i24.i24_vgonio import VGonio
@@ -82,6 +83,19 @@ def detector_motion(
     )
 
 
+def dcm(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -> DCM:
+    """Get the i24 DCM device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i24, it will return the existing object.
+    """
+    return device_instantiation(
+        device_factory=DCM,
+        name="dcm",
+        prefix="",
+        wait=wait_for_connection,
+        fake=fake_with_ophyd_sim,
+    )
+
+
 @skip_device(lambda: BL == "s24")
 def eiger(
     wait_for_connection: bool = True,

dodal/devices/areadetector/plugins/MJPG.py

@@ -8,7 +8,6 @@ from ophyd import Component, Device, DeviceStatus, EpicsSignal, EpicsSignalRO, S
 from PIL import Image, ImageDraw
 
 from dodal.devices.oav.oav_parameters import OAVConfigParams
-from dodal.devices.oav.utils import save_thumbnail
 from dodal.log import LOGGER
 
 
@@ -50,9 +49,6 @@ class MJPG(Device, ABC):
 
         LOGGER.info(f"Saving image to {path}")
         image.save(path)
-
-        save_thumbnail(Path(path), image)
-
         self.last_saved_path.put(path)
 
     def trigger(self):

dodal/devices/attenuator.py

@@ -48,7 +48,7 @@ class Attenuator(StandardReadable, Movable):
         super().__init__(name)
 
     @AsyncStatus.wrap
-    async def set(self, transmission: float):
+    async def set(self, value: float):
         """Set the transmission to the fractional (0-1) value given.
 
         The attenuator IOC will then insert filters to reach the desired transmission for
@@ -58,8 +58,8 @@ class Attenuator(StandardReadable, Movable):
 
         LOGGER.debug("Using current energy ")
         await self._use_current_energy.trigger()
-        LOGGER.info(f"Setting desired transmission to {transmission}")
-        await self._desired_transmission.set(transmission)
+        LOGGER.info(f"Setting desired transmission to {value}")
+        await self._desired_transmission.set(value)
         LOGGER.debug("Sending change filter command")
         await self._change.trigger()
 
@@ -67,7 +67,7 @@ class Attenuator(StandardReadable, Movable):
             *[
                 wait_for_value(
                     self._filters_in_position[i],
-                    await self._calculated_filter_states[i].get_value(),
+                    bool(await self._calculated_filter_states[i].get_value()),
                     None,
                 )
                 for i in range(16)

dodal/devices/detector/detector.py

@@ -54,13 +54,14 @@ class DetectorParams(BaseModel):
             DetectorSizeConstants: lambda d: d.det_type_string,
         }
 
-    @root_validator(pre=True, skip_on_failure=True)  # type: ignore # should be replaced with model_validator once move to pydantic 2 is complete
+    # should be replaced with model_validator once move to pydantic 2 is complete
+    @root_validator(pre=True)
     def create_beamxy_and_runnumber(cls, values: dict[str, Any]) -> dict[str, Any]:
         values["beam_xy_converter"] = DetectorDistanceToBeamXYConverter(
             values["det_dist_to_beam_converter_path"]
         )
         if values.get("run_number") is None:
-            values["run_number"] = get_run_number(values["directory"])
+            values["run_number"] = get_run_number(values["directory"], values["prefix"])
         return values
 
     @validator("detector_size_constants", pre=True)

dodal/devices/eiger.py

@@ -2,7 +2,7 @@ from enum import Enum
 
 from ophyd import Component, Device, EpicsSignalRO, Signal
 from ophyd.areadetector.cam import EigerDetectorCam
-from ophyd.status import AndStatus, Status, SubscriptionStatus
+from ophyd.status import AndStatus, Status, StatusBase
 
 from dodal.devices.detector import DetectorParams, TriggerMode
 from dodal.devices.eiger_odin import EigerOdin
@@ -27,6 +27,7 @@ class InternalEigerTriggerMode(Enum):
 class EigerDetector(Device):
     class ArmingSignal(Signal):
         def set(self, value, *, timeout=None, settle_time=None, **kwargs):
+            assert isinstance(self.parent, EigerDetector)
             return self.parent.async_stage()
 
     do_arm = Component(ArmingSignal)
@@ -38,10 +39,12 @@ class EigerDetector(Device):
 
     STALE_PARAMS_TIMEOUT = 60
     GENERAL_STATUS_TIMEOUT = 10
+    # Long timeout for meta file to compensate for filesystem issues
+    META_FILE_READY_TIMEOUT = 30
     ALL_FRAMES_TIMEOUT = 120
     ARMING_TIMEOUT = 60
 
-    filewriters_finished: SubscriptionStatus
+    filewriters_finished: StatusBase
 
     detector_params: DetectorParams | None = None
 
@@ -155,7 +158,7 @@ class EigerDetector(Device):
     def enable_roi_mode(self):
         return self.change_roi_mode(True)
 
-    def change_roi_mode(self, enable: bool) -> Status:
+    def change_roi_mode(self, enable: bool) -> StatusBase:
         assert self.detector_params is not None
         detector_dimensions = (
             self.detector_params.detector_size_constants.roi_size_pixels
@@ -206,7 +209,7 @@ class EigerDetector(Device):
         )
         return status
 
-    def set_odin_pvs(self) -> Status:
+    def set_odin_pvs(self) -> StatusBase:
         assert self.detector_params is not None
         file_prefix = self.detector_params.full_filename
         status = self.odin.file_writer.file_path.set(
@@ -264,7 +267,7 @@ class EigerDetector(Device):
             status.set_finished()
             return status
 
-    def set_num_triggers_and_captures(self) -> Status:
+    def set_num_triggers_and_captures(self) -> StatusBase:
         """Sets the number of triggers and the number of images for the Eiger to capture
         during the datacollection. The number of images is the number of images per
         trigger.
@@ -295,7 +298,7 @@ class EigerDetector(Device):
 
         return status
 
-    def _wait_for_odin_status(self) -> Status:
+    def _wait_for_odin_status(self) -> StatusBase:
         self.forward_bit_depth_to_filewriter()
         await_value(self.odin.meta.active, 1).wait(self.GENERAL_STATUS_TIMEOUT)
 
@@ -304,11 +307,11 @@ class EigerDetector(Device):
         )
         LOGGER.info("Eiger staging: awaiting odin metadata")
         status &= await_value(
-            self.odin.meta.ready, 1, timeout=self.GENERAL_STATUS_TIMEOUT
+            self.odin.meta.ready, 1, timeout=self.META_FILE_READY_TIMEOUT
         )
         return status
 
-    def _wait_fan_ready(self) -> Status:
+    def _wait_fan_ready(self) -> StatusBase:
         self.filewriters_finished = self.odin.create_finished_status()
         LOGGER.info("Eiger staging: awaiting odin fan ready")
         return await_value(self.odin.fan.ready, 1, self.GENERAL_STATUS_TIMEOUT)
@@ -332,6 +335,7 @@ class EigerDetector(Device):
 
     def do_arming_chain(self) -> Status:
         functions_to_do_arm = []
+        assert self.detector_params
         detector_params: DetectorParams = self.detector_params
         if detector_params.use_roi_mode:
             functions_to_do_arm.append(self.enable_roi_mode)

dodal/devices/eiger_odin.py

@@ -3,7 +3,7 @@ from typing import List, Tuple
 from ophyd import Component, Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV
 from ophyd.areadetector.plugins import HDF5Plugin_V22
 from ophyd.sim import NullStatus
-from ophyd.status import Status, SubscriptionStatus
+from ophyd.status import StatusBase
 
 from dodal.devices.status import await_value
 
@@ -120,7 +120,7 @@ class EigerOdin(Device):
     meta = Component(OdinMetaListener, "OD:META:")
     nodes = Component(OdinNodesStatus, "")
 
-    def create_finished_status(self) -> SubscriptionStatus:
+    def create_finished_status(self) -> StatusBase:
         writing_finished = await_value(self.meta.ready, 0)
         for node_pv in self.nodes.nodes:
             writing_finished &= await_value(node_pv.writing, 0)
@@ -157,7 +157,7 @@ class EigerOdin(Device):
 
         return not errors, "\n".join(errors)
 
-    def stop(self) -> Status:
+    def stop(self) -> StatusBase:
         """Stop odin manually"""
         status = self.file_writer.capture.set(0)
         status &= self.meta.stop_writing.set(1)

dodal/devices/focusing_mirror.py

@@ -1,12 +1,16 @@
-from enum import Enum, IntEnum
-from typing import Any
-
-from ophyd import Component, Device, EpicsSignal
-from ophyd.status import Status, StatusBase
-from ophyd_async.core import StandardReadable
+from enum import Enum
+
+from ophyd_async.core import (
+    AsyncStatus,
+    Device,
+    DeviceVector,
+    StandardReadable,
+    observe_value,
+)
 from ophyd_async.core.signal import soft_signal_r_and_setter
 from ophyd_async.epics.motion import Motor
 from ophyd_async.epics.signal import (
+    epics_signal_r,
     epics_signal_rw,
     epics_signal_x,
 )
@@ -32,11 +36,11 @@ class MirrorStripe(str, Enum):
     PLATINUM = "Platinum"
 
 
-class MirrorVoltageDemand(IntEnum):
-    N_A = 0
-    OK = 1
-    FAIL = 2
-    SLEW = 3
+class MirrorVoltageDemand(str, Enum):
+    N_A = "N/A"
+    OK = "OK"
+    FAIL = "FAIL"
+    SLEW = "SLEW"
 
 
 class MirrorVoltageDevice(Device):
@@ -44,14 +48,16 @@ class MirrorVoltageDevice(Device):
     the demanded voltage setpoint is accepted, without blocking the caller as this process can take significant time.
     """
 
-    _actual_v: EpicsSignal = Component(EpicsSignal, "R")
-    _setpoint_v: EpicsSignal = Component(EpicsSignal, "D")
-    _demand_accepted: EpicsSignal = Component(EpicsSignal, "DSEV")
+    def __init__(self, name: str = "", prefix: str = ""):
+        self._actual_v = epics_signal_r(int, prefix + "R")
+        self._setpoint_v = epics_signal_rw(int, prefix + "D")
+        self._demand_accepted = epics_signal_r(MirrorVoltageDemand, prefix + "DSEV")
+        super().__init__(name=name)
 
-    def set(self, value, *args, **kwargs) -> StatusBase:
+    @AsyncStatus.wrap
+    async def set(self, value, *args, **kwargs):
         """Combine the following operations into a single set:
         1. apply the value to the setpoint PV
-        2. Return to the caller with a Status future
         3. Wait until demand is accepted
         4. When either demand is accepted or DEFAULT_SETTLE_TIME expires, signal the result on the Status
         """
@@ -59,66 +65,60 @@ class MirrorVoltageDevice(Device):
         setpoint_v = self._setpoint_v
         demand_accepted = self._demand_accepted
 
-        if demand_accepted.get() != MirrorVoltageDemand.OK:
+        if await demand_accepted.get_value() != MirrorVoltageDemand.OK:
             raise AssertionError(
                 f"Attempted to set {setpoint_v.name} when demand is not accepted."
             )
 
-        if setpoint_v.get() == value:
+        if await setpoint_v.get_value() == value:
             LOGGER.debug(f"{setpoint_v.name} already at {value} - skipping set")
-            return Status(success=True, done=True)
+            return
 
         LOGGER.debug(f"setting {setpoint_v.name} to {value}")
-        demand_accepted_status = Status(self, DEFAULT_SETTLE_TIME_S)
-
-        subscription: dict[str, Any] = {"handle": None}
 
-        def demand_check_callback(old_value, value, **kwargs):
-            LOGGER.debug(f"Got event old={old_value} new={value} for {setpoint_v.name}")
-            if old_value != MirrorVoltageDemand.OK and value == MirrorVoltageDemand.OK:
-                LOGGER.debug(f"Demand accepted for {setpoint_v.name}")
-                subs_handle = subscription.pop("handle", None)
-                if subs_handle is None:
-                    raise AssertionError("Demand accepted before set attempted")
-                demand_accepted.unsubscribe(subs_handle)
-
-                demand_accepted_status.set_finished()
-            # else timeout handled by parent demand_accepted_status
+        # Register an observer up front to ensure we don't miss events after we
+        # perform the set
+        demand_accepted_iterator = observe_value(
+            demand_accepted, timeout=DEFAULT_SETTLE_TIME_S
+        )
+        # discard the current value (OK) so we can await a subsequent change
+        await anext(demand_accepted_iterator)
+        await setpoint_v.set(value)
+
+        # The set should always change to SLEW regardless of whether we are
+        # already at the set point, then change back to OK/FAIL depending on
+        # success
+        accepted_value = await anext(demand_accepted_iterator)
+        assert accepted_value == MirrorVoltageDemand.SLEW
+        LOGGER.debug(
+            f"Demand not accepted for {setpoint_v.name}, waiting for acceptance..."
+        )
+        while MirrorVoltageDemand.SLEW == (
+            accepted_value := await anext(demand_accepted_iterator)
+        ):
+            pass
 
-        subscription["handle"] = demand_accepted.subscribe(demand_check_callback)
-        setpoint_status = setpoint_v.set(value)
-        status = setpoint_status & demand_accepted_status
-        return status
+        if accepted_value != MirrorVoltageDemand.OK:
+            raise AssertionError(
+                f"Voltage slew failed for {setpoint_v.name}, new state={accepted_value}"
+            )
 
 
-class VFMMirrorVoltages(Device):
-    def __init__(self, *args, daq_configuration_path: str, **kwargs):
-        super().__init__(*args, **kwargs)
+class VFMMirrorVoltages(StandardReadable):
+    def __init__(
+        self, name: str, prefix: str, *args, daq_configuration_path: str, **kwargs
+    ):
         self.voltage_lookup_table_path = (
             daq_configuration_path + "/json/mirrorFocus.json"
         )
-
-    _channel14_voltage_device = Component(MirrorVoltageDevice, "BM:V14")
-    _channel15_voltage_device = Component(MirrorVoltageDevice, "BM:V15")
-    _channel16_voltage_device = Component(MirrorVoltageDevice, "BM:V16")
-    _channel17_voltage_device = Component(MirrorVoltageDevice, "BM:V17")
-    _channel18_voltage_device = Component(MirrorVoltageDevice, "BM:V18")
-    _channel19_voltage_device = Component(MirrorVoltageDevice, "BM:V19")
-    _channel20_voltage_device = Component(MirrorVoltageDevice, "BM:V20")
-    _channel21_voltage_device = Component(MirrorVoltageDevice, "BM:V21")
-
-    @property
-    def voltage_channels(self) -> list[MirrorVoltageDevice]:
-        return [
-            self._channel14_voltage_device,
-            self._channel15_voltage_device,
-            self._channel16_voltage_device,
-            self._channel17_voltage_device,
-            self._channel18_voltage_device,
-            self._channel19_voltage_device,
-            self._channel20_voltage_device,
-            self._channel21_voltage_device,
-        ]
+        with self.add_children_as_readables():
+            self.voltage_channels = DeviceVector(
+                {
+                    i - 14: MirrorVoltageDevice(prefix=f"{prefix}BM:V{i}")
+                    for i in range(14, 22)
+                }
+            )
+        super().__init__(*args, name=name, **kwargs)
 
 
 class FocusingMirror(StandardReadable):

dodal/devices/i24/dcm.py

@@ -0,0 +1,42 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motion import Motor
+from ophyd_async.epics.signal import epics_signal_r
+
+
+class DCM(StandardReadable):
+    """
+    A double crystal monocromator device, used to select the beam energy.
+    """
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        with self.add_children_as_readables():
+            # Motors
+            self.bragg_in_degrees = Motor(prefix + "-MO-DCM-01:BRAGG")
+            self.x_translation_in_mm = Motor(prefix + "-MO-DCM-01:X")
+            self.offset_in_mm = Motor(prefix + "-MO-DCM-01:OFFSET")
+            self.gap_in_mm = Motor(prefix + "-MO-DCM-01:GAP")
+            self.energy_in_kev = Motor(prefix + "-MO-DCM-01:ENERGY")
+            self.xtal1_roll = Motor(prefix + "-MO-DCM-01:XTAL1:ROLL")
+            self.xtal2_roll = Motor(prefix + "-MO-DCM-01:XTAL2:ROLL")
+            self.xtal2_pitch = Motor(prefix + "-MO-DCM-01:XTAL2:PITCH")
+
+            # Wavelength is calculated in epics from the energy
+            self.wavelength_in_a = epics_signal_r(float, prefix + "-MO-DCM-01:LAMBDA")
+
+            # Temperatures
+            self.xtal1_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-1")
+            self.xtal1_heater_temp = epics_signal_r(
+                float, prefix + "-DI-DCM-01:PT100-2"
+            )
+            self.xtal2_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-4")
+            self.xtal2_heater_temp = epics_signal_r(
+                float, prefix + "-DI-DCM-01:PT100-5"
+            )
+
+            self.roll_plate_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-3")
+            self.pitch_plate_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-6")
+            self.backplate_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-7")
+            self.b1_plate_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-7")
+            self.gap_temp = epics_signal_r(float, prefix + "-DI-DCM-01:TC-1")
+
+        super().__init__(name)

dodal/devices/oav/oav_detector.py

@@ -46,6 +46,7 @@ class ZoomController(Device):
     sxst = Component(EpicsSignal, "MP:SELECT.SXST")
 
     def set_flatfield_on_zoom_level_one(self, value):
+        self.parent: "OAV"
         flat_applied = self.parent.proc.port_name.get()
         no_flat_applied = self.parent.cam.port_name.get()
         return self.parent.grid_snapshot.input_plugin.set(

dodal/devices/oav/pin_image_recognition/__init__.py

@@ -50,11 +50,13 @@ class PinTipDetection(StandardReadable):
         self._prefix: str = prefix
         self._name = name
 
-        self.triggered_tip, _ = soft_signal_r_and_setter(Tip, name="triggered_tip")
-        self.triggered_top_edge, _ = soft_signal_r_and_setter(
+        self.triggered_tip, self._tip_setter = soft_signal_r_and_setter(
+            Tip, name="triggered_tip"
+        )
+        self.triggered_top_edge, self._top_edge_setter = soft_signal_r_and_setter(
             NDArray[np.uint32], name="triggered_top_edge"
         )
-        self.triggered_bottom_edge, _ = soft_signal_r_and_setter(
+        self.triggered_bottom_edge, self._bottom_edge_setter = soft_signal_r_and_setter(
             NDArray[np.uint32], name="triggered_bottom_edge"
         )
         self.array_data = epics_signal_r(NDArray[np.uint8], f"pva://{prefix}PVA:ARRAY")
@@ -85,14 +87,14 @@ class PinTipDetection(StandardReadable):
 
         super().__init__(name=name)
 
-    async def _set_triggered_values(self, results: SampleLocation):
+    def _set_triggered_values(self, results: SampleLocation):
         tip = (results.tip_x, results.tip_y)
         if tip == self.INVALID_POSITION:
             raise InvalidPinException
         else:
-            await self.triggered_tip._backend.put(tip)
-        await self.triggered_top_edge._backend.put(results.edge_top)
-        await self.triggered_bottom_edge._backend.put(results.edge_bottom)
+            self._tip_setter(tip)
+        self._top_edge_setter(results.edge_top)
+        self._bottom_edge_setter(results.edge_bottom)
 
     async def _get_tip_and_edge_data(
         self, array_data: NDArray[np.uint8]
@@ -150,7 +152,7 @@ class PinTipDetection(StandardReadable):
             async for value in observe_value(self.array_data):
                 try:
                     location = await self._get_tip_and_edge_data(value)
-                    await self._set_triggered_values(location)
+                    self._set_triggered_values(location)
                 except Exception as e:
                     LOGGER.warn(
                         f"Failed to detect pin-tip location, will retry with next image: {e}"
@@ -166,6 +168,6 @@ class PinTipDetection(StandardReadable):
             LOGGER.error(
                 f"No tip found in {await self.validity_timeout.get_value()} seconds."
             )
-            await self.triggered_tip._backend.put(self.INVALID_POSITION)
-            await self.triggered_bottom_edge._backend.put(np.array([]))
-            await self.triggered_top_edge._backend.put(np.array([]))
+            self._tip_setter(self.INVALID_POSITION)
+            self._bottom_edge_setter(np.array([]))
+            self._top_edge_setter(np.array([]))

dodal/devices/oav/utils.py

@@ -1,17 +1,14 @@
 from enum import IntEnum
-from pathlib import Path
 from typing import Generator, Tuple
 
 import bluesky.plan_stubs as bps
 import numpy as np
 from bluesky.utils import Msg
-from PIL.Image import Image
 
 from dodal.devices.oav.oav_calculations import camera_coordinates_to_xyz
-from dodal.devices.oav.oav_parameters import OAVConfigParams
+from dodal.devices.oav.oav_detector import OAVConfigParams
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.smargon import Smargon
-from dodal.log import LOGGER
 
 Pixel = Tuple[int, int]
 
@@ -110,14 +107,3 @@ def wait_for_tip_to_be_found(
         raise PinNotFoundException(f"No pin found after {timeout} seconds")
 
     return found_tip  # type: ignore
-
-
-def save_thumbnail(full_file_path: Path, full_image: Image, new_height=192):
-    """Scales an image down to have the height specified in new_height and saves it
-    to the same location as the full image with a t appended to the filename"""
-    thumbnail_path = full_file_path.with_stem(full_file_path.stem + "t")
-    LOGGER.info(f"Saving thumbnail to {thumbnail_path}")
-    full_size = full_image.size
-    new_width = (new_height / full_size[1]) * full_size[0]
-    full_image.thumbnail((new_width, new_height))
-    full_image.save(thumbnail_path.as_posix())

dodal/devices/util/epics_util.py

@@ -1,5 +1,5 @@
 from functools import partial
-from typing import Callable
+from typing import Callable, Sequence
 
 from bluesky.protocols import Movable
 from ophyd import Component, EpicsSignal
@@ -26,7 +26,7 @@ def epics_signal_put_wait(pv_name: str, wait: float = 3.0) -> Component[EpicsSig
 
 
 def run_functions_without_blocking(
-    functions_to_chain: list[Callable[[], StatusBase]],
+    functions_to_chain: Sequence[Callable[[], StatusBase]],
     timeout: float = 60.0,
     associated_obj: OphydDevice | None = None,
 ) -> Status:

dodal/devices/webcam.py

@@ -1,13 +1,10 @@
-import io
 from pathlib import Path
 
 import aiofiles
 from aiohttp import ClientSession
 from bluesky.protocols import Triggerable
 from ophyd_async.core import AsyncStatus, StandardReadable, soft_signal_rw
-from PIL import Image
 
-from dodal.devices.oav.utils import save_thumbnail
 from dodal.log import LOGGER
 
 
@@ -26,10 +23,8 @@ class Webcam(StandardReadable, Triggerable):
             async with session.get(self.url) as response:
                 response.raise_for_status()
                 LOGGER.info(f"Saving webcam image from {self.url} to {file_path}")
-                data = await response.read()
                 async with aiofiles.open(file_path, "wb") as file:
-                    await file.write(data)
-                save_thumbnail(Path(file_path), Image.open(io.BytesIO(data)))
+                    await file.write((await response.read()))
 
     @AsyncStatus.wrap
     async def trigger(self) -> None:

dodal/utils.py

@@ -322,10 +322,15 @@ def _find_next_run_number_from_files(file_names: List[str]) -> int:
     return max(valid_numbers) + 1 if valid_numbers else 1
 
 
-def get_run_number(directory: str) -> int:
-    """Looks at the numbers coming from all nexus files with the format "xxx_(any number}.nxs", and returns the highest number + 1,
-    or 1 if there are no numbers found"""
-    nexus_file_names = [file for file in os.listdir(directory) if file.endswith(".nxs")]
+def get_run_number(directory: str, prefix: str = "") -> int:
+    """Looks at the numbers coming from all nexus files with the format
+    "{prefix}_(any number}.nxs", and returns the highest number + 1, or 1 if there are
+    no matching numbers found. If no prefix is given, considers all files in the dir."""
+    nexus_file_names = [
+        file
+        for file in os.listdir(directory)
+        if file.endswith(".nxs") and file.startswith(prefix)
+    ]
 
     if len(nexus_file_names) == 0:
         return 1