From 037b440db752845fda342cf9a655ec67e711b4b7 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 5 Dec 2012 13:18:18 +0000
Subject: [PATCH] Task #3696: Cleanup
---
RTCP/InputProc/src/BufferSettings.h | 2 --
RTCP/InputProc/src/SampleBuffer.h | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/RTCP/InputProc/src/BufferSettings.h b/RTCP/InputProc/src/BufferSettings.h
index 0629def6fb6..37225f986dd 100644
--- a/RTCP/InputProc/src/BufferSettings.h
+++ b/RTCP/InputProc/src/BufferSettings.h
@@ -9,8 +9,6 @@
namespace LOFAR {
namespace RTCP {
-#define NR_RSPBOARDS 4
-
struct BufferSettings {
private:
static const unsigned currentVersion = 1;
diff --git a/RTCP/InputProc/src/SampleBuffer.h b/RTCP/InputProc/src/SampleBuffer.h
index 0d6a21bc710..dcb29215509 100644
--- a/RTCP/InputProc/src/SampleBuffer.h
+++ b/RTCP/InputProc/src/SampleBuffer.h
@@ -10,6 +10,7 @@
#include "Ranges.h"
#include "SampleType.h"
#include <string>
+#include <vector>
namespace LOFAR {
namespace RTCP {
@@ -28,7 +29,7 @@ private:
static size_t dataSize( const struct BufferSettings &settings ) {
return sizeof settings
- + NR_RSPBOARDS * (Ranges::size(settings.nrFlagRanges) + 8)
+ + settings.nrBoards * (Ranges::size(settings.nrFlagRanges) + 8)
+ settings.nrBeamlets * (settings.nrSamples * sizeof(T) + 128);
}
--
GitLab