Move ChromaticityMonitor from diagnostics to tuning tool.

examples/BESSY2_example/BESSY2Chroma.yaml

@@ -22,7 +22,7 @@ devices:
     type: pyaml_cs_oa.epicsR
     read_pvname: beam:twiss:y:tune
     unit: ''
-- type: pyaml.diagnostics.chromaticity_monitor
+- type: pyaml.tuning_tools.chromaticity_monitor
   name: KSI
   betatron_tune_name: BETATRON_TUNE
   rf_plant_name: RF

examples/SOLEIL_examples/tuning_tools.yaml

@@ -16,7 +16,7 @@
   quad_array_name: QCORR
   betatron_tune_name: BETATRON_TUNE
   quad_delta: 1e-3
-- type: pyaml.diagnostics.chromaticity_monitor
+- type: pyaml.tuning_tools.chromaticity_monitor
   name: DEFAULT_CHROMATICITY_MEASUREMENT
   betatron_tune_name: BETATRON_TUNE
   rf_plant_name: RF

pyaml/apidoc/gen_api.py

@@ -45,7 +45,7 @@
     "pyaml.control.deviceaccess",
     "pyaml.control.deviceaccesslist",
     "pyaml.control.readback_value",
-    "pyaml.diagnostics.chromaticity_monitor",
+    "pyaml.tuning_tools.chromaticity_monitor",
     "pyaml.diagnostics.tune_monitor",
     "pyaml.external.pySC_interface",
     "pyaml.lattice.abstract_impl",

pyaml/common/element_holder.py

@@ -13,13 +13,13 @@
 from ..arrays.serialized_magnet_array import SerializedMagnetsArray
 from ..bpm.bpm import BPM
 from ..common.exception import PyAMLException
-from ..diagnostics.chromaticity_monitor import ChomaticityMonitor
 from ..diagnostics.tune_monitor import BetatronTuneMonitor
 from ..magnet.cfm_magnet import CombinedFunctionMagnet
 from ..magnet.magnet import Magnet
 from ..magnet.serialized_magnet import SerializedMagnets
 from ..rf.rf_plant import RFPlant
 from ..rf.rf_transmitter import RFTransmitter
+from ..tuning_tools.chromaticity_monitor import ChomaticityMonitor
 from .element import Element
 
 if TYPE_CHECKING:

pyaml/tuning_tools/chromaticity.py

@@ -3,7 +3,7 @@
 
 from .. import PyAMLException
 from ..common.element import ElementConfigModel
-from ..diagnostics.chromaticity_monitor import ChomaticityMonitor
+from .chromaticity_monitor import ChomaticityMonitor
 from .response_matrix_data import ResponseMatrixData
 from .tuning_tool import TuningTool
 

tests/config/EBSOrbit.yaml

@@ -45,7 +45,7 @@ devices:
     type: tango.pyaml.attribute_read_only
     attribute: sys/ringsimulator/ebs/Tune_v
     unit: ""
-- type: pyaml.diagnostics.chromaticity_monitor
+- type: pyaml.tuning_tools.chromaticity_monitor
   name: CHROMATICITY_MONITOR
   betatron_tune_name: BETATRON_TUNE
   rf_plant_name: RF

tests/config/EBS_chromaticity.yaml

@@ -28,7 +28,7 @@ devices:
     type: tango.pyaml.attribute_read_only
     attribute: srdiag/beam-tune/main/Qv
     unit: "1"
-- type: pyaml.diagnostics.chromaticity_monitor
+- type: pyaml.tuning_tools.chromaticity_monitor
   name: CHROMATICITY_MONITOR
   betatron_tune_name: BETATRON_TUNE
   rf_plant_name: RF

tests/test_yellow_pages_basic.py

@@ -20,7 +20,7 @@
     .
 
 Tools:
-    CHROMATICITY_MONITOR (pyaml.diagnostics.chromaticity_monitor)
+    CHROMATICITY_MONITOR (pyaml.tuning_tools.chromaticity_monitor)
     DEFAULT_CHROMATICITY_RESPONSE_MATRIX (pyaml.tuning_tools.chromaticity_response_matrix)
     DEFAULT_CHROMATICITY_CORRECTION (pyaml.tuning_tools.chromaticity)
     DEFAULT_ORBIT_CORRECTION (pyaml.tuning_tools.orbit)