Florian Kaltenberger
7f645f9f34
Merge branch 'feature-59-tm4' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-59-tm4
2016-03-01 11:41:04 +01:00
Florian Kaltenberger
d988214e01
debug info for power control
2016-03-01 11:40:34 +01:00
lukashov
04b07f8bd3
Fixing bug with dl_offset in TM3. Always must be 1.
2016-03-01 11:08:45 +01:00
lukashov
0022ccf790
Revert "Adding different shifts for CWs coming from dif constellations"
...
Streams must have the same shift, otherwise error floor. O
This reverts commit dbf587a515 .
2016-02-29 12:32:51 +01:00
lukashov
dbf587a515
Adding different shifts for CWs coming from dif constellations
2016-02-22 23:39:36 +01:00
lukashov
193ab717fa
Fix channel level
2016-02-22 22:49:34 +01:00
lukashov
f922b493a6
Bug in modulation.c with new qam tables. Error floor for 16QAM and 64QAM. Going back to old ones till fix the bug.
2016-02-22 22:43:47 +01:00
lukashov
bca0b40679
Small changes in precoder to max MI 1stream
2016-01-24 16:44:33 +01:00
lukashov
9410e89310
Small change in measurements: while calculating pmi take into account ch_12[1] as well.
2016-01-22 11:52:51 +01:00
lukashov
c453384e97
Small improvement in correlation
2016-01-20 16:29:07 +01:00
lukashov
c7d2bbe513
avg_0[0] = avg_0[0] + avg_0[1];
...
avg_1[0] = avg_1[0] + avg_1[1];
Diff per-layer shift
2016-01-20 16:08:54 +01:00
lukashov
56c660dbe9
Undoing previos commit. Previous commit is kept to generate TM4 PCE AWGN plots with the right precoder.
2016-01-18 22:55:47 +01:00
lukashov
e60c6e3f84
This commit is to generate TM4 awgn with perfect channel estimation with the right precoder.
...
To be reverted after.
2016-01-18 21:09:59 +01:00
lukashov
dcf4473284
Coming back to
...
avg_0[0] = avg_0[0] + avg_0[1];
avg_1[0] = avg_1[0] + avg_1[1];
avg_0[0] = max (avg_0[0], avg_1[0]);
avg_1[0] = avg_0[0];
2016-01-18 18:04:54 +01:00
lukashov
b6ac32b0db
Chosing the max channel among the four and passing same shift everywhere.
2016-01-17 16:50:53 +01:00
lukashov
071db178eb
avg_0[0] = max(avg_0[0],avg_0[1]);
...
avg_1[0] = max(avg_1[0],avg_1[1]);
2016-01-17 02:29:14 +01:00
lukashov
f703b8e1c5
Playing with average channel level: avg_0[0] = max(avg_0[0],avg_1[0]);
...
avg_1[0] = max(avg_0[1],avg_1[1]); taking this into account in correlation.
2016-01-17 00:39:39 +01:00
lukashov
f415d7118d
Applying output shift on per-antenna basis in demodulation
2016-01-16 12:49:58 +01:00
lukashov
98b91e1d4c
Improving previous commit
2016-01-14 22:14:24 +01:00
lukashov
7b5165c70a
Small change in log2_approx in demodulation
2016-01-14 21:05:56 +01:00
lukashov
b00f64ed56
1)Removing dlsch_dual_stream_correlation
...
2) Fixing bug in mrc_TM4 - removing loop over tx antennas.
2016-01-14 10:55:49 +01:00
lukashov
10e8d30699
NULL pointer
2016-01-13 23:54:25 +01:00
lukashov
fa315a3115
Fixing bug in passing arguments to dlsch_dual_stream_correlation, introducing dlsch_dual_stream_correlation_opposite
2016-01-13 18:54:03 +01:00
lukashov
e2d13c9762
Revert "Experimanetal change in dlsch_channel_commensation_TM34. Will not work for more than 2 antennas."
...
This reverts commit cbd30e62fa .
2016-01-13 14:43:47 +01:00
lukashov
aaccaf9796
Revert ":q#"
...
This reverts commit 83324945ad , reversing
changes made to cbd30e62fa .
2016-01-13 14:43:16 +01:00
lukashov
83324945ad
:q#
2016-01-13 12:46:40 +01:00
lukashov
cbd30e62fa
Experimanetal change in dlsch_channel_commensation_TM34. Will not work for more than 2 antennas.
...
Testing.
2016-01-13 12:17:29 +01:00
lukashov
432a889cc0
Stupid check if do not divide by 2 the aver level
2016-01-11 16:27:58 +01:00
lukashov
5e1e8a58a7
Fixing previous commit
2016-01-11 16:12:21 +01:00
lukashov
e5a94ee6dd
Exchanging rho for thr first stream and for the second in qpsk_qpsk_llr
2016-01-11 16:04:10 +01:00
lukashov
42eeb9d65e
New attempt to scale IA receiver
2016-01-11 15:53:13 +01:00
lukashov
e4dec0771c
Another change for aver level: now log2aaprox(ch11/2) + log2approx(ch21/2) -13 +shift
2016-01-11 15:04:03 +01:00
lukashov
388452f1bc
For in demodulation TM4 trying average as a sum of energy in both antennas.
...
Changing names of output files in dlsim respectiively.
2016-01-11 11:10:04 +01:00
lukashov
73382b8284
Validating abstraction.c with a hotfix.
2016-01-08 16:54:06 +01:00
lukashov
a5f9c92507
Merge remote-tracking branch 'origin/hotfix-71-freq_channel' into feature-59-tm4
...
Conflicts:
openair1/PHY/TOOLS/cdot_prod.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.usrpb210.conf
2016-01-08 16:33:14 +01:00
lukashov
d0fac35f68
Preparing to merge with hotfix-71-freq_channel, running with old version of abstrcation.c
2016-01-08 16:13:09 +01:00
lukashov
bbb369a937
Small bugfix for TM5 and TM6
2016-01-08 15:53:41 +01:00
lukashov
42eb48faa7
Fixing previous commit: messed up with parenthesis in dlsch_demodulation.c
2016-01-08 15:32:53 +01:00
Florian Kaltenberger
6011553117
fixing issue 71 (bug in freq_channel)
2016-01-08 12:02:42 +01:00
lukashov
b80a6660bf
Some more clean up in dlsch_demodulation.c
2016-01-07 13:50:45 +01:00
lukashov
3521765b62
Changes:
...
1. Fixing a bug in dlsch_channel_level_TM56.
avg128D = _mm_setzero_si128() must be done inside the rx_antennas loop and not before
2. Cleaning up code in dlsch_demodulation.c
3. Offsets for TM5 and TM6 still must be validated.
4. Right now IA and I-UA receivers for TM4 have the same offset -
validate if any additional penalty/gain is needed.
5. Shortened file names in dlsim.c since matlab can read only 63-characters file names.
6. Tested: TM4 U2 -gS perfect CE works fine for EESM and MIESM abstraction (MCS 4 MSE= 0.007 dB on both streams).
2016-01-07 11:47:14 +01:00
lukashov
80cb191214
Now channel-level dependent part of log2_approx works properly.
...
Validating mcs-dependent shift.
2016-01-06 13:07:10 +01:00
lukashov
3262bfa66e
Fixing dlsch_channel_level_TM34.
...
Passing 2 avrage channel lvel and not max how it was done before.
Continuing with calibration.
2016-01-06 10:38:47 +01:00
lukashov
4031335617
Changing names of the files in dlsim.c
2016-01-05 20:24:12 +01:00
lukashov
7a8e3a421c
Commit to compare -u0 and -u2 performance in interference free environment for
...
TM4 and verify if any additional gain/penatly is needed.
2016-01-05 15:27:15 +01:00
lukashov
73c76d1456
Small changes in dataout file names.
2016-01-05 11:11:35 +01:00
lukashov
fa64a12850
Applying channel scaling for TM4, playing with log2approx in demodulation
2016-01-05 00:25:23 +01:00
lukashov
ef3991d461
Minor change in dlsch_demod.
2016-01-04 16:58:32 +01:00
lukashov
6e839bf82c
Minor change in dlsim.c
2016-01-04 15:31:49 +01:00
lukashov
404814f706
In demod removing -13 to play with absolute value of shift
2016-01-04 15:30:02 +01:00