Skip to content
Snippets Groups Projects
Commit 7493f527 authored by Taya Snijder's avatar Taya Snijder
Browse files

fixed faults after pulling master

parent 8ac86cbb
No related branches found
No related tags found
1 merge request!465added constants.py and replaced most magic numbers
...@@ -340,7 +340,7 @@ class Beamlet(opcua_device): ...@@ -340,7 +340,7 @@ class Beamlet(opcua_device):
nyquist_zones = self.sdp_proxy.nyquist_zone_R # (fpga_nr, [input_nr][pol]) 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 # 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 # compute the frequency of each beamlet for each input
return self._subband_frequencies(beamlet_subbands, self.sdp_proxy.clock_RW, nyquist_zones) return self._subband_frequencies(beamlet_subbands, self.sdp_proxy.clock_RW, nyquist_zones)
......
...@@ -144,7 +144,7 @@ class DigitalBeam(beam_device): ...@@ -144,7 +144,7 @@ class DigitalBeam(beam_device):
# Generate positions for all FPGA inputs. # Generate positions for all FPGA inputs.
# Use reference position for any missing antennas so they always get a delay of 0 # 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): for antenna_nr, (fpga_nr, input_nr) in enumerate(self.antennafield_proxy.Antenna_to_SDP_Mapping_R):
if input_nr >= 0: if input_nr >= 0:
input_itrf[fpga_nr * constants.A_pn + input_nr] = antenna_itrf[antenna_nr] input_itrf[fpga_nr * constants.A_pn + input_nr] = antenna_itrf[antenna_nr]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment