From bd4e1c96902b399260b968c913033d726a3e70bd Mon Sep 17 00:00:00 2001
From: Ismael Gomez <ismael@softwareradiosystems.com>
Date: Mon, 4 Jun 2018 13:14:27 +0200
Subject: [PATCH] Fixed number of iterations lower than 1 in metrics

---
 lib/src/phy/phch/pdsch.c     | 14 +++++++++++++-
 srsue/src/phy/phch_worker.cc |  5 ++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/src/phy/phch/pdsch.c b/lib/src/phy/phch/pdsch.c
index 5dd614acb..315efac5a 100644
--- a/lib/src/phy/phch/pdsch.c
+++ b/lib/src/phy/phch/pdsch.c
@@ -930,7 +930,19 @@ void srslte_pdsch_set_max_noi(srslte_pdsch_t *q, uint32_t max_iter) {
 }
 
 float srslte_pdsch_last_noi(srslte_pdsch_t *q) {
-  return srslte_pdsch_last_noi_cw(q, 0);
+  float niters = 0;
+  int   active_cw = 0;
+  for (int i=0;i<SRSLTE_MAX_CODEWORDS;i++) {
+    if (q->last_nof_iterations[i]) {
+      niters += q->last_nof_iterations[i];
+      active_cw++;
+    }
+  }
+  if (active_cw) {
+    return niters/active_cw;
+  } else {
+    return 0;
+  }
 }
 
 uint32_t srslte_pdsch_last_noi_cw(srslte_pdsch_t *q, uint32_t cw_idx) {
diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc
index 856ab7802..1a7df429b 100644
--- a/srsue/src/phy/phch_worker.cc
+++ b/srsue/src/phy/phch_worker.cc
@@ -815,6 +815,10 @@ int phch_worker::decode_pdsch(srslte_ra_dl_grant_t *grant, uint8_t *payload[SRSL
 
         // Store metrics
         dl_metrics.mcs    = grant->mcs[0].idx;
+        float niters = srslte_pdsch_last_noi(&ue_dl.pdsch);
+        if (niters) {
+          dl_metrics.turbo_iters = niters;
+        }
       } else {
         Warning("Received grant for TBS=0\n");
       }
@@ -1632,7 +1636,6 @@ void phch_worker::update_measurements()
     dl_metrics.rssi   = phy->avg_rssi_dbm;
     dl_metrics.pathloss = phy->pathloss;
     dl_metrics.sinr   = phy->avg_snr_db_cqi;
-    dl_metrics.turbo_iters = srslte_pdsch_last_noi(&ue_dl.pdsch);
     phy->set_dl_metrics(dl_metrics);
 
   }