From 584868d464aa15eabf00829ba70d63eac77fc98b Mon Sep 17 00:00:00 2001 From: PONS Date: Wed, 18 Mar 2026 09:26:04 +0100 Subject: [PATCH 1/2] Fix ignore external flag --- pyaml/accelerator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyaml/accelerator.py b/pyaml/accelerator.py index c82c355d..e418e2ba 100644 --- a/pyaml/accelerator.py +++ b/pyaml/accelerator.py @@ -234,4 +234,4 @@ def load(filename: str, use_fast_loader: bool = False, ignore_external=False) -> rootfolder = os.path.abspath(os.path.dirname(filename)) set_root_folder(rootfolder) config_dict = load(os.path.basename(filename), None, use_fast_loader) - return Accelerator.from_dict(config_dict) + return Accelerator.from_dict(config_dict, ignore_external=ignore_external) From 48831acc6a4c85814d9cb2d0dab708a82e14d6de Mon Sep 17 00:00:00 2001 From: PONS Date: Wed, 18 Mar 2026 09:35:54 +0100 Subject: [PATCH 2/2] Fix for unused live in tune test --- tests/test_tune.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/test_tune.py b/tests/test_tune.py index 631037fe..2510ad96 100644 --- a/tests/test_tune.py +++ b/tests/test_tune.py @@ -5,9 +5,7 @@ def test_tune(): - sr: Accelerator = Accelerator.load( - "tests/config/EBSTune.yaml", ignore_external=True - ) + sr: Accelerator = Accelerator.load("tests/config/EBSTune.yaml", ignore_external=True) assert sr.get_description() == "Accelerator configuration for EBS storage ring" assert sr.design.get_magnet("QF1E-C04").get_description() == "QF1E-C04 quadrupole" @@ -16,7 +14,6 @@ def test_tune(): sr.design.get_lattice().disable_6d() quadForTuneDesign = sr.design.get_magnets("QForTune") - quadForTuneLive = sr.live.get_magnets("QForTune") tune_monitor = sr.design.get_betatron_tune_monitor("BETATRON_TUNE") # Build tune response matrix tune = tune_monitor.tune.get()