Resolve L2SDP-551

Closes L2SDP-551

applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd

@@ -505,10 +505,14 @@ 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_user_size(g_statistics_type : STRING) RETURN NATURAL;
   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;
@@ -575,11 +579,19 @@ PACKAGE BODY sdp_pkg IS
                                             1));  -- SST
   END func_sdp_get_stat_nof_signal_inputs;
 
-  FUNCTION func_sdp_get_stat_from_mm_data_size(g_statistics_type : STRING) RETURN NATURAL IS
+  FUNCTION func_sdp_get_stat_from_mm_user_size(g_statistics_type : STRING) RETURN NATURAL IS
+  -- see sdp_statistics_offload.vhd for description
   BEGIN
-    RETURN sel_a_b(g_statistics_type="BST", c_sdp_N_pol_bf * c_sdp_W_statistic_sz,  -- = 4
+    RETURN sel_a_b(g_statistics_type="BST",                 c_sdp_W_statistic_sz,   -- = 2
            sel_a_b(g_statistics_type="XST", c_nof_complex * c_sdp_W_statistic_sz,   -- = 4
-                                            c_sdp_W_statistic_sz));                 -- = 2, SST
+                                                            c_sdp_W_statistic_sz)); -- = 2, SST
+  END func_sdp_get_stat_from_mm_user_size;
+
+  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
   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 +599,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 +609,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