Move excitation data models from configuration to magnet

examples/ESRF_tune_example/esrf_tune_example_no_yaml.py

@@ -22,10 +22,10 @@
 from pyaml.arrays.magnet import ConfigModel as MagnetArrayConfigModel
 from pyaml.arrays.magnet import Magnet
 from pyaml.configuration import set_root_folder
-from pyaml.configuration.csvcurve import ConfigModel as CSVCureveConfig
-from pyaml.configuration.csvcurve import CSVCurve
 from pyaml.lattice.simulator import ConfigModel as SimulatorConfigModel
 from pyaml.lattice.simulator import Simulator
+from pyaml.magnet.csvcurve import ConfigModel as CSVCureveConfig
+from pyaml.magnet.csvcurve import CSVCurve
 from pyaml.magnet.linear_model import (
     ConfigModel as LinearMagnetModelConfig,
 )

pyaml/apidoc/gen_api.py

@@ -31,15 +31,15 @@
     "pyaml.common.element",
     "pyaml.common.element_holder",
     "pyaml.common.exception",
-    "pyaml.configuration.csvcurve",
-    "pyaml.configuration.csvmatrix",
-    "pyaml.configuration.curve",
+    "pyaml.magnet.csvcurve",
+    "pyaml.magnet.csvmatrix",
+    "pyaml.magnet.curve",
     "pyaml.configuration.factory",
     "pyaml.configuration.fileloader",
-    "pyaml.configuration.inline_curve",
-    "pyaml.configuration.inline_matrix",
+    "pyaml.magnet.inline_curve",
+    "pyaml.magnet.inline_matrix",
     "pyaml.configuration.manager",
-    "pyaml.configuration.matrix",
+    "pyaml.magnet.matrix",
     "pyaml.control.abstract_impl",
     "pyaml.control.controlsystem",
     "pyaml.control.deviceaccess",
@@ -126,7 +126,7 @@ def generate_selective_module(m):
             if m in ["pyaml.arrays.element_array"]:
                 # Include special members for operator overloading
                 file.write("         :special-members: __add__, __and__, __or__, __sub__ \n")
-            if m in ["pyaml.yellow_pages", "pyaml.configuration.manager"]:
+            if m in ["pyaml.yellow_pages", "pyaml.magnet.manager"]:
                 # Include special members for exploratory overloading
                 file.write("         :special-members: __dir__, __getattr__, __getitem__, __repr__, __str__ \n")
             file.write("         :exclude-members: model_config\n")

pyaml/magnet/linear_cfm_model.py

@@ -3,9 +3,9 @@
 
 from ..common.element import __pyaml_repr__
 from ..common.exception import PyAMLException
-from ..configuration.curve import Curve
-from ..configuration.matrix import Matrix
 from ..control.deviceaccess import DeviceAccess
+from .curve import Curve
+from .matrix import Matrix
 from .model import MagnetModel
 
 # Define the main class name for this module

pyaml/magnet/linear_model.py

@@ -2,8 +2,8 @@
 from pydantic import BaseModel, ConfigDict
 
 from ..common.element import __pyaml_repr__
-from ..configuration.curve import Curve
 from ..control.deviceaccess import DeviceAccess
+from .curve import Curve
 from .model import MagnetModel
 
 # Define the main class name for this module

pyaml/magnet/linear_serialized_model.py

@@ -3,13 +3,13 @@
 
 from ..common.element import __pyaml_repr__
 from ..common.exception import PyAMLException
-from ..configuration.curve import Curve
-from ..configuration.inline_curve import ConfigModel as InlineCurveModel
-from ..configuration.inline_curve import InlineCurve
-from ..configuration.matrix import Matrix
 from ..control.deviceaccess import DeviceAccess
+from .curve import Curve
+from .inline_curve import ConfigModel as InlineCurveModel
+from .inline_curve import InlineCurve
 from .linear_model import ConfigModel as LinearConfigModel
 from .linear_model import LinearMagnetModel
+from .matrix import Matrix
 from .model import MagnetModel
 
 # Define the main class name for this module

pyaml/magnet/spline_model.py

@@ -3,8 +3,8 @@
 from scipy.interpolate import make_smoothing_spline
 
 from ..common.element import __pyaml_repr__
-from ..configuration.curve import Curve
 from ..control.deviceaccess import DeviceAccess
+from .curve import Curve
 from .model import MagnetModel
 
 # Define the main class name for this module

tests/config/EBSNames.yaml

@@ -19,7 +19,7 @@ devices:
     calibration_factor: 1.00054
     crosstalk: 1.0
     curve:
-      type: pyaml.configuration.csvcurve
+      type: pyaml.magnet.csvcurve
       file: sr/magnet_models/QF1_strength.csv
     unit: 1/m
     powerconverter:
@@ -34,7 +34,7 @@ devices:
     calibration_factor: 1.00054
     crosstalk: 1.0
     curve:
-      type: pyaml.configuration.csvcurve
+      type: pyaml.magnet.csvcurve
       file: sr/magnet_models/QF1_strength.csv
     unit: 1/m
     powerconverter:
@@ -49,7 +49,7 @@ devices:
     calibration_factor: 0.996841
     crosstalk: 1.0
     curve:
-      type: pyaml.configuration.csvcurve
+      type: pyaml.magnet.csvcurve
       file: sr/magnet_models/QF1_strength.csv
     unit: 1/m
     powerconverter:
@@ -64,7 +64,7 @@ devices:
     calibration_factor: 1.00191
     crosstalk: 1.0
     curve:
-      type: pyaml.configuration.csvcurve
+      type: pyaml.magnet.csvcurve
       file: sr/magnet_models/QF1_strength.csv
     unit: 1/m
     powerconverter:
@@ -79,7 +79,7 @@ devices:
     calibration_factor: 1.00191
     crosstalk: 1.0
     curve:
-      type: pyaml.configuration.csvcurve
+      type: pyaml.magnet.csvcurve
       file: sr/magnet_models/QF1_strength.csv
     unit: 1/m
     powerconverter:
@@ -94,7 +94,7 @@ devices:
     calibration_factor: 1.00191
     crosstalk: 1.0
     curve:
-      type: pyaml.configuration.csvcurve
+      type: pyaml.magnet.csvcurve
       file: sr/magnet_models/QF1_strength.csv
     unit: 1/m
     powerconverter: