Task #4589: Testing with 16 output channels i.s.o 1. Doesn't work yet, but squashed two bugs.

RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerFactories.cc

@@ -143,12 +143,10 @@ namespace LOFAR
       {
         FIR_FilterKernel::Parameters params(ps);
 
-        params.nrSTABs = ps.settings.beamFormer.maxNrTABsPerSAP();
+        params.nrSTABs = ps.nrStations();
 
-        // define at least 16 channels to get the FIR_Filter.cu to compile, even
-        // if we won't use it.
-        params.nrChannelsPerSubband = std::max(16U,
-          ps.settings.beamFormer.incoherentSettings.nrChannels);
+        params.nrChannelsPerSubband = 
+          ps.settings.beamFormer.incoherentSettings.nrChannels;
 
         // time integration has not taken place yet, so calculate the nrSamples
         // manually

RTCP/Cobalt/GPUProc/src/cuda/SubbandProcs/BeamFormerSubbandProc.cc

@@ -230,7 +230,7 @@ namespace LOFAR
       // final FFT: B -> B
       incoherentFinalFFT(
         queue, ps.settings.beamFormer.incoherentSettings.nrChannels,
-        (NR_POLARIZATIONS * ps.nrSamplesPerSubband() / 
+        (ps.nrStations() * NR_POLARIZATIONS * ps.nrSamplesPerSubband() / 
          ps.settings.beamFormer.incoherentSettings.nrChannels),
         true, devB),
 

RTCP/Cobalt/GPUProc/test/SubbandProcs/tBeamFormerSubbandProcProcessSb.cc

@@ -37,8 +37,8 @@ template<typename T> T inputSignal(size_t t)
 {
   size_t nrBits = sizeof(T) / 2 * 8;
   // double freq = 1.0 / 2.0; // in samples
-  double freq = 1.0 / 4.0; // in samples
-  double amp = (1 << (nrBits - 1)) - 10;
+  double freq = 1.0 / 32.0; // in samples
+  double amp = (1 << (nrBits - 1)) - 1;
 
   double angle = (double)t * 2.0 * M_PI * freq;
 

RTCP/Cobalt/GPUProc/test/SubbandProcs/tBeamFormerSubbandProcProcessSb.parset

@@ -18,7 +18,7 @@ OLAP.CNProc_CoherentStokes.timeIntegrationFactor = 1
 OLAP.CNProc_CoherentStokes.channelsPerSubband = 1
 OLAP.CNProc_IncoherentStokes.which	 = I # IQUV
 OLAP.CNProc_IncoherentStokes.timeIntegrationFactor = 1
-OLAP.CNProc_IncoherentStokes.channelsPerSubband = 1
+OLAP.CNProc_IncoherentStokes.channelsPerSubband = 16
 Observation.rspBoardList                 = [0]
 Observation.rspSlotList                  = [0]