Merge pull request #2304 from bsipocz/sdss_specobj_crossid

Fix remaining issues with spectra Sdss.query_crossid

Author: bsipocz

CHANGES.rst

@@ -36,7 +36,14 @@ mast
 
 - GALEX data is now available to download anonymously from the public STScI S3 buckets. [#2261]
 
-- Adding the All-Sky PLATO Input Catalog ('plato') as a catalog option for methods of ``astroquery.mast.Catalogs``. [#2279]
+- Adding the All-Sky PLATO Input Catalog ('plato') as a catalog option for
+  methods of ``astroquery.mast.Catalogs``. [#2279]
+
+sdss
+^^^^
+
+- Fix ``query_crossid`` for spectral data and DR17. [#2258, #2304]
+
 
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------

astroquery/sdss/core.py

@@ -138,7 +138,7 @@ def query_crossid_async(self, coordinates, obj_names=None,
                 photobj_fields.append('p.objID as obj_id')
             else:
                 photobj_fields = []
-                specobj_fields.append('s.objID as obj_id')
+                specobj_fields.append('s.SpecObjID as obj_id')
 
         sql_query += ', '.join(photobj_fields + specobj_fields)
 

astroquery/sdss/tests/test_sdss_remote.py

@@ -12,7 +12,7 @@
 from ...exceptions import TimeoutError
 
 # DR11 is a quasi-internal data release that does not have SkyServer support.
-dr_list = (8, 9, 10, 12, 13, 14, 15, 16)
+dr_list = (8, 9, 10, 12, 13, 14, 15, 16, 17)
 
 
 @pytest.mark.remote_data
@@ -166,22 +166,26 @@ def test_query_non_default_field(self):
         assert query1.colnames == ['r', 'psfMag_r']
         assert query2.colnames == ['ra', 'dec', 'r']
 
-    def test_query_crossid(self):
-        query1 = sdss.SDSS.query_crossid(self.coords)
+    # crossid doesn't work for DR<10, remove limitation once #2303 is fixed
+    @pytest.mark.parametrize("dr", dr_list[2:])
+    def test_query_crossid(self, dr):
+        query1 = sdss.SDSS.query_crossid(self.coords, data_release=dr)
         query2 = sdss.SDSS.query_crossid([self.coords, self.coords])
         assert isinstance(query1, Table)
         assert query1['objID'][0] == 1237652943176138868
 
         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)
+    # crossid doesn't work for DR<10, remove limitation once #2303 is fixed
+    @pytest.mark.parametrize("dr", dr_list[2:])
+    def test_spectro_query_crossid(self, dr):
+        query1 = sdss.SDSS.query_crossid(self.coords,
+                                         specobj_fields=['specObjID', 'z'],
+                                         data_release=dr, cache=False)
+        query2 = sdss.SDSS.query_crossid([self.coords, self.coords],
+                                         specobj_fields=['specObjID', 'z'],
+                                         data_release=dr, cache=False)
         assert isinstance(query1, Table)
         assert query1['specObjID'][0] == 845594848269461504