From 6ce41a125ee8f8124040b7fc6560738cea0cd3a6 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Mon, 12 Mar 2018 13:28:55 +0000
Subject: [PATCH] Removed pi_diag_data_buffer, because not used.
---
.../commissioning/tests/force_bf_transpose.py | 24 ++++++++-----------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/applications/apertif/commissioning/tests/force_bf_transpose.py b/applications/apertif/commissioning/tests/force_bf_transpose.py
index cb04442ea0..6eaad9bc45 100644
--- a/applications/apertif/commissioning/tests/force_bf_transpose.py
+++ b/applications/apertif/commissioning/tests/force_bf_transpose.py
@@ -38,20 +38,19 @@
--switch 0 : Use transpose T_int_x, so data order [M_blk][N_int_x][Q_interleave]
--switch 1 : Bypass transpose T_int_x, so data order [N_int_x][N_clk]
- These force data stimuli can be verified in the correlator before and after the mesh.
-
- In node_apertif_unb1_correlator_input the test uses:
- * RAM_DIAG_DATA_BUFFER_INPUT_POST to read the data for three 10G links per node
- after the BSN aligner
+ The argument --tel index must match lcu-rt index and is used to inform the script about which dish it
+ is at. The --unb --fn yields the global FN index at the dish and hence also the polarization. Together
+ the polarization and the dish index yield the telescope path tp index in range(N_tp=24) that is used in
+ the forced data.
- In node_apertif_unb1_correlator_mesh the test uses:
- * RAM_DIAG_DATA_BUFFER_MESH to read the data for 24 TP per node after the mesh
+ These force data stimuli can be verified in the correlator before and after the mesh.
Usage:
- # -v 5 or 6 for debugging
- # -v 0, 1, 2 or 3 for regression test
- > ssh lcu-rt4 -X "python $RADIOHDL/applications/apertif/commissioning/tests/force_bf_transpose_tp.py -v 5 --tel 2 --unb 0 --fn 0 --mode 0 --switch 0"
+ # At dish set dp_force_data_parallel
+ > ssh lcu-rt4 -X "python $RADIOHDL/applications/apertif/commissioning/tests/force_bf_transpose.py -v 3 --tel 4 --unb 0:3 --fn 0:3 --mode 0 --switch 0"
+ # At central correlator verify expected result via DB (for same --tel --mode and --switch)
+ > python $RADIOHDL/applications/apertif/commissioning/tests/verify.py -v 5 --tel 4 --unb 2 --fn 0 --mode 0 --switch 0"
"""
###############################################################################
@@ -62,7 +61,6 @@ import test_case
import node_io
import pi_dp_switch
import pi_dp_force_data_parallel
-import pi_diag_data_buffer
N_uni = 4 # 4 UniBoards per subrack at the dish
c_nof_fn = 4 # 4 FN per UniBoard
@@ -85,7 +83,7 @@ wsrtTelescopes = ['2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd']
###############################################################################
# Instantiations
-tc = test_case.Testcase('FORCE_BF_TRANSPOSE_TP - ', '')
+tc = test_case.Testcase('FORCE_BF_TRANSPOSE - ', '')
tc.set_result('PASSED')
# Read switch setting
@@ -116,8 +114,6 @@ for fn in tc.nodeFnNrs:
# REG_DP_FORCE_DATA_PARALLEL
fdp.append(pi_dp_force_data_parallel.PiDpForceDataParallel(tc, io, nodeNr=fn, piInstanceName='', nofInst=P_BF))
- # RAM_DIAG_DATA_BUFFER_OUTPUT
- db.append(pi_diag_data_buffer.PiDiagDataBuffer(tc, io, nodeNr=fn, instanceName='OUTPUT', nofStreams=P_BF, ramSizePerStream=c_dbSize, version=1))
###############################################################################
# Stimuli
--
GitLab