From aaa1f3d8899a383fc3364d8dacbff7cea5679a9c Mon Sep 17 00:00:00 2001 From: Christoph Gommel Date: Thu, 22 Aug 2013 10:42:44 +0200 Subject: [PATCH 1/3] Added ppm output --- src/CellSearch.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/CellSearch.cpp b/src/CellSearch.cpp index 38ea9661..383efe9a 100644 --- a/src/CellSearch.cpp +++ b/src/CellSearch.cpp @@ -578,7 +578,7 @@ int main( } else { cout << "Detected the following cells:" << endl; cout << "A: #antenna ports C: CP type ; P: PHICH duration ; PR: PHICH resource type" << endl; - cout << "CID A fc foff RXPWR C nRB P PR CrystalCorrectionFactor" << endl; + cout << "CID A fc foff RXPWR C nRB P PR CrystalCorrection ppm" << endl; list ::iterator it=cells_final.begin(); while (it!=cells_final.end()) { // Use a stringstream to avoid polluting the iostream settings of cout. @@ -606,7 +606,10 @@ int main( // Calculate correction factors const double correction_residual=true_location/crystal_freq_actual; const double correction_new=correction*correction_residual; - ss << " " << setprecision(20) << correction_new; + ss << " " << setw(17) << setprecision(15) << correction_new; + // Calculate deviation in ppm + const double correction_ppm=1e6*(correction_new-1); + ss << " " << setw(5) << setprecision(3) << correction_ppm; cout << ss.str() << endl; ++it; From ee60d95b02f9c82761e2784f4e9cfd96e71c6da1 Mon Sep 17 00:00:00 2001 From: Christoph Gommel Date: Thu, 24 Oct 2013 23:41:16 +0200 Subject: [PATCH 2/3] Added Library Path for i386 Linux machines --- cmake/Modules/FindFFTW.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Modules/FindFFTW.cmake b/cmake/Modules/FindFFTW.cmake index 98f49d8c..2ff3243a 100644 --- a/cmake/Modules/FindFFTW.cmake +++ b/cmake/Modules/FindFFTW.cmake @@ -21,6 +21,7 @@ FIND_LIBRARY(FFTW_LIBRARY PATHS ${FFTW_DIR}/libs "${FFTW_DIR}\\win32\\lib" /usr/lib/x86_64-linux-gnu + /usr/lib/i386-linux-gnu /usr/pkgs64/lib /usr/lib64 /usr/lib From c12fa2c3976b2f2241d19ffbdc03c566542a9cdd Mon Sep 17 00:00:00 2001 From: Christoph Gommel Date: Tue, 6 May 2014 13:45:49 +0200 Subject: [PATCH 3/3] Added Library path /usr/lib/arm-linux-gnueabihf/ for fftw and itpp Needed for Debian on CubieBoard --- cmake/Modules/FindFFTW.cmake | 1 + cmake/Modules/FindITPP.cmake | 2 ++ 2 files changed, 3 insertions(+) diff --git a/cmake/Modules/FindFFTW.cmake b/cmake/Modules/FindFFTW.cmake index 2ff3243a..7056fba7 100644 --- a/cmake/Modules/FindFFTW.cmake +++ b/cmake/Modules/FindFFTW.cmake @@ -20,6 +20,7 @@ FIND_LIBRARY(FFTW_LIBRARY NAMES fftw3 PATHS ${FFTW_DIR}/libs "${FFTW_DIR}\\win32\\lib" + /usr/lib/arm-linux-gnueabihf /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu /usr/pkgs64/lib diff --git a/cmake/Modules/FindITPP.cmake b/cmake/Modules/FindITPP.cmake index 4f3b4171..a26d1b5e 100644 --- a/cmake/Modules/FindITPP.cmake +++ b/cmake/Modules/FindITPP.cmake @@ -24,6 +24,7 @@ FIND_LIBRARY(ITPP_LIBRARY_NORMAL /usr/lib64 /usr/lib /usr/local/lib + /usr/lib/arm-linux-gnueabihf NO_DEFAULT_PATH ) @@ -35,6 +36,7 @@ FIND_LIBRARY(ITPP_LIBRARY_DEBUG /usr/lib64 /usr/lib /usr/local/lib + /usr/lib/arm-linux-gnueabihf NO_DEFAULT_PATH )