Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added ppm output #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added ppm output #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaa1f3d
Added ppm output
cgommel Aug 22, 2013
ee60d95
Added Library Path for i386 Linux machines
cgommel Oct 24, 2013
c12fa2c
Added Library path /usr/lib/arm-linux-gnueabihf/ for fftw and itpp
cgommel May 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmake/Modules/FindFFTW.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ 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
/usr/lib64
/usr/lib
Expand Down
2 changes: 2 additions & 0 deletions cmake/Modules/FindITPP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ FIND_LIBRARY(ITPP_LIBRARY_NORMAL
/usr/lib64
/usr/lib
/usr/local/lib
/usr/lib/arm-linux-gnueabihf
NO_DEFAULT_PATH
)

Expand All @@ -35,6 +36,7 @@ FIND_LIBRARY(ITPP_LIBRARY_DEBUG
/usr/lib64
/usr/lib
/usr/local/lib
/usr/lib/arm-linux-gnueabihf
NO_DEFAULT_PATH
)

Expand Down
7 changes: 5 additions & 2 deletions src/CellSearch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Cell>::iterator it=cells_final.begin();
while (it!=cells_final.end()) {
// Use a stringstream to avoid polluting the iostream settings of cout.
Expand Down Expand Up @@ -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;
Expand Down