Bug-fix tx mode gain exchange from LteUePhy and LteSpectrumPhy
authorMarco Miozzo <marco.miozzo@cttc.es>
Fri, 23 Mar 2012 11:36:49 +0100
changeset 8715 736f0318fc8a
parent 8714 398bbcbb3f42
child 8716 ecf992a9c825
Bug-fix tx mode gain exchange from LteUePhy and LteSpectrumPhy
src/lte/model/lte-spectrum-phy.cc
src/lte/model/lte-ue-phy.cc
--- a/src/lte/model/lte-spectrum-phy.cc	Thu Mar 22 18:16:01 2012 +0100
+++ b/src/lte/model/lte-spectrum-phy.cc	Fri Mar 23 11:36:49 2012 +0100
@@ -491,7 +491,7 @@
   expectedTbs_t::iterator itTb = m_expectedTbs.begin ();
   
   // apply transmission mode gain
-  NS_LOG_DEBUG (this << " txMode " << (uint16_t)m_txModeGain.size ());
+  NS_LOG_DEBUG (this << " txMode " << (uint16_t)m_txModeGain.size () << " gain " << m_txModeGain.at (m_transmissionMode));
   NS_ASSERT (m_transmissionMode < m_txModeGain.size ());
   m_sinrPerceived *= m_txModeGain.at (m_transmissionMode);
   
--- a/src/lte/model/lte-ue-phy.cc	Thu Mar 22 18:16:01 2012 +0100
+++ b/src/lte/model/lte-ue-phy.cc	Fri Mar 23 11:36:49 2012 +0100
@@ -598,7 +598,7 @@
 {
   NS_LOG_FUNCTION (this << gain);
   // convert to linear
-  gain = pow (10.0, (gain / 10.0));
+  double gainLin = pow (10.0, (gain / 10.0));
   if (m_txModeGain.size () < 1)
   {
     m_txModeGain.resize (1);
@@ -611,7 +611,7 @@
   {
     if (i==0)
     {
-      m_txModeGain.push_back (gain);
+      m_txModeGain.push_back (gainLin);
     }
     else
     {
@@ -628,7 +628,7 @@
 {
   NS_LOG_FUNCTION (this << gain);
   // convert to linear
-  gain = pow (10.0, (gain / 10.0));
+  double gainLin = pow (10.0, (gain / 10.0));
   if (m_txModeGain.size () < 2)
   {
     m_txModeGain.resize (2);
@@ -640,7 +640,7 @@
   {
     if (i==1)
     {
-      m_txModeGain.push_back (gain);
+      m_txModeGain.push_back (gainLin);
     }
     else
     {
@@ -656,7 +656,7 @@
 {
   NS_LOG_FUNCTION (this << gain);
   // convert to linear
-  gain = pow (10.0, (gain / 10.0));
+  double gainLin = pow (10.0, (gain / 10.0));
   if (m_txModeGain.size () < 3)
   {
     m_txModeGain.resize (3);
@@ -668,7 +668,7 @@
   {
     if (i==2)
     {
-      m_txModeGain.push_back (gain);
+      m_txModeGain.push_back (gainLin);
     }
     else
     {
@@ -684,7 +684,7 @@
 {
   NS_LOG_FUNCTION (this << gain);
   // convert to linear
-  gain = pow (10.0, (gain / 10.0));
+  double gainLin = pow (10.0, (gain / 10.0));
   if (m_txModeGain.size () < 4)
   {
     m_txModeGain.resize (4);
@@ -696,7 +696,7 @@
   {
     if (i==3)
     {
-      m_txModeGain.push_back (gain);
+      m_txModeGain.push_back (gainLin);
     }
     else
     {
@@ -712,7 +712,7 @@
 {
   NS_LOG_FUNCTION (this << gain);
   // convert to linear
-  gain = pow (10.0, (gain / 10.0));
+  double gainLin = pow (10.0, (gain / 10.0));
   if (m_txModeGain.size () < 5)
   {
     m_txModeGain.resize (5);
@@ -724,7 +724,7 @@
   {
     if (i==4)
     {
-      m_txModeGain.push_back (gain);
+      m_txModeGain.push_back (gainLin);
     }
     else
     {
@@ -740,7 +740,7 @@
 {
   NS_LOG_FUNCTION (this << gain);
   // convert to linear
-  gain = pow (10.0, (gain / 10.0));
+  double gainLin = pow (10.0, (gain / 10.0));
   if (m_txModeGain.size () < 6)
   {
     m_txModeGain.resize (6);
@@ -752,7 +752,7 @@
   {
     if (i==5)
     {
-      m_txModeGain.push_back (gain);
+      m_txModeGain.push_back (gainLin);
     }
     else
     {
@@ -768,7 +768,7 @@
 {
   NS_LOG_FUNCTION (this << gain);
   // convert to linear
-  gain = pow (10.0, (gain / 10.0));
+  double gainLin = pow (10.0, (gain / 10.0));
   if (m_txModeGain.size () < 7)
   {
     m_txModeGain.resize (7);
@@ -780,7 +780,7 @@
   {
     if (i==6)
     {
-      m_txModeGain.push_back (gain);
+      m_txModeGain.push_back (gainLin);
     }
     else
     {