From 2ef1c934d1fedf4b3cea1ff14757b76fb340c428 Mon Sep 17 00:00:00 2001 From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr> Date: Sun, 2 Feb 2014 18:23:10 +0000 Subject: [PATCH] EMOS import filter function now takes 'EMOS_CHANNEL' as argument git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5005 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair1/EMOS/LTE/IMPORT_FILTER/load_estimates_lte_new.m | 9 +++++---- openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/load_estimates_lte_new.m b/openair1/EMOS/LTE/IMPORT_FILTER/load_estimates_lte_new.m index f0e05b3ec2..82447d01a1 100644 --- a/openair1/EMOS/LTE/IMPORT_FILTER/load_estimates_lte_new.m +++ b/openair1/EMOS/LTE/IMPORT_FILTER/load_estimates_lte_new.m @@ -1,9 +1,9 @@ -function [estimates, NFrames, gps_data, H] = load_estimates_lte_new(filename, NFrames_max, decimation, is_eNb) +function [estimates, NFrames, gps_data, H] = load_estimates_lte_new(filename, NFrames_max, decimation, is_eNb, EMOS_CHANNEL) % % EMOS Single User Import Filter % % [estimates, NFrames] = -% load_estimates_lte(filename, NFrames_max, decimation, is_eNb) +% load_estimates_lte(filename, NFrames_max, decimation, is_eNb, EMOS_CHANNEL) % % Parameters: % filename - filename(s) of the EMOS data file @@ -11,7 +11,8 @@ function [estimates, NFrames, gps_data, H] = load_estimates_lte_new(filename, NF % maximum file contents % decimation - read every 'decimation' frame % is_eNb - if ~= 0 we load data from an eNb -% version - for backward compatibility (see details below) +% EMOS_CHANNEL - if the measurement contains the full channel +% estimate, set this to 1 % % Returns: % estimates - A structure array containing timestamp, etc @@ -26,7 +27,7 @@ function [estimates, NFrames, gps_data, H] = load_estimates_lte_new(filename, NF % 20100317 0.1 Created based on load_estimates if nargin < 5 - version = Inf; + EMOS_CHANNEL = 0; end if nargin < 4 is_eNb = 1; diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m b/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m index f16c9b086e..8e4946e57b 100644 --- a/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m +++ b/openair1/EMOS/LTE/IMPORT_FILTER/struct_template_new.m @@ -33,7 +33,7 @@ NB_ANTENNAS_TX = 2; MAX_CQI_BITS = 40; MAX_DCI_SIZE_BITS = 45; -EMOS_CHANNEL = 0; +% EMOS_CHANNEL = 0; % enable this line to enable error checking % get_dump_size -- GitLab