From 2feb64231e22499b11a6f8030b4a8e73429ff3ea Mon Sep 17 00:00:00 2001
From: John Romein <romein@astron.nl>
Date: Fri, 17 Apr 2009 14:38:57 +0000
Subject: [PATCH] bug 225: Avoid confusion about center frequency and base
frequency.
---
RTCP/CNProc/test/tCN_Processing.cc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/RTCP/CNProc/test/tCN_Processing.cc b/RTCP/CNProc/test/tCN_Processing.cc
index 7f052e44a56..3e0afdef1d2 100644
--- a/RTCP/CNProc/test/tCN_Processing.cc
+++ b/RTCP/CNProc/test/tCN_Processing.cc
@@ -197,9 +197,10 @@ template <typename SAMPLE_TYPE> void doWork()
unsigned nrChannels = 256;
unsigned nrSamplesPerIntegration = 768;
double sampleRate = 195312.5;
- double refFreq = 384 * sampleRate;
+ double centerFrequency = 384 * sampleRate;
+ double baseFrequency = centerFrequency - .5 * sampleRate;
unsigned testSignalChannel = 5;
- double signalFrequency = refFreq + (testSignalChannel + (nrChannels/2)) * sampleRate / nrChannels;
+ double signalFrequency = baseFrequency + testSignalChannel * sampleRate / nrChannels;
unsigned nrSamplesToCNProc = nrChannels * (nrSamplesPerIntegration + NR_TAPS - 1) + 32 / sizeof(SAMPLE_TYPE[NR_POLARIZATIONS]);
std::vector<unsigned> station2SuperStation;
@@ -237,7 +238,8 @@ template <typename SAMPLE_TYPE> void doWork()
signalFrequency = atof(env);
}
- std::clog << "base frequency = " << refFreq << std::endl;
+ std::clog << "base frequency = " << baseFrequency << std::endl;
+ std::clog << "center frequency = " << centerFrequency << std::endl;
std::clog << "signal frequency = " << signalFrequency << std::endl;
ArenaMapping mapping;
@@ -261,7 +263,7 @@ template <typename SAMPLE_TYPE> void doWork()
for (unsigned stat = 0; stat < nrStations; stat ++) {
ppf.computeFlags(stat, &transposedData, &filteredData);
- ppf.filter(stat, refFreq, &transposedData, &filteredData);
+ ppf.filter(stat, centerFrequency, &transposedData, &filteredData);
}
beamFormer.formBeams(&filteredData);
--
GitLab