diff --git a/tangostationcontrol/tangostationcontrol/devices/beam.py b/tangostationcontrol/tangostationcontrol/devices/beam.py
index 32372ee32676bda55f9d82f9443026c308428c5c..771358b442f4a3b18919510a98bd603c9f90f306 100644
--- a/tangostationcontrol/tangostationcontrol/devices/beam.py
+++ b/tangostationcontrol/tangostationcontrol/devices/beam.py
@@ -32,14 +32,6 @@ class Beam(lofar_device):
_hbat_pointing_direction = numpy.zeros((96,3), dtype=numpy.str)
_hbat_pointing_epoch = numpy.zeros(96, dtype=numpy.double)
- @property
- def hbat_pointing_direction(self):
- return tuple(self._hbat_pointing_direction)
-
- @property
- def hbat_pointing_epoch(self):
- return tuple(self._hbat_pointing_epoch)
-
# -----------------
# Device Properties
# -----------------
@@ -61,11 +53,11 @@ class Beam(lofar_device):
HBAT_pointing_direction_R = attribute(access=AttrWriteType.READ,
dtype=((numpy.str,),), max_dim_x=3, max_dim_y=96,
- fget=lambda self: self.hbat_pointing_direction)
+ fget=lambda self: self._hbat_pointing_direction)
HBAT_pointing_epoch_R = attribute(access=AttrWriteType.READ,
dtype=(numpy.double,), max_dim_x=96,
- fget=lambda self: self.hbat_pointing_epoch)
+ fget=lambda self: self._hbat_pointing_epoch)
RECV_name = 'stat/recv/1'
@@ -92,18 +84,6 @@ class Beam(lofar_device):
# internal functions
# --------
- def _set_pointing_directions(self, new_points: numpy.array):
- if new_points.shape != (96,3):
- raise ValueError(f"New pointing directions given as shape {new_points.shape}, must be (96,3)")
-
- self._hbat_pointing_direction = new_points
-
- def _set_pointing_epochs(self, new_points: numpy.array):
- if new_points.shape != (96,):
- raise ValueError(f"New pointing epochs given as shape {new_points.shape}, must be (96,)")
-
- self._hbat_pointing_epoch = new_points
-
def _HBAT_delays(self, pointing_direction: numpy.array, timestamp: datetime.datetime = datetime.datetime.now()):
"""
Calculate the delays (in seconds) based on the pointing list and the timestamp
@@ -151,33 +131,15 @@ class Beam(lofar_device):
# Only the entries within the mask have been updated:
# mask = False -> retain value, mask = True -> use new value
mask = self.recv_proxy.RCU_mask_RW
- pointing_epochs = numpy.tile([timestamp], 96)
for tile in range(96):
- if not mask[tile]:
- pointing_direction[tile] = self.hbat_pointing_direction[tile]
- pointing_epochs[tile] = self.hbat_pointing_epoch[tile]
-
- self._set_pointing_directions(pointing_direction)
- self._set_pointing_epochs(pointing_epochs)
+ if mask[tile]:
+ self._hbat_pointing_direction[tile] = pointing_direction[tile]
+ self._hbat_pointing_epoch[tile] = timestamp
# --------
# Commands
# --------
- @DebugIt()
- @command(dtype_in=(numpy.str,))
- @only_in_states([DevState.STANDBY, DevState.ON])
- def set_pointing_directions(self, new_points: numpy.array):
- new_points = numpy.array(new_points).reshape(96,3)
-
- self._set_pointing_directions(new_points)
-
- @DebugIt()
- @command(dtype_in=(numpy.double,))
- @only_in_states([DevState.STANDBY, DevState.ON])
- def set_pointing_epochs(self, new_points: numpy.array):
- self._set_pointing_epochs(new_points)
-
@command(dtype_out=str, doc_out="Name of newly installed measures directory")
@DebugIt()
@log_exceptions()
diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
index baee295253b87c529737eca4fe1aa3d9c08b1bc1..d71deb12afb881b39583475abb9039bc226e3773 100644
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
+++ b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
@@ -46,88 +46,6 @@ class TestBeamDevice(base.TestCase):
self.assertEqual(96, len(proxy.read_attribute(
"HBAT_pointing_epoch_R").value))
- def test_set_pointing_direction(self):
- """Verify can set pointings attribute without error"""
-
- with DeviceTestContext(beam.Beam, process=True) as proxy:
- proxy.init()
- proxy.Initialise()
- self.assertEqual(DevState.STANDBY, proxy.state())
-
- proxy.set_pointing_directions(numpy.zeros((96*3), dtype=numpy.str))
-
- def test_set_pointing_epochs(self):
- """Verify can set epochs attribute without error"""
-
- with DeviceTestContext(beam.Beam, process=True) as proxy:
- proxy.init()
- proxy.Initialise()
- self.assertEqual(DevState.STANDBY, proxy.state())
-
- proxy.set_pointing_epochs(numpy.zeros(96))
-
- def test_direction_pointing(self):
- """Set and Get test with actual values for pointing attribute"""
-
- with DeviceTestContext(beam.Beam, process=True) as proxy:
- proxy.init()
- proxy.Initialise()
- self.assertEqual(DevState.STANDBY, proxy.state())
-
- # Evaluate default all zeros are present using numpy array compare
- compare_obj = numpy.zeros((96,3), dtype=numpy.str) == proxy.read_attribute("HBAT_pointing_direction_R").value
- self.assertTrue(compare_obj.all())
-
- # Set direction pointings to range of incrementing values
- proxy.set_pointing_directions(numpy.array(["J2000","0deg", "0deg"] * 96))
-
- # Verify attribute has been updated with correct data
- compare_obj = numpy.array([["J2000","0deg", "0deg"]] * 96) == proxy.read_attribute("HBAT_pointing_direction_R").value
- self.assertTrue(compare_obj.all())
-
- def test_direction_epochs(self):
- """Set and Get test with actual values for pointing attribute"""
-
- with DeviceTestContext(beam.Beam, process=True) as proxy:
- proxy.init()
- proxy.Initialise()
- self.assertEqual(DevState.STANDBY, proxy.state())
-
- # Evaluate default all zeros are present using numpy array compare
- compare_obj = numpy.zeros(96) == proxy.read_attribute("HBAT_pointing_epoch_R").value
- self.assertTrue(compare_obj.all())
-
- # Set direction pointings to range of incrementing values
- proxy.set_pointing_epochs(numpy.arange(0,96))
-
- # Verify attribute has been updated with correct data
- compare_obj = numpy.arange(0,96) == proxy.read_attribute("HBAT_pointing_epoch_R").value
- self.assertTrue(compare_obj.all())
-
- def test_pointing_invalid(self):
- """Test that set pointings command refuses invalid lengths"""
-
- with DeviceTestContext(beam.Beam, process=True) as proxy:
- proxy.init()
- proxy.Initialise()
- self.assertEqual(DevState.STANDBY, proxy.state())
-
- # should return error due to invalid length
- with self.assertRaises(DevFailed):
- proxy.set_pointing_directions(numpy.zeros(55, dtype=numpy.str))
-
- def test_epoch_invalid(self):
- """Test that set epochs command refuses invalid lengths"""
-
- with DeviceTestContext(beam.Beam, process=True) as proxy:
- proxy.init()
- proxy.Initialise()
- self.assertEqual(DevState.STANDBY, proxy.state())
-
- # should return error due to invalid length
- with self.assertRaises(DevFailed):
- proxy.set_pointing_epochs(numpy.zeros(55))
-
def test_HBAT_delays_dims(self):
"""Verify HBAT delays are retrieved with correct dimensions"""
with DeviceTestContext(beam.Beam, process=True) as proxy: