summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-05-30 17:40:58 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-05-30 17:40:58 +0200
commit5cfd2ac643e37605761685dbeafc99ec1fffd059 (patch)
treefa3c10259b23cbafde905635a583138a740108f6
parent09312c200b78c6b441b577911743f75921fef5b3 (diff)
downloaddabmod-5cfd2ac643e37605761685dbeafc99ec1fffd059.tar.gz
dabmod-5cfd2ac643e37605761685dbeafc99ec1fffd059.tar.bz2
dabmod-5cfd2ac643e37605761685dbeafc99ec1fffd059.zip
TII: Move carrier duplication into enable_carrier
-rw-r--r--src/TII.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/TII.cpp b/src/TII.cpp
index 9ccc6e0..bafa343 100644
--- a/src/TII.cpp
+++ b/src/TII.cpp
@@ -205,7 +205,9 @@ void TII::enable_carrier(int k) {
"TII::enable_carrier invalid k!");
}
- m_dataIn[ix] = 1.0; // TODO power of the carrier ?
+ // TODO power of the carrier ?
+ m_dataIn.at(ix) = 1.0;
+ m_dataIn.at(ix+1) = 1.0; // TODO verify if +1 is really correct
}
void TII::prepare_pattern() {
@@ -221,7 +223,6 @@ void TII::prepare_pattern() {
if ( k == -768 + 2 * comb + 48 * b and
pattern_tm1_2_4[m_pattern][b]) {
enable_carrier(k);
- enable_carrier(k+1);
}
}
}
@@ -231,7 +232,6 @@ void TII::prepare_pattern() {
if ( k == -384 + 2 * comb + 48 * b and
pattern_tm1_2_4[m_pattern][b]) {
enable_carrier(k);
- enable_carrier(k+1);
}
}
}
@@ -241,7 +241,6 @@ void TII::prepare_pattern() {
if ( k == 1 + 2 * comb + 48 * b and
pattern_tm1_2_4[m_pattern][b]) {
enable_carrier(k);
- enable_carrier(k+1);
}
}
}
@@ -251,7 +250,6 @@ void TII::prepare_pattern() {
if ( k == 385 + 2 * comb + 48 * b and
pattern_tm1_2_4[m_pattern][b]) {
enable_carrier(k);
- enable_carrier(k+1);
}
}
}
@@ -262,7 +260,6 @@ void TII::prepare_pattern() {
if ( k == -192 + 2 * comb + 48 * b and
pattern_tm1_2_4[m_pattern][b]) {
enable_carrier(k);
- enable_carrier(k+1);
}
}
@@ -270,7 +267,6 @@ void TII::prepare_pattern() {
if ( k == -191 + 2 * comb + 48 * b and
pattern_tm1_2_4[m_pattern][b]) {
enable_carrier(k);
- enable_carrier(k+1);
}
}
}