From 17a63f45f557ddd1b46c7f858db4501562fda56f Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Tue, 14 Dec 2021 14:24:31 +0100
Subject: [PATCH] Clarified nof_statistics_per_packet.
---
.../lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
index 296596eefc..ed0c926e9f 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
@@ -505,10 +505,13 @@ PACKAGE sdp_pkg is
FUNCTION func_sdp_get_stat_marker(g_statistics_type : STRING) RETURN NATURAL;
FUNCTION func_sdp_get_stat_nof_signal_inputs(g_statistics_type : STRING) RETURN NATURAL;
+
+ -- nof_statistics_per_packet = mm_nof_data * mm_data_size / c_sdp_W_statistic_sz
FUNCTION func_sdp_get_stat_from_mm_data_size(g_statistics_type : STRING) RETURN NATURAL;
FUNCTION func_sdp_get_stat_from_mm_step_size(g_statistics_type : STRING) RETURN NATURAL;
FUNCTION func_sdp_get_stat_from_mm_nof_data(g_statistics_type : STRING) RETURN NATURAL;
FUNCTION func_sdp_get_stat_nof_statistics_per_packet(g_statistics_type : STRING) RETURN NATURAL;
+
FUNCTION func_sdp_get_stat_app_total_length(g_statistics_type : STRING) RETURN NATURAL;
FUNCTION func_sdp_get_stat_udp_total_length(g_statistics_type : STRING) RETURN NATURAL;
FUNCTION func_sdp_get_stat_ip_total_length(g_statistics_type : STRING) RETURN NATURAL;
@@ -577,9 +580,9 @@ PACKAGE BODY sdp_pkg IS
FUNCTION func_sdp_get_stat_from_mm_data_size(g_statistics_type : STRING) RETURN NATURAL IS
BEGIN
- RETURN sel_a_b(g_statistics_type="BST", c_sdp_N_pol_bf * c_sdp_W_statistic_sz, -- = 4
- sel_a_b(g_statistics_type="XST", c_nof_complex * c_sdp_W_statistic_sz, -- = 4
- c_sdp_W_statistic_sz)); -- = 2, SST
+ RETURN sel_a_b(g_statistics_type="BST", c_sdp_N_pol_bf * c_sdp_W_statistic_sz, -- = 4
+ sel_a_b(g_statistics_type="XST", c_nof_complex * c_sdp_W_statistic_sz, -- = 4
+ c_sdp_W_statistic_sz)); -- = 2, SST
END func_sdp_get_stat_from_mm_data_size;
FUNCTION func_sdp_get_stat_from_mm_step_size(g_statistics_type : STRING) RETURN NATURAL IS
@@ -587,7 +590,7 @@ PACKAGE BODY sdp_pkg IS
BEGIN
RETURN sel_a_b(g_statistics_type="BST", c_data_size, -- = 4
sel_a_b(g_statistics_type="XST", c_data_size, -- = 4
- c_sdp_Q_fft * c_data_size)); -- = 4, SST
+ c_data_size * c_sdp_Q_fft)); -- = 4, SST
END func_sdp_get_stat_from_mm_step_size;
FUNCTION func_sdp_get_stat_from_mm_nof_data(g_statistics_type : STRING) RETURN NATURAL IS
@@ -597,6 +600,7 @@ PACKAGE BODY sdp_pkg IS
c_sdp_N_sub)); -- = 512, SST
END func_sdp_get_stat_from_mm_nof_data;
+ -- nof_statistics_per_packet = mm_nof_data * mm_data_size / c_sdp_W_statistic_sz
FUNCTION func_sdp_get_stat_nof_statistics_per_packet(g_statistics_type : STRING) RETURN NATURAL IS
BEGIN
RETURN sel_a_b(g_statistics_type="BST", c_sdp_S_sub_bf * c_sdp_N_pol_bf, -- = 976
--
GitLab