Commits

Kumar Golap authored and Ville Suoranta committed d265bf2ce92 Merge
Pull request #560: CAS-12497

Merge in CASA/casa6 from CAS-12497 to master * commit '020d5068b84f1aa25a0b6e7d592408cf5bfdb792': Added a few missing saving of the metric value to a json file Moved the changes in casa5 to the casa6 new style branch

casatasks/tests/tasks/test_task_tclean.py

Modified
364 364 # briggs r=-2
365 365 ret2 = tclean(vis=self.msfile,imagename=self.img+'2',imsize=100,cell='8.0arcsec',niter=10,weighting='briggs', robust=-2, interactive=0,parallel=self.parallel)
366 366 report2=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'2.psf', self.img+'2.residual', self.img+'2.image', self.img+'2.model'], imgval=[(self.img+'2.psf',1.0,[50,50,0,0])])
367 367
368 368 # briggs r=0.5(default)
369 369 ret3 = tclean(vis=self.msfile,imagename=self.img+'3',imsize=100,cell='8.0arcsec',niter=10,weighting='briggs', robust=0.5, interactive=0,parallel=self.parallel)
370 370 report3=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'3.psf', self.img+'3.residual', self.img+'3.image', self.img+'3.model'], imgval=[(self.img+'3.psf',1.0,[50,50,0,0])])
371 371
372 372 # briggs r=2
373 373 ret4 = tclean(vis=self.msfile,imagename=self.img+'4',imsize=100,cell='8.0arcsec',niter=10,weighting='briggs', robust=2, interactive=0,parallel=self.parallel)
374 - report4=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'4.psf', self.img+'4.residual', self.img+'4.image', self.img+'4.model'], imgval=[(self.img+'4.psf',1.0,[50,50,0,0]),(self.img+'4.sumwt',3430533.5,[0,0,0,0])])
374 + report4=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'4.psf', self.img+'4.residual', self.img+'4.image', self.img+'4.model'], imgval=[(self.img+'4.psf',1.0,[50,50,0,0]),(self.img+'4.sumwt',641971.5625,[0,0,0,0])])
375 375
376 376 # radial
377 377 ret5 = tclean(vis=self.msfile,imagename=self.img+'5',imsize=100,cell='8.0arcsec',niter=10,weighting='radial', interactive=0,parallel=self.parallel)
378 378 report5=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'5.psf', self.img+'5.residual', self.img+'5.image', self.img+'5.model'], imgval=[(self.img+'5.psf',1.0,[50,50,0,0])])
379 379
380 380 # superuniform
381 381 ret6 = tclean(vis=self.msfile,imagename=self.img+'6',imsize=100,cell='8.0arcsec',niter=10,weighting='superuniform', interactive=0,parallel=self.parallel)
382 382 report6=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'6.psf', self.img+'6.residual', self.img+'6.image', self.img+'6.model'], imgval=[(self.img+'6.psf',1.0,[50,50,0,0])])
383 383
384 384 # briggs r=0.5(default) with mtmfs (to test SIImageStoreMultiTerm)
385 385 ret7 = tclean(vis=self.msfile,imagename=self.img+'7',imsize=100,cell='8.0arcsec',niter=10,deconvolver='mtmfs', weighting='briggs', robust=0.5, interactive=0,parallel=self.parallel)
386 - report7=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'7.psf.tt0', self.img+'7.residual.tt0', self.img+'7.image.tt0', self.img+'7.model.tt0'], imgval=[(self.img+'7.psf.tt0',1.0,[50,50,0,0]),(self.img+'7.psf.tt1',0.0898,[50,50,0,0]),(self.img+'7.sumwt.tt0',1532169.875,[0,0,0,0]),(self.img+'7.sumwt.tt1',137693.875,[0,0,0,0])])
386 + report7=self.th.checkall(ret=ret, peakres=0.263, modflux=0.575, iterdone=10, imgexist=[self.img+'7.psf.tt0', self.img+'7.residual.tt0', self.img+'7.image.tt0', self.img+'7.model.tt0'], imgval=[(self.img+'7.psf.tt0',1.0,[50,50,0,0]),(self.img+'7.psf.tt1',0.0898,[50,50,0,0]),(self.img+'7.sumwt.tt0',286721.875,[0,0,0,0]),(self.img+'7.sumwt.tt1',25767.1796875,[0,0,0,0])])
387 387
388 388
389 389 # beamareas: uniform < briggs-r=-2 < briggs r=0.5 < briggs r=+2 < natural, ...
390 390 # by default, it checks if im1's beam < im2's beam
391 391 print("Test beamarea of tst0.image (natural) is greater than beamarea of tst.image (uniform)")
392 392 self.assertTrue(self.th.check_beam_compare(self.img+'.image', self.img+'0.image'))
393 393 print("Test beamarea of tst2.image (briggs -2) is greater than beamarea of tst.image (uniform)")
394 394 self.assertTrue(self.th.check_beam_compare(self.img+'.image', self.img+'2.image'))
395 395 print("Test beamarea of tst3.image (briggs 0.5) is greater than beamarea of tst2.image (briggs -2))")
396 396 self.assertTrue(self.th.check_beam_compare(self.img+'2.image', self.img+'3.image'))
632 632 ## For parallel run, check sub workdirectory images also.
633 633 #if self.parallel==True:
634 634 # checkims = checkims + self.th.getNParts( imprefix=self.img,
635 635 # imexts=['residual.tt0','residual.tt1',
636 636 # 'psf.tt0','psf.tt1',
637 637 # 'model.tt0','model.tt1'])
638 638 report = self.th.checkall(ret=ret,
639 639 peakres=0.409, modflux=0.764, iterdone=10, nmajordone=2,
640 640 imgexist=checkims,
641 641 imgval=[(self.img+'.alpha',-2.0,[50,50,0,0]),
642 - (self.img+'.sumwt.tt0', 94050.05,[0,0,0,0]) ,
643 - (self.img+'.sumwt.tt1', 0.006198,[0,0,0,0]) ],
642 + (self.img+'.sumwt.tt0', 17600,[0,0,0,0]) ,
643 + (self.img+'.sumwt.tt1', 0.0037891,[0,0,0,0]) ],
644 644 reffreq= [(self.img+'.image.tt0',1489984775.68)] )
645 645
646 646 self.assertTrue(self.check_final(report))
647 647
648 648 def test_onefield_mtmfs_nterms1(self):
649 649 """ [onefield] Test_Onefield_mtmfs_nterms1 : mt-mfs with nterms=1 (CAS-11364, CAS-11367) """
650 650 self.prepData('refim_point.ms')
651 651 ret = tclean(vis=self.msfile,imagename=self.img,imsize=100,cell='8.0arcsec',niter=10,deconvolver='mtmfs',nterms=1,interactive=0,parallel=self.parallel)
652 652 report=self.th.checkall(ret=ret, peakres=0.369, modflux=0.689, iterdone=10, imgexist=[self.img+'.psf.tt0', self.img+'.residual.tt0', self.img+'.image.tt0', self.img+'.model.tt0'], imgval=[(self.img+'.psf.tt0',1.0,[50,50,0,0]),(self.img+'.image.tt0',1.05,[50,50,0,0])])
653 653 ## iterdone=11 only because of the return (iterdone_p+1) in MultiTermMatrixCleaner::mtclean() !

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut