reverting some service calls back to string

Author: jaymedina

astroquery/mast/collections.py

@@ -36,8 +36,6 @@ class CatalogsClass(MastQueryWithLogin):
     Class for querying MAST catalog data.
     """
 
-    _catalogs_filtered_tic = 'Mast.Catalogs.Filtered.Tic'
-    
     def __init__(self):
 
         super().__init__()
@@ -273,7 +271,7 @@ def query_criteria_async(self, catalog, pagesize=None, page=None, **criteria):
             self._current_connection = self._portal_api_connection
 
             if catalog.lower() == "tic":
-                service = _catalogs_filtered_tic
+                service = "Mast.Catalogs.Filtered.Tic"
                 if coordinates or objectname:
                     service += ".Position"
                 service += ".Rows"  # Using the rowstore version of the query for speed

astroquery/mast/discovery_portal.py

@@ -127,9 +127,6 @@ class PortalAPI(BaseQuery):
     _column_configs = dict()
     _current_service = None
 
-    tess_all_name = 'Mast.Catalogs.All.Tic'
-    dd_all_name = 'Mast.Catalogs.All.Disk.Detective'
-
     def __init__(self, session=None):
 
         super(PortalAPI, self).__init__()
@@ -241,10 +238,10 @@ def _get_col_config(self, service, fetch_name=None):
 
         more = False  # for some catalogs this is not enough information
         if "tess" in fetch_name.lower():
-            all_name = self.test_all_name
+            all_name = "Mast.Catalogs.All.Tic"
             more = True
         elif "dd." in fetch_name.lower():
-            all_name = self.dd_all_name
+            all_name = "Mast.Catalogs.All.DiskDetective"
             more = True
 
         if more: