casa / casa6 / c5fb1f7b531

Commits

Kazuhiko Shimada authored and Takeshi Nakazato committed c5fb1f7b531 Merge 29 Jun 2022

Pull request #582: CAS-13855: replaced deprecated method

Merge in CASA/casa6 from CAS-13855 to master

* commit 'a81e0fac658f0f14688b7bd6894fe9e7748c98c5':
  CAS-13855: replaced deprecated method

casa5/gcwrap/python/scripts/tests/test_sdimaging.py

Modified

-346
+            return [inval, inval]
-347
+        elif len(inval) == 1:
-348
+            return [inval[0], inval[0]]
-349
+        return inval[0:2]
-350
-351
+    def _check_beam(self, image, ref_beam):
-352
+        """Check image beam size"""
-353
+        _ia.open(image)
-354
+        beam = _ia.restoringbeam()
-355
+        _ia.close()
--
+        maj_asec = numpy.asscalar(qa.getvalue(qa.convert(beam['major'], 'arcsec')))
--
+        min_asec = numpy.asscalar(qa.getvalue(qa.convert(beam['minor'], 'arcsec')))
--
+        maj_asec_ref = numpy.asscalar(qa.getvalue(qa.convert(ref_beam['major'], 'arcsec')))
--
+        min_asec_ref = numpy.asscalar(qa.getvalue(qa.convert(ref_beam['minor'], 'arcsec')))
-+
+        maj_asec = numpy.ndarray.item(qa.getvalue(qa.convert(beam['major'], 'arcsec')))
-+
+        min_asec = numpy.ndarray.item(qa.getvalue(qa.convert(beam['minor'], 'arcsec')))
-+
+        maj_asec_ref = numpy.ndarray.item(qa.getvalue(qa.convert(ref_beam['major'], 'arcsec')))
-+
+        min_asec_ref = numpy.ndarray.item(qa.getvalue(qa.convert(ref_beam['minor'], 'arcsec')))
-360
+        self.assertAlmostEqual(abs(maj_asec-maj_asec_ref)/max(maj_asec_ref,1.e-12), 0., places=3, msg="major axis = %f arcsec (expected: %f)" % (maj_asec, maj_asec_ref))
-361
+        self.assertAlmostEqual(abs(min_asec-min_asec_ref)/max(min_asec_ref,1.e-12), 0., places=3, msg="minor axis = %f arcsec (expected: %f)" % (min_asec, min_asec_ref))
-362
-363
+    def _check_restfreq(self, imagename, restfreq):
-364
+        """ Test image rest frequency"""
-365
+        self.assertTrue(qa.compare(restfreq, 'Hz'))
-366
+        myunit = qa.getunit(restfreq)
-367
+        refval = qa.getvalue(restfreq)[0]
-368
+        _ia.open(imagename)
-369
+        csys = _ia.coordsys()

casa6

Commits

Jira Issues

Add shortcut