From c335e691b9ad3b21be1b29c9ddd341e6fd146c85 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Sun, 15 Oct 2017 12:12:52 +0000
Subject: [PATCH] Task #11406: Simplified interface to
convertFlagsToChannelFlags
---
RTCP/Cobalt/GPUProc/src/Flagger.cc | 3 ++-
.../src/cuda/SubbandProcs/BeamFormerPreprocessingStep.cc | 2 +-
RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/CorrelatorStep.cc | 2 +-
RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorStep.cc | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/RTCP/Cobalt/GPUProc/src/Flagger.cc b/RTCP/Cobalt/GPUProc/src/Flagger.cc
index 31d3e92c27a..57272e2e380 100644
--- a/RTCP/Cobalt/GPUProc/src/Flagger.cc
+++ b/RTCP/Cobalt/GPUProc/src/Flagger.cc
@@ -30,7 +30,7 @@ namespace LOFAR
void Flagger::convertFlagsToChannelFlags(
MultiDimArray<LOFAR::SparseSet<unsigned>, 1>const &inputFlags,
MultiDimArray<SparseSet<unsigned>, 1>& flagsPerChannel,
- const unsigned nrSamplesPerChannel,
+ const unsigned nrSamples,
const unsigned nrChannels,
const ssize_t nrPrefixedSamples)
{
@@ -39,6 +39,7 @@ namespace LOFAR
// If nrChannels == 1, we do not expect nrPrefixedSamples
ASSERT(nrChannels > 1 || nrPrefixedSamples == 0);
+ unsigned nrSamplesPerChannel = nrSamples / nrChannels;
unsigned log2NrChannels = log2(nrChannels);
// Convert the flags per sample to flags per channel
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerPreprocessingStep.cc b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerPreprocessingStep.cc
index 0021057f0ea..e85db407724 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerPreprocessingStep.cc
+++ b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerPreprocessingStep.cc
@@ -124,7 +124,7 @@ namespace LOFAR
Flagger::convertFlagsToChannelFlags(
input.inputFlags,
flagsPerChannel,
- ps.settings.blockSize / ps.settings.beamFormer.nrDelayCompensationChannels,
+ ps.settings.blockSize,
ps.settings.beamFormer.nrDelayCompensationChannels,
0);
diff --git a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/CorrelatorStep.cc b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/CorrelatorStep.cc
index b1ed83fe4b4..b5879688097 100644
--- a/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/CorrelatorStep.cc
+++ b/RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/CorrelatorStep.cc
@@ -89,7 +89,7 @@ namespace LOFAR
Cobalt::Flagger::convertFlagsToChannelFlags(
inputFlags,
flagsPerChannel,
- parset.settings.correlator.nrSamplesPerBlock,
+ parset.settings.blockSize,
parset.settings.correlator.nrChannels,
parset.settings.correlator.nrChannels == 1 ? 0 : NR_TAPS - 1);
diff --git a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorStep.cc b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorStep.cc
index c23a63ec681..15a6d205df0 100644
--- a/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorStep.cc
+++ b/RTCP/Cobalt/GPUProc/test/SubbandProcs/tCorrelatorStep.cc
@@ -79,7 +79,7 @@ TEST(convertFlagsToChannelFlags)
CorrelatorStep::Flagger::convertFlagsToChannelFlags(
inputFlags,
flagsPerChannel,
- parset.settings.correlator.nrSamplesPerBlock,
+ parset.settings.blockSize,
parset.settings.correlator.nrChannels,
NR_TAPS - 1
);
--
GitLab