Management of attached devices per CS instance

Author: JeanLucPons

pyaml/bpm/bpm_model.py

@@ -12,67 +12,6 @@ class BPMModel(metaclass=ABCMeta):
     tilts.
     """
 
-    @abstractmethod
-    def read_position(self) -> NDArray[np.float64]:
-        """
-        Read horizontal and vertical positions from a BPM.
-        Returns
-        -------
-        NDArray[np.float64]
-            Array of shape (2,) containing the horizontal and vertical
-            positions
-        """
-        pass
-
-    @abstractmethod
-    def read_tilt(self) -> float:
-        """
-        Read the tilt value from a BPM.
-        Returns
-        -------
-        float
-            The tilt value of the BPM
-        """
-        pass
-
-    @abstractmethod
-    def read_offset(self) -> NDArray:
-        """
-        Read the offset values from a BPM.
-        Returns
-        -------
-        NDArray[np.float64]
-            Array of shape (2,) containing the horizontal and vertical
-            offsets
-        """
-        pass
-
-    @abstractmethod
-    def set_tilt(self, tilt: float):
-        """
-        Set the tilt value of a BPM.
-        Parameters
-        ----------
-        tilt : float
-            The tilt value to set for the BPM
-        Returns
-        -------
-        None
-        """
-        pass
-
-    @abstractmethod
-    def set_offset(self, offset: NDArray[np.float64]):
-        """
-        Set the offset values of a BPM
-        Parameters
-        ----------
-        offset_values : NDArray[np.float64]
-            Array of shape (2,) containing the horizontal and vertical
-            offsets to set for the BPM
-        """
-        pass
-
     @abstractmethod
     def get_pos_devices(self) -> list[DeviceAccess]:
         """
@@ -86,7 +25,7 @@ def get_pos_devices(self) -> list[DeviceAccess]:
         pass
 
     @abstractmethod
-    def get_tilt_device(self) -> DeviceAccess:
+    def get_tilt_device(self) -> DeviceAccess | None:
         """
         Get device handle used for tilt access
 

pyaml/bpm/bpm_simple_model.py

@@ -28,66 +28,9 @@ class BPMSimpleModel(BPMModel):
 
     def __init__(self, cfg: ConfigModel):
         self._cfg = cfg
-
         self.__x_pos = cfg.x_pos
         self.__y_pos = cfg.y_pos
 
-    def read_position(self) -> NDArray:
-        """
-        Simulate reading the position values from a BPM.
-        Returns
-        -------
-        np.ndarray
-            Array of shape (2,) containing the horizontal and vertical
-            positions
-        """
-        return np.array([self.__x_pos.get(), self.__y_pos.get()])
-
-    def read_tilt(self) -> float:
-        """
-        Simulate reading the tilt value from a BPM.
-        Returns
-        -------
-        float
-            The tilt value of the BPM
-        """
-        raise NotImplementedError("Tilt reading not implemented in this model.")
-
-    def read_offset(self) -> NDArray:
-        """
-        Simulate reading the offset values from a BPM.
-        Returns
-        -------
-        np.ndarray
-            Array of shape (2,) containing the horizontal and vertical
-            offsets
-        """
-        raise NotImplementedError("Offset reading not implemented in this model.")
-
-    def set_tilt(self, tilt: float):
-        """
-        Simulate setting the tilt value of a BPM.
-        Parameters
-        ----------
-        tilt : float
-            The tilt value to set for the BPM
-        Returns
-        -------
-        None
-        """
-        raise NotImplementedError("Tilt setting not implemented in this model.")
-
-    def set_offset(self, offset_values: np.ndarray):
-        """
-        Simulate setting the offset values of a BPM
-        Parameters
-        ----------
-        offset_values : np.ndarray
-            Array of shape (2,) containing the horizontal and vertical
-            offsets to set for the BPM
-        """
-        raise NotImplementedError("Offset setting not implemented in this model.")
-
     def get_pos_devices(self) -> list[DeviceAccess]:
         """
         Get device handles used for position reading
@@ -108,7 +51,7 @@ def get_tilt_device(self) -> DeviceAccess:
         list[DeviceAccess]
             Array of DeviceAcess
         """
-        return []
+        return None
 
     def get_offset_devices(self) -> list[DeviceAccess]:
         """
@@ -119,7 +62,7 @@ def get_offset_devices(self) -> list[DeviceAccess]:
         list[DeviceAccess]
             Array of DeviceAcess
         """
-        return []
+        return [None, None]
 
     def __repr__(self):
         return __pyaml_repr__(self)

pyaml/bpm/bpm_tiltoffset_model.py

@@ -41,52 +41,6 @@ def __init__(self, cfg: ConfigModel):
         self.__y_offset = cfg.y_offset
         self.__tilt = cfg.tilt
 
-    def read_tilt(self) -> float:
-        """
-        Simulate reading the tilt value from a BPM.
-        Returns
-        -------
-        float
-            The tilt value of the BPM
-        """
-        return self.__tilt.get()
-
-    def read_offset(self) -> NDArray:
-        """
-        Simulate reading the offset values from a BPM.
-        Returns
-        -------
-        np.ndarray
-            Array of shape (2,) containing the horizontal and vertical
-            offsets
-        """
-        return np.array([self.__x_offset.get(), self.__y_offset.get()])
-
-    def set_tilt(self, tilt: float):
-        """
-        Simulate setting the tilt value of a BPM.
-        Parameters
-        ----------
-        tilt : float
-            The tilt value to set for the BPM
-        Returns
-        -------
-        None
-        """
-        self.__tilt.set(tilt)
-
-    def set_offset(self, offset_values: np.ndarray):
-        """
-        Simulate setting the offset values of a BPM
-        Parameters
-        ----------
-        offset_values : np.ndarray
-            Array of shape (2,) containing the horizontal and vertical
-            offsets to set for the BPM
-        """
-        self.__x_offset.set(offset_values[0])
-        self.__y_offset.set(offset_values[1])
-
     def get_pos_devices(self) -> list[DeviceAccess]:
         """
         Get device handles used for position reading
@@ -107,7 +61,7 @@ def get_tilt_device(self) -> DeviceAccess:
         DeviceAccess
             DeviceAcess
         """
-        return [self.__tilt]
+        return self.__tilt
 
     def get_offset_devices(self) -> list[DeviceAccess]:
         """