Adapting to recent commits in main.

Author: gupichon-soleil

tests/config/sr.yaml

@@ -1,4 +1,3 @@
-type: pyaml.pyaml
 type: pyaml.accelerator
 name: sr
 energy: 6e9

tests/config/sr_serialized_magnets.yaml

@@ -1,33 +1,31 @@
-type: pyaml.pyaml
-instruments:
-  - type: pyaml.instrument
-    name: sr
-    energy: 6e9
-    simulators:
-      - type: pyaml.lattice.simulator
-        lattice: sr/lattices/ebs.mat
-        name: design
-    data_folder: /data/store
-    devices:
-      - sr/quadrupoles/QF1AC01.yaml
-      - type: pyaml.magnet.serialized_magnet
-        name: mySeriesOfMagnets
-        function: B1
-        elements:
-          - QF8B-C04
-          - QF8D-C04
-          - QD5D-C04
-          - QF6D-C04
-          - QF4D-C04
-        model:
-          type: pyaml.magnet.linear_serialized_model
-          calibration_factors: 1.00504
-          calibration_offsets: 0.0
-          unit: m-1
-          curves: sr/magnet_models/quadcurve.yaml
-          powerconverters:
-            type: tango.pyaml.attribute
-            attribute: srmag/ps-corr-sh1/c01-a-ch1/current
-            unit: A
-      - sr/correctors/SH1AC01.yaml
-      - sr/correctors/SH1AC02.yaml
+type: pyaml.accelerator
+name: sr
+energy: 6e9
+simulators:
+  - type: pyaml.lattice.simulator
+    lattice: sr/lattices/ebs.mat
+    name: design
+data_folder: /data/store
+devices:
+  - sr/quadrupoles/QF1AC01.yaml
+  - type: pyaml.magnet.serialized_magnet
+    name: mySeriesOfMagnets
+    function: B1
+    elements:
+      - QF8B-C04
+      - QF8D-C04
+      - QD5D-C04
+      - QF6D-C04
+      - QF4D-C04
+    model:
+      type: pyaml.magnet.linear_serialized_model
+      calibration_factors: 1.00504
+      calibration_offsets: 0.0
+      unit: m-1
+      curves: sr/magnet_models/quadcurve.yaml
+      powerconverters:
+        type: tango.pyaml.attribute
+        attribute: srmag/ps-corr-sh1/c01-a-ch1/current
+        unit: A
+  - sr/correctors/SH1AC01.yaml
+  - sr/correctors/SH1AC02.yaml

tests/test_serialized_magnets.py

@@ -1,9 +1,8 @@
 import numpy as np
 import pytest
 
-from pyaml.pyaml import pyaml,PyAML
+from pyaml.accelerator import Accelerator
 from pyaml.configuration.factory import Factory
-from pyaml.instrument import Instrument
 
 
 def check_no_diff(array:list[np.float64]) -> bool:
@@ -25,8 +24,7 @@ def check_no_diff(array:list[np.float64]) -> bool:
     indirect=["install_test_package"],
 )
 def test_config_load(sr_file, install_test_package):
-    ml:PyAML = pyaml(sr_file)
-    sr:Instrument = ml.get('sr')
+    sr:Accelerator = Accelerator.load(sr_file)
     assert sr is not None
     magnets = [sr.design.get_element("QF8B-C04"),
                sr.design.get_element("QF8B-C04"),