Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESA Integral Science Legacy Archive Astroquery module #3154

Merged
merged 27 commits into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6d895fe
INTEGRALSWRQ-154: initial version of astroquery module for ISLA
jespinosaar Nov 29, 2024
ce4aef9
INTEGRALSWRQ-154: download methods and documentation updated
jespinosaar Dec 3, 2024
789463f
INTEGRALSWRQ-154: utils refactored
jespinosaar Dec 3, 2024
d75b02f
INTEGRALSWRQ-158: login and logout included
jespinosaar Dec 4, 2024
16f869c
INTEGRALSWRQ-158: tests updated, target search with resolver
jespinosaar Dec 13, 2024
d546c1e
INTEGRALSWRQ-158
jespinosaar Dec 18, 2024
14add85
INTEGRALSWRQ-158: tests and documentation updated
jespinosaar Dec 18, 2024
2271264
INTEGRALSWRQ-158: pycodestyle fixes
jespinosaar Dec 18, 2024
6791e97
INTEGRALSWRQ-158: pycodestyle fixes 2
jespinosaar Dec 18, 2024
77bf95a
INTEGRALSWRQ-158: pycodestyle fixes 3
jespinosaar Dec 18, 2024
3baa435
INTEGRALSWRQ-158: changelog added
jespinosaar Dec 18, 2024
d4e38f9
INTEGRALSWRQ-158: url updated
jespinosaar Dec 18, 2024
e77643e
INTEGRALSWRQ-158: tests fixed
jespinosaar Dec 19, 2024
dc9f7c8
INTEGRALSWRQ-158: pycodestyle fixes 4
jespinosaar Dec 19, 2024
ed9348f
INTEGRALSWRQ-158: minor fix in documentation
jespinosaar Jan 7, 2025
0bc450b
INTEGRALSWRQ-158: download methods replaced by get only
jespinosaar Jan 21, 2025
a91ffca
INTEGRALSWRQ-158: removed unused imports
jespinosaar Jan 21, 2025
1cfe16a
INTEGRALSWRQ-158: get_timeline with skycoords
jespinosaar Jan 21, 2025
651d103
INTEGRALSWRQ-158: remote tests for integral
jespinosaar Jan 22, 2025
089e777
INTEGRALSWRQ-158: codestyle after remote tests for integral
jespinosaar Jan 22, 2025
1a58a5c
INTEGRALSWRQ-158: tests for utils
jespinosaar Jan 22, 2025
77dcba4
EHSTSWRQ-54: tests with temporary paths
jespinosaar Jan 23, 2025
571e133
CI: adding new CI job, and doing it as part of unrelated PR to see if…
bsipocz Jan 23, 2025
98945db
MAINT: patching tarfile as we trust ESA files, and need to avoid depr…
bsipocz Jan 23, 2025
caa8a7c
FIX: use temp directory for download testing
bsipocz Jan 23, 2025
5050e65
INTEGRALSWRQ-158: removing temp files for esa.utils tests
jespinosaar Jan 24, 2025
f181ac8
INTEGRALSWRQ-158: pycodestyle fixes in esa.utils
jespinosaar Jan 24, 2025
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
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

New Tools and Services
----------------------

esa.integral
^^^^^^^^^^^^
- New module to access the ESA Integral Science Legacy Archive. [#3154]

Service fixes and enhancements
------------------------------
Expand Down
60 changes: 60 additions & 0 deletions astroquery/esa/integral/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
"""
=========
ISLA Init
=========

European Space Astronomy Centre (ESAC)
European Space Agency (ESA)

"""

from astropy import config as _config

ISLA_DOMAIN = 'https://isla.esac.esa.int/tap/'
ISLA_TAP_URL = ISLA_DOMAIN + 'tap'


class Conf(_config.ConfigNamespace):
"""
Configuration parameters for `astroquery.esa.integral`.
"""
ISLA_TAP_SERVER = _config.ConfigItem(ISLA_TAP_URL, "ISLA TAP Server")
ISLA_DATA_SERVER = _config.ConfigItem(ISLA_DOMAIN + 'data?', "ISLA Data Server")
ISLA_LOGIN_SERVER = _config.ConfigItem(ISLA_DOMAIN + 'login', "ISLA Login Server")
ISLA_LOGOUT_SERVER = _config.ConfigItem(ISLA_DOMAIN + 'logout', "ISLA Logout Server")
ISLA_SERVLET = _config.ConfigItem(ISLA_TAP_URL + "/sync/?PHASE=RUN",
"ISLA Sync Request")
ISLA_TARGET_RESOLVER = _config.ConfigItem(ISLA_DOMAIN + "servlet/target-resolver?TARGET_NAME={}"
"&RESOLVER_TYPE={}&FORMAT=json",
"ISLA Target Resolver Request")

ISLA_INSTRUMENT_BAND_QUERY = _config.ConfigItem('select i.name as instrument, b."name" as band, '
'i.instrument_oid, b.band_oid from ila.instrument i join '
'ila.band b using(instrument_oid);',
"ISLA Instrument Band Query")
ISLA_EPOCH_TARGET_QUERY = _config.ConfigItem("select distinct epoch from ila.epoch where source_id = '{}' and "
"(instrument_oid = {} or band_oid = {})",
"ISLA Epoch Query")
ISLA_EPOCH_QUERY = _config.ConfigItem("select distinct epoch from ila.epoch where "
"(instrument_oid = {} or band_oid = {})",
"ISLA Epoch Query")
ISLA_OBSERVATION_BASE_QUERY = _config.ConfigItem("select * from ila.cons_pub_obs",
"ISLA Observation Base Query")
ISLA_TARGET_CONDITION = _config.ConfigItem("select distinct src.name, src.ra, src.dec, src.source_id from "
"ila.v_cat_source src where "
"src.name ilike '%{}%' order by src.name asc",
"ISLA Target Condition")
ISLA_CONE_TARGET_CONDITION = _config.ConfigItem("select distinct src.name, src.ra, src.dec, "
"src.source_id from ila.v_cat_source src where "
"1=CONTAINS(POINT('ICRS',src.ra,src.dec),CIRCLE('ICRS',{},{},{}))",
"ISLA Target Condition")
ISLA_COORDINATE_CONDITION = _config.ConfigItem("1=CONTAINS(POINT('ICRS',ra,dec),CIRCLE('ICRS',{},{},{}))",
"ISLA Coordinate Condition")
TIMEOUT = 60


conf = Conf()

from .core import Integral, IntegralClass

__all__ = ['Integral', 'IntegralClass', 'Conf', 'conf']
Loading
Loading