Changed get_signals to create_signals

Author: oliwenmandiamond

src/dodal/devices/electron_analyser/abstract_analyser.py

@@ -70,15 +70,15 @@ def __init__(self, prefix: str, name: str = "") -> None:
             self.acquisition_mode = epics_signal_rw(str, prefix + "ACQ_MODE")
 
             # Read once per scan after data acquired
-            self.energy_axis = self._get_energy_axis_signal(prefix)
+            self.energy_axis = self._create_energy_axis_signal(prefix)
             self.binding_energy_axis = derived_signal_r(
                 self._calculate_binding_energy_axis,
                 "eV",
                 energy_axis=self.energy_axis,
                 excitation_energy=self.excitation_energy,
                 energy_mode=self.energy_mode,
             )
-            self.angle_axis = self._get_angle_axis_signal(prefix)
+            self.angle_axis = self._create_angle_axis_signal(prefix)
             self.step_time = epics_signal_r(float, prefix + "AcquireTime")
             self.total_steps = epics_signal_r(int, prefix + "TOTAL_POINTS_RBV")
             self.total_time = derived_signal_r(
@@ -92,13 +92,17 @@ def __init__(self, prefix: str, name: str = "") -> None:
         super().__init__(prefix=prefix, name=name)
 
     @abstractmethod
-    def _get_angle_axis_signal(self, prefix: str = "") -> SignalR[Array1D[np.float64]]:
+    def _create_angle_axis_signal(
+        self, prefix: str = ""
+    ) -> SignalR[Array1D[np.float64]]:
         """
         The signal that defines the angle axis. Depends on analyser model.
         """
 
     @abstractmethod
-    def _get_energy_axis_signal(self, prefix: str = "") -> SignalR[Array1D[np.float64]]:
+    def _create_energy_axis_signal(
+        self, prefix: str = ""
+    ) -> SignalR[Array1D[np.float64]]:
         """
         The signal that defines the energy axis. Depends on analyser model.
         """

src/dodal/devices/electron_analyser/specs_analyser.py

@@ -25,9 +25,7 @@ def __init__(self, prefix: str, name: str = "") -> None:
 
         super().__init__(prefix, name)
 
-    def _get_angle_axis_signal(self, prefix: str = "") -> SignalR:
-        if hasattr(self, "angle_axis"):
-            return self.angle_axis
+    def _create_angle_axis_signal(self, prefix: str = "") -> SignalR:
         angle_axis = derived_signal_r(
             self._calculate_angle_axis,
             min_angle=self.min_angle_axis,
@@ -46,9 +44,7 @@ def _calculate_angle_axis(
         axis = np.array([min_angle + offset + i * width for i in range(slices)])
         return axis
 
-    def _get_energy_axis_signal(self, prefix: str = "") -> SignalR:
-        if hasattr(self, "energy_axis"):
-            return self.energy_axis
+    def _create_energy_axis_signal(self, prefix: str = "") -> SignalR:
         energy_axis = derived_signal_r(
             self._calculate_energy_axis,
             "eV",

src/dodal/devices/electron_analyser/vgscienta_analyser.py

@@ -32,20 +32,14 @@ def __init__(self, prefix: str, name: str = "") -> None:
 
         super().__init__(prefix, name)
 
-    def _get_energy_axis_signal(self, prefix: str = "") -> SignalR[Array1D[np.float64]]:
-        """
-        Override abstract and return epics signal
-        """
-        if hasattr(self, "energy_axis"):
-            return self.energy_axis
+    def _create_energy_axis_signal(
+        self, prefix: str = ""
+    ) -> SignalR[Array1D[np.float64]]:
         return epics_signal_r(Array1D[np.float64], prefix + "X_SCALE_RBV")
 
-    def _get_angle_axis_signal(self, prefix: str = "") -> SignalR[Array1D[np.float64]]:
-        """
-        Override abstract and return epics signal
-        """
-        if hasattr(self, "angle_axis"):
-            return self.angle_axis
+    def _create_angle_axis_signal(
+        self, prefix: str = ""
+    ) -> SignalR[Array1D[np.float64]]:
         return epics_signal_r(Array1D[np.float64], prefix + "Y_SCALE_RBV")
 
     @property