casa / casa6 / b57a321e7f4

Commits

George Moellenbrock authored and Ville Suoranta committed b57a321e7f4 Merge 21 Jan 2025

Pull request #902: CAS-14195

Merge in CASA/casa6 from CAS-14195 to master

* commit 'd74c9a0ba4ec491506f98bf594b2710a3258278a':
  For CAS-14195, tidy up doc info in fringefit.xml
  For CAS-14195, improve inline documentation for corrcomb parameter.
  changed np.alltrue to np.all for new test case
  For CAS-14195, added combine='spw',concatspws=True tests to Fringefit_corrcomb2 test
  For CAS-14195, add new Fringefit_corrcomb2 test class to test new corrcomb modes (requires new dataset in the DR)
  For CAS-14195, ensure corrcomb='stokes' and 'parallel' duplicate the combined-poln solution is duplicated to both polarizations within the output caltable (as was done for corrcomb='all' previously).
  For CAS-14195, in fringefit task and underlying mechanics, add support for correlation combinations: 'stokes' (which does formal Stokes I combination of parallel hands, strictly respecting flags; formerly 'all') and 'parallel' (which does optimally weighted parallel-hand correlation combination for all available unflagged data)

casatasks/tests/tasks/test_task_fringefit.py

Modified

-286
+        if os.path.exists(self.testout):
-287
+            shutil.rmtree(self.testout)
-288
-289
+    def test_comb(self):
-290
+        fringefit(vis=self.polcombtestms, caltable=self.testout, refant='0', spw='2~3', corrcomb='none')
-291
-292
+        tblocal.open(self.testout)
-293
+        none_result = np.nanmean(tblocal.getcol('SNR'))
-294
+        tblocal.close()
-295
--
+        fringefit(vis=self.polcombtestms, caltable=self.testout, refant='0', spw='2~3', corrcomb='all')
-+
+        fringefit(vis=self.polcombtestms, caltable=self.testout, refant='0', spw='2~3', corrcomb='stokes')   # formerly 'all'
-297
-298
+        tblocal.open(self.testout)
-299
+        combine_result = np.nanmean(tblocal.getcol('SNR'))
-300
+        tblocal.close()
-301
-302
+        self.assertTrue(combine_result > none_result)
-303
-+
+class Fringefit_corrcomb2(unittest.TestCase):
-+
+    polcombtestms = 'TPOL0006b_scan5_copy.ms'
-+
+    testout = polcombtestms+'.ffcal'
-+
-+
+    def setUp(self):
-+
+        shutil.copytree(os.path.join(datapath, 'TPOL0006b_scan5.ms'),self.polcombtestms)
-+
+        # For local testing before data is in the DR
-+
+        #datapath0='/home/daibutsu/gmoellen/JIRA/CAS-14195/testdir/'
-+
+        #shutil.copytree(os.path.join(datapath0, 'TPOL0006b_scan5.ms'),self.polcombtestms)
-+
-+
+    def tearDown(self):
-+
+        shutil.rmtree(self.polcombtestms)
-+
+        if os.path.exists(self.testout):
-+
+            shutil.rmtree(self.testout)
-+
-+
+    def test_corrcomb2(self):
-+
-+
+        # NB: No SNR improvement tests here (cf test_corrcomb)
-+
+        #   because these (raw) data are not coherent (not aligned)
-+
+        #   between polarizations
-+
+        #   TBD: add a solve for pol alignment (zerorates=True), and
-+
+        #        add it as a prior cal in each corrcomb!='none' test
-+
-+
+        # corrdepflags=False, corrcomb='none'
-+
+        # ant id=6 completely flagged
-+
+        fringefit(vis=self.polcombtestms, caltable=self.testout,
-+
+                  spw='0,1',
-+
+                  refant='0',solint='inf',
-+
+                  corrdepflags=False,corrcomb='none',concatspws=False)
-+
+        tblocal.open(self.testout)
-+
+        fl=tblocal.getcol('FLAG')
-+
+        tblocal.close()
-+
+        #print(np.sum(fl),np.sum(fl)==16)
-+
+        #print(fl[:,0,6::10]) # both pols
-+
+        #print(np.alltrue(fl[:,0,6::10]))
-+
-+
+        self.assertTrue(np.sum(fl)==16)   # 4 params in 2 pols in 2 spws
-+
+        self.assertTrue(np.all(fl[:,0,6::10]))  # both pols flagged
-+
-+
-+
+        # corrdepflags=True, corrcomb='none'
-+
+        # ant id=6 pol id=1 only flagged
-+
+        fringefit(vis=self.polcombtestms, caltable=self.testout,
-+
+                  spw='0,1',
-+
+                  refant='0',solint='inf',
-+
+                  corrdepflags=True,corrcomb='none',concatspws=False)
-+
+        tblocal.open(self.testout)
-+
+        fl=tblocal.getcol('FLAG')
-+
+        tblocal.close()
-+
+        #print(np.sum(fl),np.sum(fl)==8)
-+
+        #print(fl[4:,0,6::10])  # 2nd pol only
-+
+        #print(np.alltrue(fl[4:,0,6::10]))
-+
-+
+        self.assertTrue(np.sum(fl)==8)   # 4 params in 1 pol in 2 spws
-+
+        self.assertTrue(np.all(fl[4:,0,6::10]))  # 2nd pol only flagged
-+
-+
+        # corrdepflags=True, corrcomb='stokes'
-+
+        # ant id=6 completely flagged
-+
+        # solutions identical in both pols
-+
+        fringefit(vis=self.polcombtestms, caltable=self.testout,
-+
+                  spw='0,1',
-+
+                  refant='0',solint='inf',
-+
+                  corrdepflags=True,corrcomb='stokes',concatspws=False)
-+
+        tblocal.open(self.testout)
-+
+        fl=tblocal.getcol('FLAG')
-+
+        sol=tblocal.getcol('FPARAM')
-+
+        tblocal.close()
-+
+        #print(np.sum(fl),np.sum(fl)==16)
-+
+        #print(fl[:,0,6::10]) # both pols
-+
+        #print(np.alltrue(fl[:,0,6::10]))
-+
+        #print(np.alltrue(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
-+
+        self.assertTrue(np.sum(fl)==16)   # 4 params in 2 pols in 2 spws
-+
+        self.assertTrue(np.all(fl[:,0,6::10]))  # both pols flagged
-+
+        self.assertTrue(np.all(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
-+
+        # corrdepflags=True, corrcomb='parallel'
-+
+        # nothing flagged (ant id=6 pol id=0 solutions used for both pols)
-+
+        # solutions identical in both pols
-+
+        fringefit(vis=self.polcombtestms, caltable=self.testout,
-+
+                  spw='0,1',
-+
+                  refant='0',solint='inf',
-+
+                  corrdepflags=True,corrcomb='parallel',concatspws=False)
-+
+        tblocal.open(self.testout)
-+
+        fl=tblocal.getcol('FLAG')
-+
+        sol=tblocal.getcol('FPARAM')
-+
+        tblocal.close()
-+
+        #print(np.sum(fl),np.sum(fl)==0)  # no flagged solutions!
-+
+        #print(np.alltrue(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
-+
+        self.assertTrue(np.sum(fl)==0)  # nothing flagged
-+
+        self.assertTrue(np.all(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
-+
+        # corrdepflags=True, corrcomb='stokes', concatspws=True
-+
+        # ant id=6 fully flagged
-+
+        # solutions identical in both pols
-+
+        fringefit(vis=self.polcombtestms, caltable=self.testout,
-+
+                  spw='0,1,2,3',combine='spw',
-+
+                  refant='0',solint='inf',
-+
+                  corrdepflags=True,corrcomb='stokes',concatspws=True)
-+
+        tblocal.open(self.testout)
-+
+        fl=tblocal.getcol('FLAG')
-+
+        sol=tblocal.getcol('FPARAM')
-+
+        tblocal.close()
-+
+#        print(np.sum(fl),np.sum(fl)==8)
-+
+#        print(fl[:,0,6::10]) # both pols
-+
+#        print(np.alltrue(fl[:,0,6::10]))
-+
+#        print(np.alltrue(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
+        self.assertTrue(np.sum(fl)==8)  # ant id 6 completely flagged
-+
+        self.assertTrue(np.all(fl[:,0,6::10]))  # both pols flagged
-+
+        self.assertTrue(np.all(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
-+
-+
+        # corrdepflags=True, corrcomb='parallel', concatspws=True
-+
+        # no solutions flagged
-+
+        # solutions identical in both pols
-+
+        fringefit(vis=self.polcombtestms, caltable=self.testout,
-+
+                  spw='0,1,2,3',combine='spw',
-+
+                  refant='0',solint='inf',
-+
+                  corrdepflags=True,corrcomb='parallel',concatspws=True)
-+
+        tblocal.open(self.testout)
-+
+        fl=tblocal.getcol('FLAG')
-+
+        sol=tblocal.getcol('FPARAM')
-+
+        tblocal.close()
-+
+#        print(np.sum(fl),np.sum(fl)==0)  # no flagged solutions!
-+
+#        print(np.alltrue(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
+        self.assertTrue(np.sum(fl)==0)  # nothing flagged
-+
+        self.assertTrue(np.all(sol[0:4,0,:]==sol[4:,0,:]))  # same soln in both pols
-+
-+
-+
-+
-436
+class Fringefit_paramactive_caltable(unittest.TestCase):
-437
+    prefix = 'n08c1'
-438
+    msfile = prefix + '.ms'
-439
+    testcallib = 'testcaltable.txt'
-440
-441
+    preapplytable = 'topreapply.cal'
-442
+    nocallib = 'nocallib.cal'
-443
+    withcallib = 'withcallib.cal'
-444
+    manualdefault = 'manualcallib.cal'
-445

casa6

Commits

Jira Issues

Add shortcut