L2SS-769: Fix circular dependencies, types

tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py

@@ -189,14 +189,19 @@ class SDP(opcua_device):
     antenna_type_R = attribute(doc='Type of antenna (LBA or HBA) attached to the FPGAs',
                                dtype=numpy.str, fget=lambda self: self.AntennaType)
     nyquist_zone_R = attribute(doc='Nyquist zone of the input frequencies',
-                               dtype=numpy.uint32, fisallowed="is_attribute_Wrapper_allowed",
+                               dtype=numpy.uint32, fisallowed="is_attribute_wrapper_allowed",
                                polling_period=1000, abs_change=1)
     clock_RW = attribute(doc='Configured sampling clock (Hz)',
-                         dtype=numpy.uint32, access=AttrWriteType.READ_WRITE, fisallowed="is_attribute_Wrapper_allowed",
+                         dtype=numpy.uint32, access=AttrWriteType.READ_WRITE, fisallowed="is_attribute_wrapper_allowed",
                          polling_period=1000, abs_change=1)
 
-    def read_nyquist_zone_R(self) -> int:
-        """ Return the nyquist zone of the given antenna. """
+    def _nyquist_zone(self, clock):
+        """ Return the Nyquist zone for the given clock (in Hz).
+
+            The Nyquist zone determines the frequency offset of
+            the antennas.
+        
+            NOTE: Only 160 and 200 MHz clocks are supported. """
 
         # (AntennaType, clockMHz) -> Nyquist zone
         nyquist_zones = {
@@ -207,10 +212,12 @@ class SDP(opcua_device):
         }
 
         try:
-            return nyquist_zones[(self.AntennaType), (self.read_attribute("clock_RW") // 1000000)]
+            return nyquist_zones[(self.AntennaType), clock // 1000000]
         except KeyError:
-            return -1
-            #raise ValueError(f"Could not determine Nyquist zone for antenna type {self.AntennaType} clock {self._clock}")
+            raise ValueError(f"Could not determine Nyquist zone for antenna type {self.AntennaType} with clock {clock} Hz")
+
+    def read_nyquist_zone_R(self):
+        return self._nyquist_zone(self.read_attribute("clock_RW"))
 
     def read_clock_RW(self):
         # We can only return a single value, so we assume the FPGA is configured coherently. Which is something
@@ -220,7 +227,7 @@ class SDP(opcua_device):
         clocks_in_mask = [clock for idx,clock in enumerate(clocks) if mask[idx]]
 
         # We return first setting within the mask. If there are no FPGAs selected at all, just return a sane default.
-        return clocks_in_mask[0] if clocks_in_mask else self.clock_RW_default
+        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 (160*1000000, 200*1000000):
@@ -230,7 +237,7 @@ class SDP(opcua_device):
         self.proxy.FPGA_pps_expected_cnt_RW = [clock] * self.N_pn
 
         # Also update the packet headers
-        self.proxy.FPGA_sdp_info_nyquist_sampling_zone_index_RW = [self.read_attribute("nyquist_zone_R")] * self.N_pn
+        self.proxy.FPGA_sdp_info_nyquist_sampling_zone_index_RW = [self._nyquist_zone(clock)] * self.N_pn
 
     # ----------
     # Summarising Attributes