diff --git a/README.md b/README.md index 4b2c1f521e9ded0406e1829b7e3949fa9d5628a2..37532cf01fadf507dfef69df4ecd10c8d5250f31 100644 --- a/README.md +++ b/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 diff --git a/VERSION b/VERSION index c5523bd09b187d88eb8caeb979852a301d6c2728..7cca7711a0ddd81316ff859b8424d417b3a60b0b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.17.0 +0.17.1 diff --git a/lofar_station_client/statistics/statistics_data.py b/lofar_station_client/statistics/statistics_data.py index 82c303561b9478268c1812117dd35e8768bb65af..16b2ecd4c7a130bff00d4a1b3aa81e0d2ca533b5 100644 --- a/lofar_station_client/statistics/statistics_data.py +++ b/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: diff --git a/lofar_station_client/statistics/writer/hdf5.py b/lofar_station_client/statistics/writer/hdf5.py index aa11a5dd94abb897513ad63096729a3eba4d2fb2..3bf0c048fb92f960906a04ffb12caacc52339a20 100644 --- a/lofar_station_client/statistics/writer/hdf5.py +++ b/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) ]