Merge branch 'L2SS-1748-increase-beamlets' into 'master'

L2SS-1748: Remove assumed constants from beam-forming delays tests.

Closes L2SS-1748

See merge request !997

tangostationcontrol/test/beam/test_delays.py

@@ -230,7 +230,7 @@ class TestDelaysBulk(base.TestCase):
             _ = self.d.delays_bulk(self.directions, self.positions)
         after = time.monotonic_ns()
         logging.error(
-            f"delays bulk averaged {(after - before) / count / 1e6} ms to convert 488 directions for 96 antennas."
+            f"delays bulk averaged {(after - before) / count / 1e6} ms to convert {N_beamlets_ctrl} directions for {MAX_ANTENNA} antennas."
         )
 
     def test_delays_bulk_parallel_speed(self):
@@ -259,7 +259,7 @@ class TestDelaysBulk(base.TestCase):
         single_thread_execution_time = statistics.median(duration_results_ms)
 
         logging.error(
-            f"delays bulk single-threaded cost averages at {single_thread_execution_time} ms per call to convert 488 directions for 96 antennas {count} times."
+            f"delays bulk single-threaded cost averages at {single_thread_execution_time} ms per call to convert {N_beamlets_ctrl} directions for {MAX_ANTENNA} antennas {count} times."
         )
 
         # compare against multi-threaded performance
@@ -269,7 +269,7 @@ class TestDelaysBulk(base.TestCase):
         [t.join() for t in threads]
 
         logging.error(
-            f"delays bulk multi-threaded averages are {[int(d) for d in duration_results_ms]} ms per call to convert 488 directions for 96 antennas {count} times using {nr_threads} threads."
+            f"delays bulk multi-threaded averages are {[int(d) for d in duration_results_ms]} ms per call to convert {N_beamlets_ctrl} directions for {MAX_ANTENNA} antennas {count} times using {nr_threads} threads."
         )
 
         # as we have a real time system and sufficient cores, we care

tangostationcontrol/test/devices/sdp/test_beamlet_device.py

@@ -177,7 +177,12 @@ class TestBeamletDevice(base.TestCase):
 
     def test_beamlet_frequencies_basic(self):
         beamlet_subbands = numpy.array(
-            [[[list(range(N_beamlets_ctrl))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32
+            [
+                [[[beamlet % N_subbands for beamlet in range(N_beamlets_ctrl)]] * N_pol]
+                * A_pn
+            ]
+            * N_pn,
+            dtype=numpy.uint32,
         )
         subband_indices = numpy.array(
             [[[list(range(N_subbands))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32
@@ -190,7 +195,12 @@ class TestBeamletDevice(base.TestCase):
         """Test different settings for the FPGAs to verify the ordering."""
 
         beamlet_subbands = numpy.array(
-            [[[list(range(N_beamlets_ctrl))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32
+            [
+                [[[beamlet % N_subbands for beamlet in range(N_beamlets_ctrl)]] * N_pol]
+                * A_pn
+            ]
+            * N_pn,
+            dtype=numpy.uint32,
         )
         subband_indices = numpy.array(
             [[[list(range(N_subbands))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32
@@ -206,7 +216,12 @@ class TestBeamletDevice(base.TestCase):
         """Test different settings for the inputs of the FPGAs to verify the ordering."""
 
         beamlet_subbands = numpy.array(
-            [[[list(range(N_beamlets_ctrl))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32
+            [
+                [[[beamlet % N_subbands for beamlet in range(N_beamlets_ctrl)]] * N_pol]
+                * A_pn
+            ]
+            * N_pn,
+            dtype=numpy.uint32,
         )
         subband_indices = numpy.array(
             [[[list(range(N_subbands))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32
@@ -222,7 +237,12 @@ class TestBeamletDevice(base.TestCase):
         """Test a shuffled order of subbands."""
 
         beamlet_subbands = numpy.array(
-            [[[list(range(N_beamlets_ctrl))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32
+            [
+                [[[beamlet % N_subbands for beamlet in range(N_beamlets_ctrl)]] * N_pol]
+                * A_pn
+            ]
+            * N_pn,
+            dtype=numpy.uint32,
         )
         subband_indices = numpy.array(
             [[[list(range(N_subbands))] * N_pol] * A_pn] * N_pn, dtype=numpy.uint32