Merge pull request #2249 from eerovaher/gaia-object-radius-columns

Enable calling `Gaia.query_object()` with both `columns` and `radius`

Author: C. E. Brasseur

CHANGES.rst

@@ -17,6 +17,13 @@ esa.jwst
 
 - Minor fixes, documentation updated. [#2257]
 
+gaia
+^^^^
+
+- The ``query_object()`` and ``query_object_async()`` methods of
+  ``astroquery.gaia.Gaia`` no longer ignore their ``columns`` argument when
+  ``radius`` is specified. [#2249]
+
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------
 

astroquery/gaia/core.py

@@ -386,8 +386,8 @@ def __query_object(self, coordinate, radius=None, width=None, height=None,
         coord = self.__getCoordInput(coordinate, "coordinate")
         job = None
         if radius is not None:
-            job = self.__cone_search(coord, radius,
-                                     async_job=async_job, verbose=verbose)
+            job = self.__cone_search(coord, radius, async_job=async_job,
+                                     verbose=verbose, columns=columns)
         else:
             raHours, dec = commons.coord_to_radec(coord)
             ra = raHours * 15.0  # Converts to degrees

astroquery/gaia/tests/test_gaia_remote.py

@@ -5,6 +5,15 @@
 from .. import GaiaClass
 
 
+@pytest.mark.remote_data
+def test_query_object_columns_with_radius():
+    # Regression test: `columns` were ignored if `radius` was provided [#2025]
+    Gaia = GaiaClass()
+    sc = SkyCoord(ra=0*u.deg, dec=0*u.deg)
+    table = Gaia.query_object_async(sc, radius=10*u.arcsec, columns=['ra'])
+    assert table.colnames == ['ra', 'dist']
+
+
 @pytest.mark.remote_data
 def test_query_object_row_limit():
     Gaia = GaiaClass()