changed some constant names

tangostationcontrol/tangostationcontrol/common/constants.py

@@ -56,17 +56,17 @@ class constants:
     N_beamlets_ctrl = 488
 
     # Maximum number of subbands we support
-    N_sub = 512
-    # Number of points per subband
-    N_sub_pts = 1024
+    N_subbands = 512
+    # Number of points per subband (the resolution)
+    N_subband_pts = 1024
 
     # Maximum number of antenna inputs we support (used to determine array sizes)
     MAX_INPUTS = 192
 
 
     # main clock frequency's are 200MHz and 160MHz
-    CLK_200 = 200_000_000
-    CLK_160 = 160_000_000
+    CLK_200_MHZ = 200_000_000
+    CLK_160_MHZ = 160_000_000
 
 
     # Maximum number of subbands for which we collect XSTs simultaneously

tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py

@@ -320,8 +320,8 @@ class Beamlet(opcua_device):
     def _subband_frequencies(subbands: numpy.ndarray, clock: int, nyquist_zones: numpy.ndarray) -> numpy.ndarray:
         """ Obtain the frequencies of each subband, given a clock and an antenna type. """
 
-        subband_width = clock / constants.N_sub_pts
-        base_subbands = nyquist_zones * constants.N_sub
+        subband_width = clock / constants.N_subband_pts
+        base_subbands = nyquist_zones * constants.N_subbands
 
         # broadcast clock across frequencies
         frequencies = (subbands + base_subbands) * subband_width

tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py

@@ -69,7 +69,7 @@ class SDP(opcua_device):
         dtype='DevVarDoubleArray',
         mandatory=False,
         # Emit a signal on subband 102
-        default_value=[[constants.DEFAULT_SUBBAND * float(constants.CLK_200) / constants.N_sub_pts] * S_pn] * N_pn
+        default_value=[[constants.DEFAULT_SUBBAND * float(constants.CLK_200_MHZ) / constants.N_subband_pts] * S_pn] * N_pn
     )
 
     FPGA_wg_phase_RW_default = device_property(
@@ -93,13 +93,13 @@ class SDP(opcua_device):
     FPGA_subband_weights_RW_default = device_property(
         dtype='DevVarULongArray',
         mandatory=False,
-        default_value=[[8192] * S_pn * constants.N_sub] * N_pn
+        default_value=[[8192] * S_pn * constants.N_subbands] * N_pn
     )
 
     clock_RW_default = device_property(
         dtype='DevULong',
         mandatory=False,
-        default_value = constants.CLK_200
+        default_value = constants.CLK_200_MHZ
     )
 
     TRANSLATOR_DEFAULT_SETTINGS = [
@@ -129,8 +129,8 @@ class SDP(opcua_device):
     FPGA_ring_use_cable_to_next_rn_RW = attribute_wrapper(comms_annotation=["FPGA_ring_use_cable_to_next_rn_RW"], datatype=bool, dims=(N_pn,), access=AttrWriteType.READ_WRITE)
     FPGA_ring_use_cable_to_previous_rn_R = attribute_wrapper(comms_annotation=["FPGA_ring_use_cable_to_previous_rn_R"], datatype=bool, dims=(N_pn,))
     FPGA_ring_use_cable_to_previous_rn_RW = attribute_wrapper(comms_annotation=["FPGA_ring_use_cable_to_previous_rn_RW"], datatype=bool, dims=(N_pn,), access=AttrWriteType.READ_WRITE)
-    FPGA_scrap_R = attribute_wrapper(comms_annotation=["FPGA_scrap_R"], datatype=numpy.int32, dims=(N_pn, constants.N_sub))
-    FPGA_scrap_RW = attribute_wrapper(comms_annotation=["FPGA_scrap_RW"], datatype=numpy.int32, dims=(N_pn, constants.N_sub), access=AttrWriteType.READ_WRITE)
+    FPGA_scrap_R = attribute_wrapper(comms_annotation=["FPGA_scrap_R"], datatype=numpy.int32, dims=(N_pn, constants.N_subbands))
+    FPGA_scrap_RW = attribute_wrapper(comms_annotation=["FPGA_scrap_RW"], datatype=numpy.int32, dims=(N_pn, constants.N_subbands), access=AttrWriteType.READ_WRITE)
     FPGA_sdp_info_antenna_band_index_R = attribute_wrapper(comms_annotation=["FPGA_sdp_info_antenna_band_index_R"], datatype=numpy.uint32, dims=(N_pn,))
     FPGA_sdp_info_block_period_R = attribute_wrapper(comms_annotation=["FPGA_sdp_info_block_period_R"], datatype=numpy.uint32, dims=(N_pn,))
     FPGA_sdp_info_f_adc_R = attribute_wrapper(comms_annotation=["FPGA_sdp_info_f_adc_R"], datatype=numpy.uint32, dims=(N_pn,))
@@ -141,8 +141,8 @@ class SDP(opcua_device):
     FPGA_sdp_info_observation_id_RW = attribute_wrapper(comms_annotation=["FPGA_sdp_info_observation_id_RW"], datatype=numpy.uint32, dims=(N_pn,), access=AttrWriteType.READ_WRITE)
     FPGA_sdp_info_station_id_R = attribute_wrapper(comms_annotation=["FPGA_sdp_info_station_id_R"], datatype=numpy.uint32, dims=(N_pn,))
     FPGA_sdp_info_station_id_RW = attribute_wrapper(comms_annotation=["FPGA_sdp_info_station_id_RW"], datatype=numpy.uint32, dims=(N_pn,), access=AttrWriteType.READ_WRITE)
-    FPGA_subband_weights_R = attribute_wrapper(comms_annotation=["FPGA_subband_weights_R"], datatype=numpy.uint32, dims=(N_pn, S_pn, constants.N_sub))
-    FPGA_subband_weights_RW = attribute_wrapper(comms_annotation=["FPGA_subband_weights_RW"], datatype=numpy.uint32, dims=(N_pn, S_pn, constants.N_sub), access=AttrWriteType.READ_WRITE)
+    FPGA_subband_weights_R = attribute_wrapper(comms_annotation=["FPGA_subband_weights_R"], datatype=numpy.uint32, dims=(N_pn, S_pn, constants.N_subbands))
+    FPGA_subband_weights_RW = attribute_wrapper(comms_annotation=["FPGA_subband_weights_RW"], datatype=numpy.uint32, dims=(N_pn, S_pn, constants.N_subbands), access=AttrWriteType.READ_WRITE)
     FPGA_time_since_last_pps_R = attribute_wrapper(comms_annotation=["FPGA_time_since_last_pps_R"], datatype=numpy.float_, dims=(N_pn,))
     FPGA_temp_R = attribute_wrapper(comms_annotation=["FPGA_temp_R"], datatype=numpy.float_, dims=(N_pn,))
     FPGA_wg_amplitude_R = attribute_wrapper(comms_annotation=["FPGA_wg_amplitude_R"], datatype=numpy.float_, dims=(N_pn, S_pn))
@@ -250,7 +250,7 @@ class SDP(opcua_device):
         return numpy.uint32(clocks_in_mask[0]) if clocks_in_mask else self.clock_RW_default
 
     def write_clock_RW(self, clock):
-        if clock not in (constants.CLK_160, constants.CLK_200):
+        if clock not in (constants.CLK_160_MHZ, constants.CLK_200_MHZ):
             raise ValueError(f"Unsupported clock frequency: {clock}")
 
         # Tell all FPGAs to use this clock

tangostationcontrol/tangostationcontrol/devices/sdp/sst.py

@@ -100,7 +100,7 @@ class SST(Statistics):
     # number of packets with invalid payloads
     nof_payload_errors_R    = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "nof_payload_errors"}, dims=(constants.N_pn,), datatype=numpy.uint64)
     # latest SSTs
-    sst_R                   = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "sst_values"}, dims=(constants.MAX_INPUTS, constants.N_sub), datatype=numpy.uint64)
+    sst_R                   = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "sst_values"}, dims=(constants.MAX_INPUTS, constants.N_subbands), datatype=numpy.uint64)
     # reported timestamp
     # for each row in the latest SSTs
     sst_timestamp_R         = attribute_wrapper(comms_id=StatisticsClient, comms_annotation={"type": "statistics", "parameter": "sst_timestamps"}, dims=(constants.MAX_INPUTS,), datatype=numpy.uint64)