Merge pull request #185 from python-accelerator-middle-layer/fix-load-multiple

Clear factory before loading

Author: JeanLucPons

pyaml/accelerator.py

@@ -153,6 +153,8 @@ def from_dict(config_dict: dict, ignore_external=False) -> "Accelerator":
         if ignore_external:
             # control systems are external, so remove controls field
             config_dict.pop("controls", None)
+        # Ensure factory is clean before building a new accelerator
+        Factory.clear()
         return Factory.depth_first_build(config_dict, ignore_external)
 
     @staticmethod

tests/test_arrays.py

@@ -9,12 +9,10 @@
 from pyaml.arrays.bpm_array import BPMArray
 from pyaml.arrays.cfm_magnet import CombinedFunctionMagnet
 from pyaml.arrays.cfm_magnet import ConfigModel as CombinedFunctionMagnetConfigModel
-from pyaml.arrays.cfm_magnet_array import CombinedFunctionMagnetArray
 from pyaml.arrays.element_array import ElementArray
 from pyaml.arrays.magnet import ConfigModel as MagnetArrayConfigModel
 from pyaml.arrays.magnet import Magnet
 from pyaml.arrays.magnet_array import MagnetArray
-from pyaml.configuration.factory import Factory
 
 
 @pytest.mark.parametrize(
@@ -205,8 +203,6 @@ def test_arrays(install_test_package):
     bpmsLive = BPMArray("", sr.live.get_all_bpms())
     bpmsLive.positions.get()
 
-    Factory.clear()
-
     # Test dynamic arrays
 
     sr: Accelerator = Accelerator.load(
@@ -244,7 +240,6 @@ def test_arrays(install_test_package):
     v = sr.design.get_cfm_magnets("emptyCFM").strengths.get()  # Ensure good attach
     assert np.shape(v) == (0,)
 
-    Factory.clear()
 
 @pytest.mark.parametrize(
     "sr_file",
@@ -253,7 +248,9 @@ def test_arrays(install_test_package):
     ],
 )
 def test_serialized_magnets_arrays(sr_file):
-    sr: Accelerator = Accelerator.load(sr_file, use_fast_loader=True, ignore_external=True)
+    sr: Accelerator = Accelerator.load(
+        sr_file, use_fast_loader=True, ignore_external=True
+    )
     the_serie = sr.design.get_serialized_magnets("series")
     strength = the_serie.strengths.get()
     assert len(strength) == 5
@@ -263,4 +260,3 @@ def test_serialized_magnets_arrays(sr_file):
     assert len(hardwares) == 5
     print(hardwares)
     the_serie.hardwares.set([10])
-

tests/test_bpm.py

@@ -2,7 +2,6 @@
 import pytest
 
 from pyaml.accelerator import Accelerator
-from pyaml.configuration.factory import Factory
 
 
 def test_simulator_bpm_tilt():
@@ -13,8 +12,6 @@ def test_simulator_bpm_tilt():
     bpm.tilt.set(0.01)
     assert bpm.tilt.get() == 0.01
 
-    Factory.clear()
-
 
 def test_simulator_bpm_offset():
     sr: Accelerator = Accelerator.load("tests/config/bpms.yaml", ignore_external=True)
@@ -28,8 +25,6 @@ def test_simulator_bpm_offset():
     assert bpm.offset.get()[1] == 0.2
     assert np.allclose(bpm.positions.get(), np.array([0.0, 0.0]))
 
-    Factory.clear()
-
 
 @pytest.mark.parametrize(
     "install_test_package",
@@ -45,8 +40,6 @@ def test_simulator_bpm_position(install_test_package):
     assert np.allclose(bpm.positions.get(), np.array([0.0, 0.0]))
     assert np.allclose(bpm_simple.positions.get(), np.array([0.0, 0.0]))
 
-    Factory.clear()
-
 
 def test_simulator_bpm_position_with_bad_corrector_strength():
     sr: Accelerator = Accelerator.load("tests/config/bpms.yaml", ignore_external=True)
@@ -60,5 +53,3 @@ def test_simulator_bpm_position_with_bad_corrector_strength():
     for bpm in [bpm1, bpm_simple, bpm3]:
         assert bpm.positions.get()[0] != 0.0
         assert bpm.positions.get()[1] != 0.0
-
-    Factory.clear()

tests/test_bpm_controlsystem.py

@@ -2,7 +2,6 @@
 import pytest
 
 from pyaml.accelerator import Accelerator
-from pyaml.configuration.factory import Factory
 
 
 @pytest.mark.parametrize(
@@ -19,8 +18,6 @@ def test_controlsystem_bpm_tilt(install_test_package):
     bpm.tilt.set(0.01)
     assert bpm.tilt.get() == 0.01
 
-    Factory.clear()
-
 
 @pytest.mark.parametrize(
     "install_test_package",
@@ -38,8 +35,6 @@ def test_controlsystem_bpm_offset(install_test_package):
     assert bpm.offset.get()[1] == 0.2
     assert np.allclose(bpm.positions.get(), np.array([0.0, 0.0]))
 
-    Factory.clear()
-
 
 @pytest.mark.parametrize(
     "install_test_package",
@@ -65,5 +60,3 @@ def test_controlsystem_bpm_position_indexed(install_test_package):
     bpm = sr.live.get_bpm("BPM_C01-04")
 
     assert np.allclose(bpm.positions.get(), np.array([0.0, 1.0]))
-
-    Factory.clear()

tests/test_chromaticity_monitor.py

@@ -2,7 +2,6 @@
 import pytest
 
 from pyaml.accelerator import Accelerator
-from pyaml.configuration.factory import Factory
 
 
 def test_simulator_chromaticity_monitor():
@@ -20,8 +19,6 @@ def test_simulator_chromaticity_monitor():
         == sr.design.get_lattice().get_chrom()[1]
     )
 
-    Factory.clear()
-
 
 @pytest.mark.parametrize(
     "install_test_package",
@@ -44,5 +41,3 @@ def test_controlsystem_chromaticity_monitor(install_test_package):
     ksi = np.abs(chromaticity_monitor.chromaticity.get())
     assert abs(ksi[0]) < 1e-17
     assert abs(ksi[1]) < 1e-17
-
-    Factory.clear()

tests/test_errors.py

@@ -3,7 +3,6 @@
 from pyaml.accelerator import Accelerator
 from pyaml.arrays.magnet_array import MagnetArray
 from pyaml.common.exception import PyAMLConfigException, PyAMLException
-from pyaml.configuration.factory import Factory
 
 
 @pytest.mark.parametrize(
@@ -15,18 +14,15 @@ def test_tune(install_test_package):
     with pytest.raises(PyAMLConfigException) as exc:
         ml: Accelerator = Accelerator.load("tests/config/bad_conf_duplicate_1.yaml")
     assert "MagnetArray HCORR : duplicate name SH1A-C02-H @index 2" in str(exc)
-    Factory.clear()
 
     with pytest.raises(PyAMLConfigException) as exc:
         ml: Accelerator = Accelerator.load("tests/config/bad_conf_duplicate_2.yaml")
     assert "BPMArray BPM : duplicate name BPM_C04-06 @index 3" in str(exc)
-    Factory.clear()
 
     with pytest.raises(PyAMLConfigException) as exc:
         ml: Accelerator = Accelerator.load("tests/config/bad_conf_duplicate_3.yaml")
     assert "element BPM_C04-06 already defined" in str(exc)
     assert "line 58, column 3" in str(exc)
-    Factory.clear()
 
     sr: Accelerator = Accelerator.load("tests/config/EBSTune.yaml")
     m1 = sr.live.get_magnet("QF1E-C04")
@@ -45,5 +41,3 @@ def test_tune(install_test_package):
     with pytest.raises(PyAMLException) as exc:
         m2 = sr.design.get_bpm("QF1A-C05XX")
     assert "BPM QF1A-C05XX not defined" in str(exc)
-
-    Factory.clear()

tests/test_ident_models.py

@@ -3,9 +3,7 @@
 
 from pyaml.accelerator import Accelerator
 from pyaml.configuration.factory import Factory
-from pyaml.magnet.cfm_magnet import CombinedFunctionMagnet
 from pyaml.magnet.hcorrector import HCorrector
-from pyaml.magnet.model import MagnetModel
 from pyaml.magnet.vcorrector import VCorrector
 
 
@@ -44,5 +42,3 @@ def test_cfm_magnets(magnet_file, install_test_package):
     assert np.abs(o[1] - 3.39661431e-07) < 1e-10
     assert np.abs(o[2] + 1.59928207e-06) < 1e-10
     assert np.abs(o[3] + 1.74771216e-05) < 1e-10
-
-    Factory.clear()

tests/test_load_quad.py

@@ -16,8 +16,6 @@
 )
 from pyaml.magnet.cfm_magnet import CombinedFunctionMagnet
 from pyaml.magnet.hcorrector import HCorrector
-from pyaml.magnet.identity_model import IdentityMagnetModel
-from pyaml.magnet.quadrupole import ConfigModel as QuadrupoleConfigModel
 from pyaml.magnet.quadrupole import Quadrupole
 
 # TODO: Generate JSON pydantic schema for MetaConfigurator

tests/test_ranges_cfm_deviceaccess.py

@@ -3,7 +3,6 @@
 
 from pyaml import PyAMLException
 from pyaml.accelerator import Accelerator
-from pyaml.configuration.factory import Factory
 
 
 def _in_range(vmin, vmax) -> float:
@@ -21,7 +20,9 @@ def _out_of_range(vmin, vmax) -> float:
         return float(vmax) + 0.1
     if vmin is not None:
         return float(vmin) - 0.1
-    raise RuntimeError("Unbounded range [None, None], cannot build an out-of-range value.")
+    raise RuntimeError(
+        "Unbounded range [None, None], cannot build an out-of-range value."
+    )
 
 
 @pytest.mark.parametrize(
@@ -34,7 +35,9 @@ def _out_of_range(vmin, vmax) -> float:
     ],
     indirect=["install_test_package"],
 )
-def test_cfm_ranges_from_yaml_are_propagated_and_enforced(magnet_file, install_test_package):
+def test_cfm_ranges_from_yaml_are_propagated_and_enforced(
+    magnet_file, install_test_package
+):
     sr: Accelerator = Accelerator.load(magnet_file)
     sr.design.get_lattice().disable_6d()
 
@@ -55,11 +58,13 @@ def test_cfm_ranges_from_yaml_are_propagated_and_enforced(magnet_file, install_t
     assert got_ranges == expected_ranges
 
     # Build an in-range current vector (3 values)
-    in_currents = np.array([
-        _in_range(*expected_ranges[0]),
-        _in_range(*expected_ranges[1]),
-        _in_range(*expected_ranges[2]),
-    ])
+    in_currents = np.array(
+        [
+            _in_range(*expected_ranges[0]),
+            _in_range(*expected_ranges[1]),
+            _in_range(*expected_ranges[2]),
+        ]
+    )
 
     # Convert currents -> strengths (vector size 3)
     in_strengths = m.model.compute_strengths(in_currents)
@@ -73,5 +78,3 @@ def test_cfm_ranges_from_yaml_are_propagated_and_enforced(magnet_file, install_t
 
     with pytest.raises(PyAMLException, match="out of range"):
         m.strengths.set(out_strengths)
-
-    Factory.clear()

tests/test_rf.py

@@ -3,7 +3,6 @@
 
 from pyaml.accelerator import Accelerator
 from pyaml.common.exception import PyAMLException
-from pyaml.configuration.factory import Factory
 
 
 def test_rf():
@@ -33,8 +32,6 @@ def test_rf():
         assert np.isclose(RF.frequency.get(), 3.523721693993786e8)
         assert np.isclose(RF.voltage.get(), 6.5e6)
 
-    Factory.clear()
-
 
 @pytest.mark.parametrize(
     "install_test_package",
@@ -85,8 +82,6 @@ def test_rf_multi(install_test_package):
     assert np.isclose(RF2.voltage.get(), 2e6)
     assert np.isclose(RFTRA_HARMONIC.voltage.get(), 3e5)
 
-    Factory.clear()
-
 
 @pytest.mark.parametrize(
     "install_test_package",
@@ -116,5 +111,3 @@ def test_rf_multi_notrans(install_test_package):
 
     # Check that frequency and voltage has been applied on the masterclock device
     assert np.isclose(RF.frequency.get(), 3.523e8)
-
-    Factory.clear()