Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
7493f527
Commit
7493f527
authored
2 years ago
by
Taya Snijder
Browse files
Options
Downloads
Patches
Plain Diff
fixed faults after pulling master
parent
8ac86cbb
No related branches found
No related tags found
1 merge request
!465
added constants.py and replaced most magic numbers
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
+1
-1
1 addition, 1 deletion
...stationcontrol/tangostationcontrol/devices/sdp/beamlet.py
tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py
+1
-1
1 addition, 1 deletion
...ioncontrol/tangostationcontrol/devices/sdp/digitalbeam.py
with
2 additions
and
2 deletions
tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py
+
1
−
1
View file @
7493f527
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py
+
1
−
1
View file @
7493f527
...
@@ -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
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment