diff --git a/tangostationcontrol/tangostationcontrol/devices/beam.py b/tangostationcontrol/tangostationcontrol/devices/beam.py index e4a85594a0cb9efeb18e0e3eea2d8779814d9197..bb5d962c51fd75007f97b403d8148687ede119c2 100644 --- a/tangostationcontrol/tangostationcontrol/devices/beam.py +++ b/tangostationcontrol/tangostationcontrol/devices/beam.py @@ -98,7 +98,8 @@ class Beam(lofar_device): return delays - def _calculate_HBAT_bf_delays(self, delays: numpy.ndarray): + @staticmethod + def _calculate_HBAT_bf_delays(delays: numpy.ndarray): """ Helper function that converts a signal path delay (in seconds) to an analog beam weight, which is a value per tile per dipole per polarisation. @@ -181,22 +182,6 @@ class Beam(lofar_device): return delays.flatten() - @command(dtype_in=DevVarFloatArray, dtype_out=DevVarLong64Array) - @DebugIt() - @log_exceptions() - @only_in_states([DevState.ON]) - def calculate_HBAT_bf_delays(self, delays: numpy.ndarray): - """ - Helper function that converts a signal path delay (in seconds) to an analog beam weight, - which is a value per tile per dipole per polarisation. - """ - - delays = delays.reshape(96,16) - - result = self._calculate_HBAT_bf_delays(delays) - - return result.flatten() - @command(dtype_in=DevVarStringArray) @DebugIt() @only_in_states([DevState.ON]) diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py index 74bdf3eec9a7e01d541ae53eed391114f00bee41..bb89efc7a579cbb74182401c884713db4e32a116 100644 --- a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py +++ b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py @@ -78,5 +78,5 @@ class TestBeamDevice(base.TestCase): # verify if values are actually transformed HBAT_delays = proxy.HBAT_delays(numpy.array([["J2000","0deg","0deg"]] * 96).flatten()) - HBAT_bf_delays = proxy.calculate_HBAT_bf_delays(HBAT_delays) + HBAT_bf_delays = beam.Beam._calculate_HBAT_bf_delays(HBAT_delays) self.assertNotEqual(HBAT_delays, HBAT_bf_delays)