From 6f84f13715da316625efe402b8604003de21e9b1 Mon Sep 17 00:00:00 2001 From: Teresia Olsson Date: Thu, 7 May 2026 18:36:56 +0200 Subject: [PATCH] Move ChromaticityMonitor from diagnostics to tuning tool. --- examples/BESSY2_example/BESSY2Chroma.yaml | 2 +- examples/SOLEIL_examples/tuning_tools.yaml | 2 +- pyaml/apidoc/gen_api.py | 2 +- pyaml/common/element_holder.py | 2 +- pyaml/tuning_tools/chromaticity.py | 2 +- pyaml/{diagnostics => tuning_tools}/chromaticity_monitor.py | 0 tests/config/EBSOrbit.yaml | 2 +- tests/config/EBS_chromaticity.yaml | 2 +- tests/test_yellow_pages_basic.py | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename pyaml/{diagnostics => tuning_tools}/chromaticity_monitor.py (100%) diff --git a/examples/BESSY2_example/BESSY2Chroma.yaml b/examples/BESSY2_example/BESSY2Chroma.yaml index 3060ff55..d8102adf 100644 --- a/examples/BESSY2_example/BESSY2Chroma.yaml +++ b/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 diff --git a/examples/SOLEIL_examples/tuning_tools.yaml b/examples/SOLEIL_examples/tuning_tools.yaml index 295b9d76..f155043e 100644 --- a/examples/SOLEIL_examples/tuning_tools.yaml +++ b/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 diff --git a/pyaml/apidoc/gen_api.py b/pyaml/apidoc/gen_api.py index 148e6873..98ca11b5 100644 --- a/pyaml/apidoc/gen_api.py +++ b/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", diff --git a/pyaml/common/element_holder.py b/pyaml/common/element_holder.py index 0d34d17e..6486e029 100644 --- a/pyaml/common/element_holder.py +++ b/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: diff --git a/pyaml/tuning_tools/chromaticity.py b/pyaml/tuning_tools/chromaticity.py index a57457cd..5016bf2b 100644 --- a/pyaml/tuning_tools/chromaticity.py +++ b/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 diff --git a/pyaml/diagnostics/chromaticity_monitor.py b/pyaml/tuning_tools/chromaticity_monitor.py similarity index 100% rename from pyaml/diagnostics/chromaticity_monitor.py rename to pyaml/tuning_tools/chromaticity_monitor.py diff --git a/tests/config/EBSOrbit.yaml b/tests/config/EBSOrbit.yaml index 39df579a..e7242328 100644 --- a/tests/config/EBSOrbit.yaml +++ b/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 diff --git a/tests/config/EBS_chromaticity.yaml b/tests/config/EBS_chromaticity.yaml index d7e45bcf..763187f8 100644 --- a/tests/config/EBS_chromaticity.yaml +++ b/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 diff --git a/tests/test_yellow_pages_basic.py b/tests/test_yellow_pages_basic.py index c3e84057..b0d944b3 100644 --- a/tests/test_yellow_pages_basic.py +++ b/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)