diff --git a/astroquery/alma/core.py b/astroquery/alma/core.py index f6bcf76971..fddd8ad2dd 100644 --- a/astroquery/alma/core.py +++ b/astroquery/alma/core.py @@ -642,7 +642,7 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None, instrument=None, data_type=None, calib_level=None, target_name=None, res_format=None, maxrec=None, - **kwargs): + enhanced_results=False, **kwargs): """ Use standard SIA2 attributes to query the ALMA SIA service. @@ -652,10 +652,10 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None, Returns ------- - Results in `~pyvo.dal.sia2.SIA2Results` format. - result.to_qtable in `~astropy.table.QTable` format + Results in `~astropy.table.QTable` format. + """ - return self.sia.search( + result = self.sia.search( pos=pos, band=band, time=time, @@ -676,6 +676,14 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None, maxrec=maxrec, **kwargs) + if result is not None: + if enhanced_results: + result = get_enhanced_table(result) + else: + result = result.to_table() + + return result + query_sia.__doc__ = query_sia.__doc__.replace('_SIA2_PARAMETERS', SIA2_PARAMETERS_DESC) def query_tap(self, query, *, maxrec=None, uploads=None): diff --git a/astroquery/alma/tests/test_alma.py b/astroquery/alma/tests/test_alma.py index 6bbdc50911..ac9683960f 100644 --- a/astroquery/alma/tests/test_alma.py +++ b/astroquery/alma/tests/test_alma.py @@ -464,7 +464,9 @@ def test_sia(): sia_mock = Mock() empty_result = Table.read(os.path.join(DATA_DIR, 'alma-empty.txt'), format='ascii') - sia_mock.search.return_value = Mock(table=empty_result) + mock_result = Mock() + mock_result.to_table.return_value = empty_result + sia_mock.search.return_value = mock_result alma = Alma() alma._get_dataarchive_url = Mock() alma._sia = sia_mock @@ -477,7 +479,7 @@ def test_sia(): target_name='J0423-013', publisher_did='ADS/JAO.ALMA#2013.1.00546.S', exptime=25) - assert len(result.table) == 0 + assert len(result) == 0 assert_called_with(sia_mock.search, calib_level=[0, 1], band=(300, 400), data_type='cube', pos='CIRCLE 1 2 1',