diff --git a/SAS/ResourceAssignment/TaskPrescheduler/lib/cobaltblocksize.py b/SAS/ResourceAssignment/TaskPrescheduler/lib/cobaltblocksize.py index ac14727d9a2c2645de608bf7454bd9bf60e30175..52c3ae1853232578adeb76089b96260d020ba94b 100644 --- a/SAS/ResourceAssignment/TaskPrescheduler/lib/cobaltblocksize.py +++ b/SAS/ResourceAssignment/TaskPrescheduler/lib/cobaltblocksize.py @@ -96,7 +96,7 @@ class BlockConstraints(object): NR_PPF_TAPS = 16 MAX_THREADS_PER_BLOCK = 1024 CORRELATOR_BLOCKSIZE = 16 - BEAMFORMER_NR_DELAYCOMPENSATION_CHANNELS = 64 + BEAMFORMER_NR_DELAYCOMPENSATION_CHANNELS = 256 BEAMFORMER_DELAYCOMPENSATION_BLOCKSIZE = 16 # Process correlator settings diff --git a/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.py b/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.py index 8eaec011e3fd642723377b9ace171db8a687dfd1..dee024550e87002b001d5488e4d657bc246120d1 100644 --- a/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.py +++ b/SAS/ResourceAssignment/TaskPrescheduler/test/t_cobaltblocksize.py @@ -99,5 +99,20 @@ class TestBlockSize(unittest.TestCase): self.assertAlmostEquals(c._samples2time(bs.integrationSamples), integrationTime, delta = integrationTime * 0.05) + @unit_test + def testCoherentStokesBlocksize(self): + """ Test the coherent stokes block size against reference output, based on cases that used to fail in production. + If the output of these calculations change, make sure the described configurations do actually work in COBALT! """ + + coh = StokesSettings() + coh.nrChannelsPerSubband = 16 + coh.timeIntegrationFactor = 1 + + c = BlockConstraints(coherentStokesSettings=[coh]) + bs = BlockSize(c) + + self.assertEqual(bs.blockSize, 196608) + + if __name__ == "__main__": unittest.main(verbosity=2)