Remove pySC

.github/workflows/tests.yml

@@ -32,6 +32,7 @@ jobs:
         pip install scipy
         pip install pydantic
         pip install accelerator-toolbox
+        pip install accelerator-commissioning
         pip install matplotlib
         pip install h5py
         pip install PyYaml

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "pyaml/external/pySC"]
-	path = pyaml/external/pySC
-	url = https://github.com/kparasch/pySC.git

pyaml/tuning_tools/dispersion.py

@@ -3,9 +3,9 @@
 from typing import List, Optional
 
 from pydantic import BaseModel, ConfigDict
+from pySC.apps import measure_dispersion
 
 from ..common.element_holder import ElementHolder
-from ..external.pySC.pySC.apps import measure_dispersion
 from ..external.pySC_interface import pySCInterface
 
 logger = logging.getLogger(__name__)

pyaml/tuning_tools/orbit.py

@@ -12,14 +12,14 @@
 
 if TYPE_CHECKING:
     from ..common.element_holder import ElementHolder
-# from ..external.pySC.pySC import ResponseMatrix as pySC_ResponseMatrix
+from pySC import ResponseMatrix as pySC_ResponseMatrix
+from pySC.apps import orbit_correction
+
 from ..arrays.magnet_array import MagnetArray
 from ..common.element import Element, ElementConfigModel
 from ..common.exception import PyAMLException
 from ..configuration.factory import Factory
 from ..configuration.fileloader import get_path, load
-from ..external.pySC.pySC import ResponseMatrix as pySC_ResponseMatrix
-from ..external.pySC.pySC.apps import orbit_correction
 from ..external.pySC_interface import pySCInterface
 from .response_matrix import ResponseMatrix
 

pyaml/tuning_tools/orbit_response_matrix.py

@@ -2,13 +2,13 @@
 from pathlib import Path
 from typing import List, Optional
 
+import pySC
 from pydantic import BaseModel, ConfigDict
+from pySC.apps import measure_ORM
+from pySC.apps.codes import ResponseCode
 
 from ..common.element_holder import ElementHolder
 from ..common.exception import PyAMLException
-from ..external.pySC import pySC
-from ..external.pySC.pySC.apps import measure_ORM
-from ..external.pySC.pySC.apps.codes import ResponseCode
 from ..external.pySC_interface import pySCInterface
 
 logger = logging.getLogger(__name__)

pyaml/tuning_tools/response_matrix.py

@@ -32,8 +32,3 @@ class ConfigModel(BaseModel):
 class ResponseMatrix(object):
     def __init__(self, cfg: ConfigModel):
         self._cfg = cfg
-
-        # self.matrix = cfg.matrix
-        # self.input_names = cfg.input_names
-        # self.output_names = cfg.output_names
-        # self.rf_response = cfg.rf_response

pyproject.toml

@@ -45,6 +45,7 @@ dependencies = [
     "accelerator-toolbox>=0.6.1",
     "PyYAML>=6.0.2",
     "pydantic>=2.11.7",
+    "accelerator-commissioning==0.4.0", #pySC
     "h5py",
     "matplotlib"
 ]