Change in osmo-gsm-tester[master]: ms_srs: sum bitrates for all component carrier

[srs_andre]

srs_andre has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18533 )

Change subject: ms_srs: sum bitrates for all component carrier
......................................................................

ms_srs: sum bitrates for all component carrier

when calculating the dl and ul bitrate, it is required to take the
sum of all active component carriers since they are reported seperately
inside the CSV file

Change-Id: If30ec3f22ce5871f911433e6a6997e9c6e7ca210
---
M src/osmo_gsm_tester/obj/ms_srs.py
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py
index f53f461..3e1b3ff 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -398,6 +398,15 @@
                 # Sum them up assuming same array dimension
                 sel_data += vec
 
+        # Sum up all component carriers for rate metrics
+        if metric_str.find('brate'):
+            # Determine number of component carriers
+            num_cc = numpy.amax(numpy.array(self.raw_data['cc'])) + 1 # account for zero index
+            tmp_values = sel_data
+            sel_data = numpy.array(tmp_values[::num_cc]) # first carrier, every num_cc'th item in list
+            for cc in range(1, num_cc):
+                sel_data += numpy.array(tmp_values[cc::num_cc]) # all other carriers, start at cc index
+
         if operation == 'avg':
             result = numpy.average(sel_data)
         elif operation == 'sum':

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18533
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: If30ec3f22ce5871f911433e6a6997e9c6e7ca210
Gerrit-Change-Number: 18533
Gerrit-PatchSet: 2
Gerrit-Owner: srs_andre <andre at softwareradiosystems.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: srs_andre <andre at softwareradiosystems.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200529/4cf1e257/attachment.htm>