L2SS-1005: Moved DigitalBeam.Input_to_Antenna_Mapping to...

L2SS-1005: Moved DigitalBeam.Input_to_Antenna_Mapping to AntennaField.Antenna_to_SDP_Mapping, to collect all antenna configuration information in the same device

Closes L2SS-1005

tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py

@@ -46,6 +46,9 @@ class DigitalBeam(beam_device):
     MAX_INPUTS = 96
     NUM_BEAMLETS = 488
 
+    # number of antennas connected to each FPGA in SDP
+    A_pn = 6
+
     # -----------------
     # Device Properties
     # -----------------
@@ -98,7 +101,7 @@ class DigitalBeam(beam_device):
 
         for antenna_nr, (fpga_nr, input_nr) in enumerate(antenna_to_sdp_mapping):
             if input_nr >= 0:
-                antenna_select[antenna_nr] = self._input_select[fpga_nr * 6 + input_nr]
+                antenna_select[antenna_nr] = self._input_select[fpga_nr * self.A_pn + input_nr]
 
         return antenna_select
 
@@ -111,10 +114,10 @@ class DigitalBeam(beam_device):
             if input_nr >= 0:
                 if antenna_usage_mask[antenna_nr]:
                     # use antenna for the beamlets as supplied by the client
-                    self._input_select[fpga_nr * 6 + input_nr] = antennas[antenna_nr]
+                    self._input_select[fpga_nr * self.A_pn + input_nr] = antennas[antenna_nr]
                 else:
                     # do not use antenna for any beamlet
-                    self._input_select[fpga_nr * 6 + input_nr] = False
+                    self._input_select[fpga_nr * self.A_pn + input_nr] = False
 
     # ----------
     # Summarising Attributes
@@ -147,7 +150,7 @@ class DigitalBeam(beam_device):
         input_itrf = numpy.array([reference_itrf] * self.MAX_INPUTS)
         for antenna_nr, (fpga_nr, input_nr) in enumerate(self.antennafield_proxy.Antenna_to_SDP_Mapping_R):
             if input_nr >= 0:
-                input_itrf[fpga_nr * 6 + input_nr] = antenna_itrf[antenna_nr]
+                input_itrf[fpga_nr * self.A_pn + input_nr] = antenna_itrf[antenna_nr]
 
         # a delay calculator
         self.delay_calculator = Delays(reference_itrf)