Skip to content

Commit 6039fc3

Browse files
Reverted formatting of create_signal functions from merge
1 parent b157c86 commit 6039fc3

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

src/dodal/devices/electron_analyser/abstract_analyser.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,13 @@ def __init__(self, prefix: str, name: str = "") -> None:
9292
super().__init__(prefix=prefix, name=name)
9393

9494
@abstractmethod
95-
def _create_angle_axis_signal(
96-
self, prefix: str = ""
97-
) -> SignalR[Array1D[np.float64]]:
95+
def _create_angle_axis_signal(self, prefix: str) -> SignalR[Array1D[np.float64]]:
9896
"""
9997
The signal that defines the angle axis. Depends on analyser model.
10098
"""
10199

102100
@abstractmethod
103-
def _create_energy_axis_signal(
104-
self, prefix: str = ""
105-
) -> SignalR[Array1D[np.float64]]:
101+
def _create_energy_axis_signal(self, prefix: str) -> SignalR[Array1D[np.float64]]:
106102
"""
107103
The signal that defines the energy axis. Depends on analyser model.
108104
"""

src/dodal/devices/electron_analyser/specs_analyser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def __init__(self, prefix: str, name: str = "") -> None:
2525

2626
super().__init__(prefix, name)
2727

28-
def _create_angle_axis_signal(self, prefix: str = "") -> SignalR:
28+
def _create_angle_axis_signal(self, prefix: str) -> SignalR[Array1D[np.float64]]:
2929
angle_axis = derived_signal_r(
3030
self._calculate_angle_axis,
3131
min_angle=self.min_angle_axis,
@@ -44,7 +44,7 @@ def _calculate_angle_axis(
4444
axis = np.array([min_angle + offset + i * width for i in range(slices)])
4545
return axis
4646

47-
def _create_energy_axis_signal(self, prefix: str = "") -> SignalR:
47+
def _create_energy_axis_signal(self, prefix: str) -> SignalR[Array1D[np.float64]]:
4848
energy_axis = derived_signal_r(
4949
self._calculate_energy_axis,
5050
"eV",

src/dodal/devices/electron_analyser/vgscienta_analyser.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,10 @@ def __init__(self, prefix: str, name: str = "") -> None:
3232

3333
super().__init__(prefix, name)
3434

35-
def _create_energy_axis_signal(
36-
self, prefix: str = ""
37-
) -> SignalR[Array1D[np.float64]]:
35+
def _create_energy_axis_signal(self, prefix: str) -> SignalR[Array1D[np.float64]]:
3836
return epics_signal_r(Array1D[np.float64], prefix + "X_SCALE_RBV")
3937

40-
def _create_angle_axis_signal(
41-
self, prefix: str = ""
42-
) -> SignalR[Array1D[np.float64]]:
38+
def _create_angle_axis_signal(self, prefix: str) -> SignalR[Array1D[np.float64]]:
4339
return epics_signal_r(Array1D[np.float64], prefix + "Y_SCALE_RBV")
4440

4541
@property

0 commit comments

Comments
 (0)