fix: linting and formatting
CI / lint (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Successful in 1m13s
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Failing after 1m34s
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Failing after 1m34s
CI / test (3.13) (pull_request) Failing after 1m36s
CI / test (3.12) (pull_request) Failing after 1m36s
CI / test (3.14) (pull_request) Canceled after 1m37s
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Canceled after 1m39s
CI / test-with-coverage (pull_request) Failing after 1m41s
CI / coverage-analysis (pull_request) Skipped

This commit is contained in:
perl_d committed 2026-10-20 15:51:37 +02:00
1 parent 7844611572
commit 3184f3f324
3 files changed
+10 -34

No files matched your search

@@ -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
@@ -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()
+1 -1
View File
@@ -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