src/aare/beamline_dispatch/x06da/beamline_dispatch.py

@@ -48,21 +48,10 @@ FLUX_PH_S = np.asarray([
 
 class X06daBecMacros(BecMacros):
     def __init__(self) -> None:
-        from pxiii_bec.macros.build_devices import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            save_and_reload,
-            save_current_position,
-        )
-        from pxiii_bec.macros.init_beamline import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            init_beamline_environment,
-        )
-        from pxiii_bec.macros.katscripts import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            auto_exposure,
-        )
-        from pxiii_bec.macros.pxiii_energy import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            bl_energy,
-            get_current_energy,
-            mono_pitch_scan,
-        )
+        from pxiii_bec.macros.build_devices import save_and_reload, save_current_position  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
+        from pxiii_bec.macros.init_beamline import init_beamline_environment  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
+        from pxiii_bec.macros.katscripts import auto_exposure  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
+        from pxiii_bec.macros.pxiii_energy import bl_energy, get_current_energy, mono_pitch_scan  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
 
         self.save_and_reload = save_and_reload
         self.save_current_position = save_current_position

src/aare/beamline_dispatch/x10sa/beamline_dispatch.py

@@ -16,24 +16,11 @@ from aare.beamline_dispatch.protocols import BecMacros
 
 class X10SaBecMacros(BecMacros):
     def __init__(self) -> None:
-        from pxii_bec.macros.build_devices import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            save_and_reload,
-            save_current_position,
-        )
-        from pxii_bec.macros.flux_macros import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            bpm2flux,
-        )
-        from pxii_bec.macros.pxii_energy import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            bl_energy,
-            get_current_energy,
-            mono_pitch_scan,
-        )
-        from pxii_bec.macros.pxii_setup import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            auto_exposure,
-        )
-        from pxii_bec.scripts.init_beamline import (  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
-            init_beamline_environment,
-        )
+        from pxii_bec.macros.build_devices import save_and_reload, save_current_position  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
+        from pxii_bec.macros.flux_macros import bpm2flux  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
+        from pxii_bec.macros.pxii_energy import bl_energy, get_current_energy, mono_pitch_scan  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
+        from pxii_bec.macros.pxii_setup import auto_exposure  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
+        from pxii_bec.scripts.init_beamline import init_beamline_environment  # pyright: ignore[reportMissingImports, reportMissingModuleSource]
 
         def _save_and_reload():
             save_and_reload()

src/aare/gui/widgets/message_box.py

@@ -1,7 +1,7 @@
 import time
 
 from aarecommon.config.logger import setup_logger
-from PySide6.QtCore import QEventLoop, QTimer
+from PySide6.QtCore import QEventLoop
 from PySide6.QtWidgets import QCheckBox, QMessageBox
 
 from aare.gui.constants import LOGGER_NAME

tests/unit/gui/test_message_box.py

@@ -6,7 +6,6 @@ from PySide6.QtWidgets import QMessageBox
 from aare.gui.widgets.message_box import (
     experiment_hutch_shutter_check,
     reply_box,
-    ring_current_auto_check,
     ring_current_low_check,
 )
 
@@ -47,20 +46,3 @@ def test_experiment_hutch_shutter_check_closed_yes(qtbot):
     with patch("aare.gui.widgets.message_box.reply_box") as mock_reply:
         mock_reply.return_value = QMessageBox.StandardButton.Yes
         assert experiment_hutch_shutter_check(None, False) is True
-
-
-def test_ring_current_auto_check_yes(qtbot):
-    # This one uses a nested event loop, which can be tricky to test.
-    # We'll mock timer_box to return a box that we can close manually.
-    with patch("aare.gui.widgets.message_box.timer_box") as mock_timer_box:
-        box = QMessageBox()
-        box.setStandardButtons(QMessageBox.StandardButton.Yes)
-        mock_timer_box.return_value = box
-
-        # We need to close the box after some time to break the loop
-        from PySide6.QtCore import QTimer
-
-        QTimer.singleShot(100, lambda: box.done(QMessageBox.StandardButton.Yes))
-
-        res = ring_current_auto_check(None, 50.0, lambda: False)
-        assert res is True