F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug-fix tx mode gain exchange from LteUePhy and LteSpectrumPhy

Browse Source
This commit is contained in:
Marco Miozzo
2012-03-23 11:36:49 +01:00
parent e82f5e6e39
commit 67f8594f5b
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lte/model/lte-spectrum-phy.cc
View File

@@ -491,7 +491,7 @@ LteSpectrumPhy::EndRx ()
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);

28
src/lte/model/lte-ue-phy.cc
View File

@@ -598,7 +598,7 @@ LteUePhy::SetTxMode1Gain (double gain)
{
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 @@ LteUePhy::SetTxMode1Gain (double gain)
{
if (i==0)
{
m_txModeGain.push_back (gain);
m_txModeGain.push_back (gainLin);
}
else
{
@@ -628,7 +628,7 @@ LteUePhy::SetTxMode2Gain (double gain)
{
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 @@ LteUePhy::SetTxMode2Gain (double gain)
{
if (i==1)
{
m_txModeGain.push_back (gain);
m_txModeGain.push_back (gainLin);
}
else
{
@@ -656,7 +656,7 @@ LteUePhy::SetTxMode3Gain (double gain)
{
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 @@ LteUePhy::SetTxMode3Gain (double gain)
{
if (i==2)
{
m_txModeGain.push_back (gain);
m_txModeGain.push_back (gainLin);
}
else
{
@@ -684,7 +684,7 @@ LteUePhy::SetTxMode4Gain (double gain)
{
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 @@ LteUePhy::SetTxMode4Gain (double gain)
{
if (i==3)
{
m_txModeGain.push_back (gain);
m_txModeGain.push_back (gainLin);
}
else
{
@@ -712,7 +712,7 @@ LteUePhy::SetTxMode5Gain (double gain)
{
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 @@ LteUePhy::SetTxMode5Gain (double gain)
{
if (i==4)
{
m_txModeGain.push_back (gain);
m_txModeGain.push_back (gainLin);
}
else
{
@@ -740,7 +740,7 @@ LteUePhy::SetTxMode6Gain (double gain)
{
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 @@ LteUePhy::SetTxMode6Gain (double gain)
{
if (i==5)
{
m_txModeGain.push_back (gain);
m_txModeGain.push_back (gainLin);
}
else
{
@@ -768,7 +768,7 @@ LteUePhy::SetTxMode7Gain (double gain)
{
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 @@ LteUePhy::SetTxMode7Gain (double gain)
{
if (i==6)
{
m_txModeGain.push_back (gain);
m_txModeGain.push_back (gainLin);
}
else
{