Merge branch 'L2SS-480-delays-to-beam-weights' into L2SS-523-delay-calibration-table

tangostationcontrol/tangostationcontrol/devices/beam.py

@@ -136,8 +136,8 @@ class Beam(lofar_device):
 
         # Record where we now point to, now that we've updated the weights.
         # Only the entries within the mask have been updated
-        mask = self.recv_proxy.RCU_mask_RW
-        for tile in range(32):
+        mask = self.recv_proxy.Ant_mask_RW.flatten()
+        for rcu in range(96):
             if mask[tile]:
                 self._hbat_pointing_direction[tile] = pointing_direction[tile]
                 self._hbat_pointing_timestamp[tile] = timestamp

tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py

@@ -10,7 +10,7 @@
 from tango import DevState
 from tango.test_context import DeviceTestContext
 
-from tangostationcontrol.devices import beam
+from tangostationcontrol.devices import beam, lofar_device
 
 import numpy
 import mock
@@ -23,21 +23,13 @@ class TestBeamDevice(base.TestCase):
     def setUp(self):
         super(TestBeamDevice, self).setUp()
 
-        # lofar_device init_device will launch a DeviceProxy not captured by
-        # the TestDeviceContext making it fail.
-
-        # Patch init_device and force match spec
-        init_patcher = mock.patch.object(
-            beam.Beam, 'init_device', spec=beam.Beam.init_device)
-        self.m_init = init_patcher.start()
-        self.addCleanup(init_patcher.stop)
-
         # Patch DeviceProxy to allow making the proxies during initialisation
         # that we otherwise avoid using
-        proxy_patcher = mock.patch.object(
-            beam, 'DeviceProxy')
-        self.m_init = proxy_patcher.start()
-        self.addCleanup(proxy_patcher.stop)
+        for device in [beam, lofar_device]:
+            proxy_patcher = mock.patch.object(
+                device, 'DeviceProxy')
+            proxy_patcher.start()
+            self.addCleanup(proxy_patcher.stop)
     
     def test_get_pointing_directions(self):
         """Verify can read pointings attribute and length matches without err"""