L2SS-633: fix bst bugs

tangostationcontrol/tangostationcontrol/devices/sdp/bst.py

@@ -18,14 +18,14 @@ from tangostationcontrol.common.entrypoint import entry
 from tangostationcontrol.clients.attribute_wrapper import attribute_wrapper
 from tangostationcontrol.clients.opcua_client import OPCUAConnection
 from tangostationcontrol.clients.statistics_client import StatisticsClient
-from tangostationcontrol.devices.lofar_device import lofar_device
+from tangostationcontrol.devices.sdp.statistics import Statistics
 from tangostationcontrol.devices.sdp.statistics_collector import BSTCollector
 
 import numpy
 
 __all__ = ["BST", "main"]
 
-class BST(lofar_device):
+class BST(Statistics):
     STATISTICS_COLLECTOR_CLASS = BSTCollector
 
     # -----------------
@@ -85,7 +85,7 @@ class BST(lofar_device):
     # number of packets with invalid payloads
     nof_payload_errors_R    = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "nof_payload_errors"}, dims=(BSTCollector.MAX_FPGAS,), datatype=numpy.uint64)
     # latest BSTs
-    bst_R                   = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "bst_values"}, dims=(BSTCollector.MAX_BLOCKS, BSTCollector.MAX_BEAMLETS), datatype=numpy.uint64)
+    bst_R                   = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "bst_values"}, dims=(BSTCollector.MAX_BEAMLETS, BSTCollector.MAX_BLOCKS), datatype=numpy.uint64)
     # reported timestamp
     # for each row in the latest BSTs
     bst_timestamp_R         = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "bst_timestamps"}, dims=(BSTCollector.MAX_BLOCKS,), datatype=numpy.uint64)