Merge branch 'i13_1_merlin_test' of github.com:DiamondLightSource/dod…

…al into i13_1_merlin_test
DiamondLightSource · Jan 9, 2025 · a4d6d0b · a4d6d0b
2 parents cc05fed + fa334a2
commit a4d6d0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/dodal/devices/i13_1/merlin.py b/src/dodal/devices/i13_1/merlin.py
@@ -1,8 +1,8 @@
 from ophyd_async.core import PathProvider, StandardDetector
 from ophyd_async.epics import adcore
 
-from .merlin_controller import MerlinController
-from .merlin_io import MerlinDriverIO
+from dodal.devices.i13_1.merlin_controller import MerlinController
+from dodal.devices.i13_1.merlin_io import MerlinDriverIO
 
 
 class Merlin(StandardDetector):

diff --git a/src/dodal/devices/i13_1/merlin_controller.py b/src/dodal/devices/i13_1/merlin_controller.py
@@ -10,7 +10,7 @@
 )
 from ophyd_async.epics import adcore
 
-from .merlin_io import MerlinDriverIO, MerlinImageMode
+from dodal.devices.i13_1.merlin_io import MerlinDriverIO, MerlinImageMode
 
 
 class MerlinController(DetectorController):