Merge pull request #2258 from nmcardoso/fix-query_crossid_async

Fix SDSS CrossID method not working for spec data and for DR17 (photo and spec)

Author: C. E. Brasseur

astroquery/sdss/core.py

@@ -81,7 +81,7 @@ def query_crossid_async(self, coordinates, obj_names=None,
         radius : str or `~astropy.units.Quantity` object, optional The
             string must be parsable by `~astropy.coordinates.Angle`. The
             appropriate `~astropy.units.Quantity` object from
-            `astropy.units` may also be used. Defaults to 2 arcsec.
+            `astropy.units` may also be used. Defaults to 5 arcsec.
         timeout : float, optional
             Time limit (in seconds) for establishing successful connection with
             remote server.  Defaults to `SDSSClass.TIMEOUT`.
@@ -144,7 +144,10 @@ def query_crossid_async(self, coordinates, obj_names=None,
 
         sql_query += ',dbo.fPhotoTypeN(p.type) as type \
                       FROM #upload u JOIN #x x ON x.up_id = u.up_id \
-                      JOIN PhotoObjAll p ON p.objID = x.objID ORDER BY x.up_id'
+                      JOIN PhotoObjAll p ON p.objID = x.objID '
+        if specobj_fields:
+            sql_query += 'JOIN SpecObjAll s ON p.objID = s.bestObjID '
+        sql_query += 'ORDER BY x.up_id'
 
         data = "obj_id ra dec \n"
         data += " \n ".join(['{0} {1} {2}'.format(obj_names[i],
@@ -165,7 +168,7 @@ def query_crossid_async(self, coordinates, obj_names=None,
         if get_query_payload:
             return request_payload
         url = self._get_crossid_url(data_release)
-        response = self._request("POST", url, params=request_payload,
+        response = self._request("POST", url, data=request_payload,
                                  timeout=timeout, cache=cache)
         return response
 

astroquery/sdss/tests/test_sdss_remote.py

@@ -174,3 +174,16 @@ def test_query_crossid(self):
 
         assert isinstance(query2, Table)
         assert query2['objID'][0] == query1['objID'][0] == query2['objID'][1]
+
+    def test_spectro_query_crossid(self):
+        query1 = sdss.SDSS.query_crossid_async(
+            self.coords, specobj_fields=['specObjID', 'z'], cache=False)
+        query2 = sdss.SDSS.query_crossid_async(
+            [self.coords, self.coords],
+            specobj_fields=['specObjID', 'z'],
+            cache=False)
+        assert isinstance(query1, Table)
+        assert query1['specObjID'][0] == 845594848269461504
+
+        assert isinstance(query2, Table)
+        assert query2['specObjID'][0] == query2['specObjID'][1] == query1['specObjID'][0]