From 7493f5277d680d0dd768c8be1160279c1036a9d0 Mon Sep 17 00:00:00 2001
From: thijs snijder <snijder@astron.nl>
Date: Fri, 21 Oct 2022 08:19:37 +0200
Subject: [PATCH] fixed faults after pulling master
---
tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py | 2 +-
.../tangostationcontrol/devices/sdp/digitalbeam.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py b/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
index ad21851b4..fea714b27 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
@@ -340,7 +340,7 @@ class Beamlet(opcua_device):
nyquist_zones = self.sdp_proxy.nyquist_zone_R # (fpga_nr, [input_nr][pol])
# repeat nyquist zone for all beamlets, to match the shape of beamlet_subbands
- nyquist_zones = numpy.repeat(nyquist_zones, self.N_BEAMLETS_CTRL, axis=1)
+ nyquist_zones = numpy.repeat(nyquist_zones, constants.N_beamlets_ctrl, axis=1)
# compute the frequency of each beamlet for each input
return self._subband_frequencies(beamlet_subbands, self.sdp_proxy.clock_RW, nyquist_zones)
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py b/tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py
index 92c5c578f..6770f738a 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py
@@ -144,7 +144,7 @@ class DigitalBeam(beam_device):
# Generate positions for all FPGA inputs.
# Use reference position for any missing antennas so they always get a delay of 0
- input_itrf = numpy.array([reference_itrf] * constants.MAX_INPUTS)
+ input_itrf = numpy.array([reference_itrf] * constants.S_ant)
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 * constants.A_pn + input_nr] = antenna_itrf[antenna_nr]
--
GitLab