minor tuning on threshold and default ppm setting

Author: Jiao Xianjun(Ryan)

Matlab/regression_test_result/find_optimal_Z_th1.m

@@ -5,7 +5,8 @@
 % load simple_resv1_2_4_pss_period_try1_max_peak_all_improved_record_more/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange160_parTh15_numPth0.5.mat;
 % load simple_resv1_2_4_pss_period_try1_max_peak_all_improved_record_more_ex_gain2.4/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange160_parTh15_numPth0.5.mat;
 % load simple_resv1_2_4_pss_period_try1_max_peak_all_improved_record_more_ex_gain2/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange160_parTh15_numPth0.5.mat;
-load simple_resv1_2_4_pss_period_try1_max_peak_all_improved_record_more_ex_gain2_peak_range-1/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat;
+% load simple_resv1_2_4_pss_period_try1_max_peak_all_improved_record_more_ex_gain2_peak_range-1/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat;
+load par_explore/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat;
 
 idx_raw = [];
 z_th1_store_raw = [];

Matlab/regression_test_result/par_analyze.m

@@ -0,0 +1,50 @@
+
+clear all; close all;
+
+format_str = {'r', 'b.', 'gs', 'k'};
+load par_explore/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat;
+
+idx_raw = [];
+z_th1_store_raw = [];
+pow_store_raw = [];
+z_th1_store = [];
+pow_store = [];
+top_idx = [];
+sub_idx = [];
+try_idx = [];
+par_valid = [];
+par_invalid = [];
+par_combined_max_valid = [];
+par_combined_max_invalid = [];
+par_max_max_valid = [];
+par_max_max_invalid = [];
+for i = 1 : length(cell_info)
+    a = cell_info{i};
+    for k = 1 : length(a)
+        z_th1_store_raw = [z_th1_store_raw a(k).Z_th1];
+        pow_store_raw = [pow_store_raw a(k).pow];
+        flag = 0;
+        if ~isnan(a(k).n_id_cell)
+            flag = 1;
+            z_th1_store = [z_th1_store a(k).Z_th1];
+            try_idx = [try_idx a(k).extra_info.try_idx];
+            par_valid = [par_valid a(k).extra_info.par];
+            par_combined_max_valid = [par_combined_max_valid a(k).extra_info.par_combined_max];
+            par_max_max_valid = [par_max_max_valid a(k).extra_info.par_max_max];
+            pow_store = [pow_store a(k).pow];
+            top_idx = [top_idx i];
+            sub_idx = [sub_idx k];
+        else
+            par_invalid = [par_invalid a(k).extra_info.par];
+            par_combined_max_invalid = [par_combined_max_invalid a(k).extra_info.par_combined_max];
+            par_max_max_invalid = [par_max_max_invalid a(k).extra_info.par_max_max];
+        end
+        idx_raw = [idx_raw flag];
+    end
+end
+
+figure; plot(try_idx, 'b.-');
+
+figure; plot(par_valid, 'b'); hold on; plot(par_invalid, 'r');
+figure; plot(par_combined_max_valid, 'b'); hold on; plot(par_combined_max_invalid, 'r');
+figure; plot(par_max_max_valid, 'b'); hold on; plot(par_max_max_invalid, 'r');

Matlab/regression_test_result/par_explore/CellSearch_test13to16_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat

@@ -0,0 +1,36 @@
+% function merge_result
+clear all; close all;
+
+load CellSearch_test1to4_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save = cell_info;
+
+load CellSearch_test5to8_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save(test_sp:test_ep) = cell_info(test_sp:test_ep);
+
+load CellSearch_test9to12_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save(test_sp:test_ep) = cell_info(test_sp:test_ep);
+
+load CellSearch_test13to16_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save(test_sp:test_ep) = cell_info(test_sp:test_ep);
+
+load CellSearch_test17to20_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save(test_sp:test_ep) = cell_info(test_sp:test_ep);
+
+load CellSearch_test21to24_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save(test_sp:test_ep) = cell_info(test_sp:test_ep);
+
+load CellSearch_test25to28_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save(test_sp:test_ep) = cell_info(test_sp:test_ep);
+
+load CellSearch_test29to33_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+cell_info_save(test_sp:test_ep) = cell_info(test_sp:test_ep);
+
+cell_info = cell_info_save;
+
+test_sp = 1;
+test_ep = 33;
+
+clear cell_info_save;
+
+save CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat
+

Matlab/regression_test_result/par_explore/CellSearch_test17to20_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat

@@ -57,7 +57,8 @@
 pss_period = 19200/2;
 
 num_half_radioframe = floor( len_short./pss_period );
-peak_to_avg = zeros(1, num_fo_pss);
+% peak_to_avg = zeros(1, num_fo_pss);
+peak_to_avg_combined_max = zeros(1, num_fo_pss);
 
 corr_store_tmp = corr_store(1:pss_period, : );
 for j=2:num_half_radioframe
@@ -66,6 +67,14 @@
     corr_store_tmp = corr_store_tmp + corr_store(sp:ep, : );
 end
 
+% peak_to_avg_max_max_tmp = zeros(num_half_radioframe, num_fo_pss);
+% for j=1:num_half_radioframe
+%     sp = (j-1)*pss_period + 1;
+%     ep = j*pss_period;
+%     peak_to_avg_max_max_tmp(j,:) = (max(corr_store(sp:ep, : ), [], 1)./mean(corr_store(sp:ep, : ), 1));
+% end
+% peak_to_avg_max_max = 10.*log10( max(peak_to_avg_max_max_tmp, [], 1) );
+
 [~, max_idx_all] = max(corr_store_tmp, [], 1);
 for j=1:num_fo_pss
     tmp_max_idx = max_idx_all(j);
@@ -80,7 +89,8 @@
 %     tmp_avg = mean(tmp_avg);
 
     tmp_avg = (sum(corr_store_tmp(:, j))  - tmp_peak)/(pss_period - 2*num_half_radioframe -1 );
-    peak_to_avg(j) = 10*log10(tmp_peak/tmp_avg);
+%     peak_to_avg(j) = 10*log10(tmp_peak/tmp_avg);
+    peak_to_avg_combined_max(j) = 10*log10(corr_store_tmp(tmp_max_idx, j)/tmp_avg);
 end
 
 max_peak_all = max(corr_store, [], 1);
@@ -93,9 +103,18 @@
 % [~, sort_idx] = sort(peak_to_avg, 'descend');
 
 % max_reserve = 1;
-above_par_idx = (peak_to_avg(sort_idx(1:max_reserve)) > par_th);
-disp(['Hit        PAR ' num2str(peak_to_avg(sort_idx(1:max_reserve))) 'dB']);
-extra_info.par = peak_to_avg(sort_idx(1:max_reserve));
+% above_par_idx = (peak_to_avg(sort_idx(1:max_reserve)) > par_th);
+% disp(['Hit        PAR ' num2str(peak_to_avg(sort_idx(1:max_reserve))) 'dB']);
+
+above_par_idx = (peak_to_avg_combined_max(sort_idx(1:max_reserve)) > par_th);
+disp(['Hit        PAR ' num2str(peak_to_avg_combined_max(sort_idx(1:max_reserve))) 'dB']);
+
+% disp(['Hit        PAR ' num2str(peak_to_avg_max_max(sort_idx(1:max_reserve))) 'dB']);
+
+% extra_info.par = peak_to_avg(sort_idx(1:max_reserve));
+extra_info.par_combined_max = peak_to_avg_combined_max(sort_idx(1:max_reserve));
+% extra_info.par_max_max = peak_to_avg_max_max(sort_idx(1:max_reserve));
+
 extra_info.sort_idx = sort_idx(1:max_reserve);
 a_tmp = [fo_search_set fo_search_set fo_search_set];
 extra_info.fo_raw = a_tmp(sort_idx(1:max_reserve));

Matlab/regression_test_result/par_explore/CellSearch_test1to33_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat

@@ -24,7 +24,7 @@
 num_pss_period_try = 1;
 % combined_pss_peak_range = 160;
 combined_pss_peak_range = -1; % set it to -1 to use complementary range of peak.
-par_th = 16;
+par_th = 8.5;
 num_peak_th = 1/2; % originally is 2/3;
 
 filename = ['CellSearch_test' num2str(test_sp) 'to' num2str(test_ep) '_twist' num2str(sampling_carrier_twist) '_fo' num2str(min(f_search_set)/1e3) 'to' num2str(max(f_search_set)/1e3) '_resv' num2str(pss_peak_max_reserve) '_numPtry' num2str(num_pss_period_try) '_Prange' num2str(combined_pss_peak_range) '_parTh' num2str(par_th) '_numPth' num2str(num_peak_th) '.mat'];

Matlab/regression_test_result/par_explore/CellSearch_test1to34_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8.5_numPth0.5.mat

@@ -128,6 +128,13 @@ class lte_opencl_t {
 };
 #endif
 
+void filter_my_fft(
+  //Inputs
+  const itpp::vec & coef,
+  //Inputs&Outputs
+  itpp::cvec & capbuf
+);
+
 // FIR 6RB filter
 void filter_my(
   //Inputs

Matlab/regression_test_result/par_explore/CellSearch_test1to4_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat

@@ -108,7 +108,7 @@ void print_usage() {
   cout << "'c' is the correction factor to apply and indicates that if the desired" << endl;
   cout << "center frequency is fc, the RTL-SDR dongle should be instructed to tune" << endl;
   cout << "to freqency fc*c so that its true frequency shall be fc. Default: 1.0" << endl << endl;
-  cout << "'ppm' is the remaining frequency error of the crystal. Default: 120" << endl;
+  cout << "'ppm' is the remaining frequency error of the crystal. Default: - (search -140kHz to 135kHz)" << endl;
   cout << "" << endl;
   cout << "If the crystal has not been used for a long time, use the default values for" << endl;
   cout << "'ppm' and 'c' until a cell is successfully located. The program will return" << endl;
@@ -155,7 +155,7 @@ void parse_commandline(
   freq_end=-1;
   num_try=1; // default number
   sampling_carrier_twist=false;
-  ppm=120;
+  ppm=0;
   correction=1;
   save_cap=false;
   use_recorded_data=false;
@@ -856,14 +856,24 @@ int main(
   cmat pss_fo_set;// pre-generate frequencies offseted pss time domain sequence
   vec f_search_set;
   if (sampling_carrier_twist) { // original mode
-    const uint16 n_extra=floor_i((fc_search_set(0)*ppm/1e6+2.5e3)/5e3);
+    uint16 n_extra=0;
+    if (ppm!=0)
+      n_extra=floor_i((fc_search_set(0)*ppm/1e6+2.5e3)/5e3);
+    else
+      n_extra=28;
+
     f_search_set=to_vec(itpp_ext::matlab_range( -n_extra*5000,5000, (n_extra-1)*5000));
     // for graphic card which has limited mem, you should turn num_loop on if OpenCL reports -4: CL_MEM_OBJECT_ALLOCATION_FAILURE
 //    if (num_loop == 0) // it is not so useful
 //      num_loop = length(f_search_set)/2;
   } else {
     if (length(fc_search_set)==1) {//when only one frequency is specified, whole PPM range should be covered
-      const uint16 n_extra=floor_i((fc_search_set(0)*ppm/1e6+2.5e3)/5e3);
+      uint16 n_extra=0;
+      if (ppm!=0)
+        n_extra=floor_i((fc_search_set(0)*ppm/1e6+2.5e3)/5e3);
+      else
+        n_extra=28; //-140kHz to 135kHz
+
       f_search_set=to_vec(itpp_ext::matlab_range( -n_extra*5000,5000, (n_extra-1)*5000));
     } else {
       // since we have frequency step is 100e3, why not have sub search set limited by this regardless PPM?
@@ -985,7 +995,13 @@ int main(
     // 6RB filter to improve SNR
 //    tt.tic();
     #ifdef USE_OPENCL
+//      tt.tic();
       lte_ocl.filter_my(capbuf); // be careful! capbuf.zeros() will slow down the xcorr part pretty much!
+//      cout << "1 cost " << tt.get_time() << "s\n";
+//
+//      tt.tic();
+//      filter_my_fft(coef, capbuf);
+//      cout << "2 cost " << tt.get_time() << "s\n";
     #else
       filter_my(coef, capbuf);
     #endif

Matlab/regression_test_result/par_explore/CellSearch_test21to24_twist0_fo-140to140_resv2_numPtry1_Prange-1_parTh8_numPth0.5.mat

@@ -51,6 +51,7 @@
 #include <itpp/itbase.h>
 #include <itpp/signal/transforms.h>
 #include <itpp/stat/misc_stat.h>
+#include <itpp/signal/freq_filt.h>
 #include <math.h>
 #include <list>
 #include <iomanip>
@@ -1883,6 +1884,39 @@ void normalize(
   s = sqrt(len)*s/sqrt(acc);
 }
 
+// FIR 6RB filter
+void filter_my_fft(
+  //Inputs
+  const vec & coef,
+  //Inputs&Outputs
+  cvec & capbuf
+) {
+  uint32 len = length(capbuf);
+  uint16 len_fir = length(coef);
+  uint16 len_half = (len_fir-1)/2;
+
+  vec tmpbufin_re(len+len_fir-1);
+  vec tmpbufin_im(len+len_fir-1);
+
+  tmpbufin_re.set_subvector(0, real(capbuf));
+  tmpbufin_im.set_subvector(0, imag(capbuf));
+  tmpbufin_re.set_subvector(len, len+len_fir-1, 0);
+  tmpbufin_im.set_subvector(len, len+len_fir-1, 0);
+
+  Freq_Filt<double> FF(coef, len+len_fir-1);
+
+//  Real_Timer tt;
+//  tt.tic();
+  vec tmpbufout_re = FF.filter(tmpbufin_re);
+  vec tmpbufout_im = FF.filter(tmpbufin_im);
+//  cout << "2 cost " << tt.get_time() << "s\n";
+//  cout << tmpbufout_re(len_half, len_half+7) << "\n";
+
+  for(uint32 i=0; i<len; i++) {
+    capbuf(i) = complex<double>(tmpbufout_re(i+len_half), tmpbufout_im(i+len_half));
+  }
+}
+
 // FIR 6RB filter
 void filter_my(
   //Inputs
@@ -2248,7 +2282,7 @@ void sampling_ppm_f_search_set_by_pss(
   const uint32 pss_period = 19200/2;
 
   const uint32 num_half_radioframe = len_short/pss_period;
-  vec peak_to_avg(num_fo_pss);
+  vec peak_to_avg_combined_max(num_fo_pss);
   mat corr_store_tmp(num_fo_pss, pss_period);
   corr_store_tmp = corr_store.get_cols(0, pss_period-1);
   for (uint16 j=1; j<num_half_radioframe; j++) {
@@ -2278,7 +2312,7 @@ void sampling_ppm_f_search_set_by_pss(
     tmp_peak = sum( corr_store_tmp_col.get(sum_range) );
 
     tmp_avg_val = (sum(corr_store_tmp_col) - tmp_peak)/((double)pss_period-(2.0*(double)num_half_radioframe+1.0));
-    peak_to_avg(j) = tmp_peak/tmp_avg_val;
+    peak_to_avg_combined_max(j) = corr_store_tmp(j, tmp_max_idx)/tmp_avg_val;
 
 //    tmp_store = corr_store.get_row(j);
 //    logical_tmp = tmp_store > (max_peak_all(j)*2/3);
@@ -2287,9 +2321,9 @@ void sampling_ppm_f_search_set_by_pss(
 
   ivec sort_idx = sort_index(max_peak_all);
   sort_idx = reverse(sort_idx); // from ascending to descending
-  cout << "Hit        PAR " << 10.0*log10( peak_to_avg.get( sort_idx(0, max_reserve-1) ) ) << "dB\n";
+  cout << "Hit        PAR " << 10.0*log10( peak_to_avg_combined_max.get( sort_idx(0, max_reserve-1) ) ) << "dB\n";
 
-  ivec above_par_idx = to_ivec( peak_to_avg.get( sort_idx(0, max_reserve-1) ) > pow(10.0, 16/10.0) );
+  ivec above_par_idx = to_ivec( peak_to_avg_combined_max.get( sort_idx(0, max_reserve-1) ) > pow(10.0, 8.5/10.0) );
   uint16 len_sort_idx = sum(above_par_idx);
 
   if (len_sort_idx==0) {