Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ hsa

- New module to access ESA Herschel mission. [#2122]

esa.hubble
^^^^^^^^^^

- Update to TAP url to query data and download files, aligned with the new eHST Science Archive. [#2567][#2597]
- Status and maintenance messages from eHST TAP when the module is instantiated. get_status_messages method to retrieve them. [#2597]
- Optional parameters in all methods are kwargs keyword only. [#2597]

Service fixes and enhancements
------------------------------
Expand All @@ -31,9 +37,8 @@ esa.hubble

- Refactored query_criteria to use ehst.archive table therefore making the query
a lot faster. [#2524]

- Update TAP url to avoid 301 HTTPError. [#2567]

- Method query_hst_tap has been deprecated and is replaced with query_tap, with the same arguments. [#2597]
- Product types in download_product method have been modified to: PRODUCT, SCIENCE_PRODUCT or POSTCARD. [#2597]

alma
^^^^
Expand Down
27 changes: 11 additions & 16 deletions astroquery/esa/hubble/__init__.py
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
"""
@author: Javier Duran
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reminds me that we need to sort out a team page listing ESA as a significant contributor. It's not forgotten, we just haven't got to it yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many thanks! just ping me if you need a list of users or something else.

@contact: [email protected]
==========
eHST Init
==========
European Space Astronomy Centre (ESAC)
European Space Agency (ESA)
Created on 13 Aug. 2018
"""

from astropy import config as _config
from astropy.config import paths
import os


class Conf(_config.ConfigNamespace):
"""
Configuration parameters for `astroquery.esa.hubble`.
"""
DATA_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
"ehst-sl-server/servlet/data-action",
"Main url for retriving hst files")
METADATA_ACTION = _config.ConfigItem("http://archives.esac.esa.int/"
"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")
EHST_TAP_SERVER = _config.ConfigItem("https://hst.esac.esa.int/tap-server/tap", "eHST TAP Server")
EHST_TARGET_ACTION = _config.ConfigItem("servlet/target-resolver?", "eHST Target Resolver")
EHST_MESSAGES = _config.ConfigItem("notification?action=GetNotifications", "eHST Messages")
TIMEOUT = 60

cache_location = os.path.join(paths.get_cache_dir(), 'astroquery/ehst', )


conf = Conf()

Expand Down
Loading