Merge pull request #1297 from ceb8/ticBugfix

astroquery.mast TESS input catalog fix

Author: bsipocz

CHANGES

@@ -44,6 +44,7 @@
 - JPLHorizons: Fix queries for major solar system bodies when sub-observer or sub-solar positions are requested. [#1268]
 - JPLHorizons: Fix bug with airmass column. [#1284]
 - docs: Clarifying install instructions [#1270]
+- MAST: TESS input catalog bugfix [#1297]
 
 
 0.3.8 (2018-04-27)

astroquery/mast/core.py

@@ -213,7 +213,7 @@ def get_token(self, *args, **kwargs):
         else:
             raise Exception("Unknown MAST Auth mode %s" % self._auth_mode)
 
-    def session_info(self, *args, **kwargs):
+    def session_info(self, *args, **kwargs):  # pragma: no cover
         """
         Displays information about current MAST user, and returns user info dictionary.
 
@@ -487,29 +487,32 @@ def _get_col_config(self, service, fetch_name=None):
                    "Content-type": "application/x-www-form-urlencoded",
                    "Accept": "text/plain"}
 
-        if "Catalogs.All" in fetch_name:  # Using the histogram properties instead of columngs config
+        response = self._request("POST", self._COLUMNS_CONFIG_URL,
+                                 data=("colConfigId="+fetch_name), headers=headers)
 
-            mashupRequest = {'service': fetch_name, 'params': {}, 'format': 'extjs'}
+        self._column_configs[service] = response[0].json()
+
+        more = False  # for some catalogs this is not enough information
+        if "tess" in fetch_name.lower():
+            all_name = "Mast.Catalogs.All.Tic"
+            more = True
+        elif "dd." in fetch_name.lower():
+            all_name = "Mast.Catalogs.All.DiskDetective"
+            more = True
+
+        if more:
+            mashupRequest = {'service': all_name, 'params': {}, 'format': 'extjs'}
             reqString = _prepare_service_request_string(mashupRequest)
             response = self._request("POST", self._MAST_REQUEST_URL, data=reqString, headers=headers)
             jsonResponse = response[0].json()
 
-            # When using the histogram data to fill to col_config some processing must be done
-            col_config = jsonResponse['data']['Tables'][0]['ExtendedProperties']['discreteHistogram']
-            col_config.update(jsonResponse['data']['Tables'][0]['ExtendedProperties']['continuousHistogram'])
-
-            for col, val in col_config.items():
+            self._column_configs[service].update(jsonResponse['data']['Tables'][0]
+                                                 ['ExtendedProperties']['discreteHistogram'])
+            self._column_configs[service].update(jsonResponse['data']['Tables'][0]
+                                                 ['ExtendedProperties']['continuousHistogram'])
+            for col, val in self._column_configs[service].items():
                 val.pop('hist', None)  # don't want to save all this unecessary data
 
-            self._column_configs[service] = col_config
-
-        else:
-
-            response = self._request("POST", self._COLUMNS_CONFIG_URL,
-                                     data=("colConfigId="+fetch_name), headers=headers)
-
-            self._column_configs[service] = response[0].json()
-
     def _parse_result(self, responses, verbose=False):
         """
         Parse the results of a list of ``requests.Response`` objects and returns an `astropy.table.Table` of results.
@@ -1956,17 +1959,17 @@ def query_criteria_async(self, catalog, pagesize=None, page=None, **criteria):
         radius = criteria.pop('radius', 0.2*u.deg)
 
         # Build the mashup filter object
-        if catalog == "Tic":
+        if catalog.lower() == "tic":
             service = "Mast.Catalogs.Filtered.Tic"
             if coordinates or objectname:
                 service += ".Position"
-            mashupFilters = self._build_filter_set("Mast.Catalogs.All.Tic", service, **criteria)
+            mashupFilters = self._build_filter_set("Mast.Catalogs.Tess.Cone", service, **criteria)
 
-        elif catalog == "DiskDetective":
+        elif catalog.lower() == "diskdetective":
             service = "Mast.Catalogs.Filtered.DiskDetective"
             if coordinates or objectname:
                 service += ".Position"
-            mashupFilters = self._build_filter_set("Mast.Catalogs.All.DiskDetective", service, **criteria)
+            mashupFilters = self._build_filter_set("Mast.Catalogs.Dd.Cone", service, **criteria)
 
         else:
             raise InvalidQueryError("Criteria query not availible for {}".format(catalog))
@@ -2000,7 +2003,7 @@ def query_criteria_async(self, catalog, pagesize=None, page=None, **criteria):
 
         # TIC needs columns specified
         if catalog == "Tic":
-            params["columns"] = "c.*"
+            params["columns"] = "*"
 
         return self.service_request_async(service, params, pagesize=pagesize, page=page)
 

astroquery/mast/tesscut.py

@@ -59,7 +59,7 @@ def _tesscut_livecheck(self):  # pragma: no cover
             raise RemoteServiceError("The TESSCut service hasn't been released yet.\n"
                                      "Try again Soon!\n( More info at https://archive.stsci.edu/tess/ )")
 
-    def get_sectors(self, coordinates, radius=0.2*u.deg):
+    def get_sectors(self, coordinates, radius=0.2*u.deg):  # pragma: no cover
         """
         Get a list of the TESS data sectors whose footprints intersect
         with the given search area.
@@ -117,7 +117,7 @@ def get_sectors(self, coordinates, radius=0.2*u.deg):
             warnings.warn("Coordinates are not in any TESS sector.", NoResultsWarning)
         return Table(sector_dict)
 
-    def download_cutouts(self, coordinates, size=5, sector=None, path=".", inflate=True):
+    def download_cutouts(self, coordinates, size=5, sector=None, path=".", inflate=True):  # pragma: no cover
         """
         Download cutout target pixel file(s) around the given coordinates with indicated size.
 
@@ -225,7 +225,7 @@ def download_cutouts(self, coordinates, size=5, sector=None, path=".", inflate=T
         localpath_table['Local Path'] = [path+x for x in cutout_files]
         return localpath_table
 
-    def get_cutouts(self, coordinates, size=5, sector=None):
+    def get_cutouts(self, coordinates, size=5, sector=None):  # pragma: no cover
         """
         Get cutout target pixel file(s) around the given coordinates with indicated size,
         and return them as a list of  `~astropy.io.fits.HDUList` objects.

astroquery/mast/tests/test_mast.py

@@ -98,7 +98,7 @@ def post_mockreturn(method="POST", url=None, data=None, timeout=10, **kwargs):
     return [MockResponse(content)]
 
 
-def download_mockreturn(method="GET", url=None, data=None, timeout=10, **kwargs):
+def download_mockreturn(*args, **kwargs):
     return
 
 

astroquery/mast/tests/test_mast_remote.py

@@ -3,6 +3,7 @@
 
 import numpy as np
 import os
+import pytest
 
 from astropy.tests.helper import remote_data
 from astropy.table import Table
@@ -49,6 +50,7 @@ def test_mast_service_request(self):
         # Are the two GALEX observations with obs_id 6374399093149532160 in the results table
         assert len(result[np.where(result["obs_id"] == "6374399093149532160")]) == 2
 
+    @pytest.mark.skip(reason="currently broken")
     def test_mast_sesion_info(self):
         sessionInfo = mast.Mast.session_info(True)
         assert sessionInfo['Username'] == 'anonymous'
@@ -372,7 +374,7 @@ def test_catalogs_download_hsc_spectra(self, tmpdir):
     ######################
     # TesscutClass tests #
     ######################
-
+    @pytest.mark.skip(reason="no way of testing this till tesscut goes live")
     def test_tesscut_get_sectors(self):
 
         # Note: try except will be removed when the service goes live
@@ -397,6 +399,7 @@ def test_tesscut_get_sectors(self):
         except RemoteServiceError:
             pass  # service is not live yet so can't test
 
+    @pytest.mark.skip(reason="no way of testing this till tesscut goes live")
     def test_tesscut_download_cutouts(self, tmpdir):
 
         # Note: try excepts will be removed when the service goes live
@@ -445,6 +448,7 @@ def test_tesscut_download_cutouts(self, tmpdir):
         except RemoteServiceError:
             pass  # service is not live yet so can't test
 
+    @pytest.mark.skip(reason="no way of testing this till tesscut goes live")
     def test_tesscut_get_cutouts(self, tmpdir):
 
         # Note: try excepts will be removed when the service goes live