From c5af88b6e912006be4b056843743aa68124d0d9c Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Sun, 10 Mar 2013 15:50:05 +0000
Subject: [PATCH] Task #3696: Implemented bitmode/clock auto-sense, and avoid
working with Hz clocks
---
RTCP/InputProc/test/tGenerator.cc | 5 ++---
RTCP/InputProc/test/tSampleBuffer.cc | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/RTCP/InputProc/test/tGenerator.cc b/RTCP/InputProc/test/tGenerator.cc
index 011019076f0..924e122472c 100644
--- a/RTCP/InputProc/test/tGenerator.cc
+++ b/RTCP/InputProc/test/tGenerator.cc
@@ -33,15 +33,14 @@ int main( int, char **argv ) {
vector<string> streamDescs(1, "tcp:localhost:54321");
- unsigned clock = 200 * 1000 * 1000;
- struct StationID stationID("RS106", "LBA", clock, 16);
+ struct StationID stationID("RS106", "LBA", 200, 16);
struct BufferSettings settings;
settings.station = stationID;
settings.nrBeamlets = 61;
settings.nrBoards = 1;
- settings.nrSamples = (2 * stationID.clock / 1024);// & ~0xFL;
+ settings.nrSamples = (2 * stationID.clockMHz * 1000000 / 1024);// & ~0xFL;
settings.nrFlagRanges = 64;
settings.dataKey = stationID.hash();
diff --git a/RTCP/InputProc/test/tSampleBuffer.cc b/RTCP/InputProc/test/tSampleBuffer.cc
index ad254869c12..4292aa114b2 100644
--- a/RTCP/InputProc/test/tSampleBuffer.cc
+++ b/RTCP/InputProc/test/tSampleBuffer.cc
@@ -36,15 +36,14 @@ int main( int, char **argv ) {
OMPThread::init();
- unsigned clock = 200 * 1000 * 1000;
- struct StationID stationID("RS106", "LBA", clock, 16);
+ struct StationID stationID("RS106", "LBA", 200, 16);
struct BufferSettings settings;
settings.station = stationID;
settings.nrBeamlets = 61;
settings.nrBoards = 1;
- settings.nrSamples = (2 * stationID.clock / 1024);// & ~0xFL;
+ settings.nrSamples = (2 * stationID.clockMHz * 1000000 / 1024);// & ~0xFL;
settings.nrFlagRanges = 64;
settings.dataKey = 0x12345678;
--
GitLab