Merge branch 'L2SS-1495-subband-in-bst' into 'main'

L2SS-1495: add subbands to statistics data

Closes L2SS-1495

See merge request !73

README.md

@@ -130,6 +130,7 @@ tox -e debug tests.requests.test_prometheus
 ```
 
 ## Releasenotes
+- 0.17.1 - Add missing `subbands` field to statistics data
 - 0.17.0 - Add gzip compression to HDF5 files in statistics writer
 - 0.16.3 - Fix AntennaField in filename
 - 0.16.2 - Fixed MultiStationObservation.all_connected

VERSION

-0.17.0
+0.17.1

lofar_station_client/statistics/statistics_data.py

@@ -165,8 +165,11 @@ class StatisticsData(ndarray):
     frequency_band: ndarray = attribute(optional=True)
     """ filter selection """
 
-    subband_frequency_range: ndarray = attribute(optional=True)
-    """ subband frequencies of subbands 0 and 511 """
+    sdp_subband_frequency_range: ndarray = attribute(optional=True)
+    """ subband frequencies of subbands 0 and 511, as assumed by SDP """
+
+    subbands: List[int] = attribute(optional=True)
+    """ Subband number for each beamlet """
 
 
 class StatisticsFileHeader:

lofar_station_client/statistics/writer/hdf5.py

@@ -400,7 +400,7 @@ class HDF5Writer(ABC):
                     "Failed to read from %s", self.antennafield_device.name()
                 )
             else:
-                matrix.subband_frequency_range = numpy.empty(
+                matrix.sdp_subband_frequency_range = numpy.empty(
                     (len(self.antenna_sdp_mapping), N_pol, 2), None
                 )
                 for antenna_nr, (fpga_nr, input_nr) in enumerate(
@@ -410,11 +410,15 @@ class HDF5Writer(ABC):
                         continue
 
                     # set for x polarisation
-                    matrix.subband_frequency_range[antenna_nr, 0] = subband_frequencies[
+                    matrix.sdp_subband_frequency_range[
+                        antenna_nr, 0
+                    ] = subband_frequencies[
                         (fpga_nr * A_pn * N_pol) + input_nr * N_pol + 0, (0, 511)
                     ]
                     # set for y polarisation
-                    matrix.subband_frequency_range[antenna_nr, 1] = subband_frequencies[
+                    matrix.sdp_subband_frequency_range[
+                        antenna_nr, 1
+                    ] = subband_frequencies[
                         (fpga_nr * A_pn * N_pol) + input_nr * N_pol + 1, (0, 511)
                     ]