Merge pull request #1855 from esdc-esac-esa-int/ehst

ESA Hubble cone search improvements

Author: C. E. Brasseur

CHANGES.rst

@@ -4,6 +4,11 @@
 New Tools and Services
 ----------------------
 
+esa.hubble
+^^^^^^^^^^
+
+- Cone search module allows the user to save the result in local storage. [#1855]
+- Module added to perform a cone search based on a set of criteria. [#1855]
 
 Service fixes and enhancements
 ------------------------------

astroquery/esa/hubble/__init__.py

@@ -24,6 +24,10 @@ class Conf(_config.ConfigNamespace):
                                          "ehst-sl-server/servlet/"
                                          "metadata-action",
                                          "Main url for retriving hst metadata")
+    TARGET_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
+                                       "ehst-sl-server/servlet/"
+                                       "targetresolver-action",
+                                       "Main url for solving targets")
     TIMEOUT = 60
 
 

astroquery/esa/hubble/core.py

@@ -73,50 +73,6 @@ def launch_job(self, query, name=None, output_file=None,
         self._parameters['upload_table_name'] = upload_table_name
         return Job(False)
 
-    def launch_job_async(self, query, name=None, output_file=None,
-                         output_format="votable", verbose=False,
-                         dump_to_file=False, upload_resource=None,
-                         upload_table_name=None):
-        self.__invokedMethod = 'launch_job'
-        self._parameters['query'] = query
-        self._parameters['name'] = name
-        self._parameters['output_file'] = output_file
-        self._parameters['output_format'] = output_format
-        self._parameters['verbose'] = verbose
-        self._parameters['dump_to_file'] = dump_to_file
-        self._parameters['upload_resource'] = upload_resource
-        self._parameters['upload_table_name'] = upload_table_name
-        return Job(True)
-
-    def query_criteria(self, calibration_level=None,
-                          data_product_type=None, intent=None,
-                          obs_collection=None, instrument_name=None,
-                          filters=None, async_job=False, output_file=None,
-                          output_format="votable", verbose=False):
-        self.__invokedMethod = 'query_criteria'
-        self._parameters['calibration_level'] = calibration_level
-        self._parameters['data_product_type'] = data_product_type
-        self._parameters['intent'] = intent
-        self._parameters['obs_collection'] = obs_collection
-        self._parameters['instrument_name'] = instrument_name
-        self._parameters['filters'] = filters
-        self._parameters['async_job'] = async_job
-        self._parameters['output_file'] = output_file
-        self._parameters['output_format'] = output_format
-        self._parameters['verbose'] = verbose
-        return Job(True)
-
-    def get_tables(self, only_names=True, verbose=False):
-        self.__invokedMethod = 'get_tables'
-        self._parameters['only_names'] = only_names
-        self._parameters['verbose'] = verbose
-
-    def get_columns(self, table_name=None, only_names=True, verbose=False):
-        self.__invokedMethod = 'get_columns'
-        self._parameters['table_name'] = table_name
-        self._parameters['only_names'] = only_names
-        self._parameters['verbose'] = verbose
-
     def load_tables(self,
                     only_names=True,
                     include_shared_tables=False,