Added connect() function, removed init_cs()

Author: JeanLucPons

pyaml/accelerator.py

@@ -50,7 +50,6 @@ def __init__(self, cfg: ConfigModel):
                 else:
                     # Add as dynacmic attribute
                     setattr(self, c.name(), c)
-                c.init_cs()
                 c.fill_device(cfg.devices)
 
         if cfg.simulators is not None:

pyaml/control/controlsystem.py

@@ -27,6 +27,7 @@
 from ..rf.rf_plant import RFPlant, RWTotalVoltage
 from ..rf.rf_transmitter import RFTransmitter
 from ..tuning_tools.tune import Tune
+from .deviceaccess import DeviceAccess
 
 
 class ControlSystem(ElementHolder, metaclass=ABCMeta):
@@ -38,8 +39,9 @@ def __init__(self):
         ElementHolder.__init__(self)
 
     @abstractmethod
-    def init_cs(self):
-        """Initialize control system"""
+    def connect(self, dev: DeviceAccess) -> DeviceAccess:
+        """Return a new instance of the DeviceAccess object
+        coming from configuration attached to this CS"""
         pass
 
     @abstractmethod

tests/dummy_cs/tango-pyaml/tango/pyaml/controlsystem.py

@@ -1,8 +1,10 @@
+import copy
 import os
 
 from pydantic import BaseModel, ConfigDict
 
 from pyaml.control.controlsystem import ControlSystem
+from pyaml.control.deviceaccess import DeviceAccess
 
 PYAMLCLASS: str = "TangoControlSystem"
 
@@ -21,6 +23,16 @@ def __init__(self, cfg: ConfigModel):
         self._cfg = cfg
         print(f"Creating dummy TangoControlSystem: {cfg.name}")
 
+    def connect(self, dev: DeviceAccess) -> DeviceAccess:
+        newDev = copy.copy(dev)  # Shallow copy the object
+        newDev._cfg = copy.copy(
+            dev._cfg
+        )  # Shallow copy the config object to allow a new attribute name
+        newDev._cfg.attribute = (
+            "//" + self._cfg.tango_host + "/" + newDev._cfg.attribute
+        )
+        return newDev
+
     def name(self) -> str:
         return self._cfg.name