From 4e99cb60734e500fc79743cc54ef150847e12105 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Wed, 17 May 2023 10:40:04 +0200
Subject: [PATCH] Corrected typos. Added ring_rx_bsn monitor.

---
 .../sdp_ring_settings_per_station.txt         | 73 +++++++++++++++++--
 1 file changed, 67 insertions(+), 6 deletions(-)

diff --git a/applications/lofar2/doc/prestudy/sdp_ring_settings_per_station.txt b/applications/lofar2/doc/prestudy/sdp_ring_settings_per_station.txt
index f145caafba..6e37350c2f 100644
--- a/applications/lofar2/doc/prestudy/sdp_ring_settings_per_station.txt
+++ b/applications/lofar2/doc/prestudy/sdp_ring_settings_per_station.txt
@@ -3,6 +3,7 @@
 #
 # Author: Eric Kooistra
 # Date: 17 May 2023
+# Purpose: How to set the control points for the SDP ring per Station type.
 #
 ###############################################################################
 
@@ -105,7 +106,7 @@ FPGA_ring_use_cable_to_previous_rn = [True,False,False,False,True,False,False,Fa
 FPGA_xst_ring_nof_transport_hops = [8]*16
 
 # BF setup:
-FPGA_xst_ring_nof_transport_hops [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0]
+FPGA_bf_ring_nof_transport_hops [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0]
 
 
 b1) HB international station
@@ -120,7 +121,7 @@ FPGA_ring_use_cable_to_previous_rn = [True,False,False,False,True,False,False,Fa
 FPGA_xst_ring_nof_transport_hops = [8]*16
 
 # BF setup:
-FPGA_xst_ring_nof_transport_hops [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0]
+FPGA_bf_ring_nof_transport_hops [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0]
 
 
 b2) HB remote station
@@ -132,10 +133,10 @@ FPGA_ring_use_cable_to_next_rn = [False,False,False,True,False,False,False,True]
 FPGA_ring_use_cable_to_previous_rn = [True,False,False,False,True,False,False,False]
 
 # XST setup:
-FPGA_xst_ring_nof_transport_hops = [4]*16
+FPGA_xst_ring_nof_transport_hops = [4]*8
 
 # BF setup:
-FPGA_xst_ring_nof_transport_hops [1,1,1,1,1,1,1,0]
+FPGA_bf_ring_nof_transport_hops [1,1,1,1,1,1,1,0]
 
 
 
@@ -153,7 +154,7 @@ FPGA_ring_use_cable_to_previous_rn = [True,False,False,False]
 FPGA_xst_ring_nof_transport_hops = [2]*4
 
 # BF setup:
-FPGA_xst_ring_nof_transport_hops [1,1,1,0]
+FPGA_bf_ring_nof_transport_hops [1,1,1,0]
 
 
 HB ear-1:
@@ -168,18 +169,20 @@ FPGA_ring_use_cable_to_previous_rn = [True,False,False,False]
 FPGA_xst_ring_nof_transport_hops = [2]*4
 
 # BF setup:
-FPGA_xst_ring_nof_transport_hops [1,1,1,0]
+FPGA_bf_ring_nof_transport_hops [1,1,1,0]
 
 
 
 4) Verify ring setup
 
+a) SDP enable
 SDP processing enable:
 FPGA_processing_enable [True]*N_rn
 
 XST processing enable/restart:
 FPGA_processing_enable [True]*N_rn
 
+b) View packet arrival latencies
 Then check packet arrival latencies along the ring via:
 
 FPGA_xst_ring_rx_latency_RW for XST packets
@@ -187,6 +190,12 @@ FPGA_bf_ring_rx_latency_RW for beamlet packets
 
 Expected XST crosslet packet arrival latencies (unit 5 ns) for LB with N_rn = 16:
 
+Note:
+- If the FPGA_xst_integration_interval_RW > 1 s, then the results for XST
+  only appear during one sec per integration interval.
+- Entries with -1 indicate no packets received, which is correct for this
+  ring configuration.
+
 kooistra@dop386:~/git/sdptr$ sdp_rw.py --host 10.99.0.250 --port 4842 -r xst_ring_rx_latency
 read xst_ring_rx_latency:
 node 64:  -1   -1   -1   -1   -1   -1   -1   -1   1791 1569 1349 1150 927  661  462  264
@@ -226,3 +235,55 @@ node 76:  27442
 node 77:  29471
 node 78:  31514
 node 79:  33574
+
+
+c) View BSN timestamps of received packets
+
+The reported BSN timestamp is the same for all nodes and increases in time.
+
+FPGA_xst_ring_rx_bsn_R
+FPGA_bf_ring_rx_bsn_R
+
+Note:
+- If the FPGA_xst_integration_interval_RW > 1 s, then the results for XST
+  only appear during one sec per integration interval.
+- Entries with -1 indicate no packets received, which is correct for this
+  ring configuration.
+
+kooistra@dop386:~/git/sdptr$ sdp_rw.py --host 10.99.0.250 --port 4842 -r xst_ring_rx_bsn
+read xst_ring_rx_bsn:
+node 64:  -1   -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813
+node 65:  328967286132813 -1   -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813
+node 66:  328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813
+node 67:  328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813
+node 68:  328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813
+node 69:  328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813
+node 70:  328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813
+node 71:  328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1   -1   328967286132813
+node 72:  328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1   -1
+node 73:  -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1   -1
+node 74:  -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1   -1
+node 75:  -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1   -1
+node 76:  -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1   -1
+node 77:  -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1   -1
+node 78:  -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1   -1
+node 79:  -1   -1   -1   -1   -1   -1   -1   328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 328967286132813 -1
+
+kooistra@dop386:~/git/sdptr$ sdp_rw.py --host 10.99.0.250 --port 4842 -r bf_ring_rx_bsn
+read bf_ring_rx_bsn:
+node 64:  -1
+node 65:  328967291406250
+node 66:  328967291406250
+node 67:  328967291406250
+node 68:  328967291406250
+node 69:  328967291406250
+node 70:  328967291406250
+node 71:  328967291406250
+node 72:  328967291406250
+node 73:  328967291406250
+node 74:  328967291406250
+node 75:  328967291406250
+node 76:  328967291406250
+node 77:  328967291406250
+node 78:  328967291406250
+node 79:  328967291406250
-- 
GitLab