Task #11406: Simplified interface to convertFlagsToChannelFlags

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

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);
 

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);
 

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
     );