Skip to content
Open
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
7 changes: 7 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ esa.hubble
- Update ``get_datalabs_path`` method so an alternative path is checked if the
file is not in Datalabs yet [#3437]

imcce
^^^^^

- Change the URL for SkyBot and Miriade Web Services
- Adapted the ``Miriade`` Class to the new outputs of the Web Service


mast
^^^^

Expand Down
2 changes: 1 addition & 1 deletion astroquery/imcce/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Conf(_config.ConfigNamespace):

# server settings
ephemcc_server = _config.ConfigItem(
'http://vo.imcce.fr/webservices/miriade/ephemcc_query.php',
'https://ssp.imcce.fr/webservices/miriade/api/ephemcc.php',
'IMCCE/Miriade.ephemcc base server')
skybot_server = _config.ConfigItem(
['https://ssp.imcce.fr/webservices/skybot/api/conesearch.php'],
Expand Down
252 changes: 137 additions & 115 deletions astroquery/imcce/core.py

Large diffs are not rendered by default.

223 changes: 156 additions & 67 deletions astroquery/imcce/tests/data/3552_coordtype1.dat

Large diffs are not rendered by default.

264 changes: 170 additions & 94 deletions astroquery/imcce/tests/data/3552_coordtype2.dat

Large diffs are not rendered by default.

214 changes: 154 additions & 60 deletions astroquery/imcce/tests/data/3552_coordtype3.dat

Large diffs are not rendered by default.

215 changes: 155 additions & 60 deletions astroquery/imcce/tests/data/3552_coordtype4.dat

Large diffs are not rendered by default.

277 changes: 181 additions & 96 deletions astroquery/imcce/tests/data/3552_coordtype5.dat

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions astroquery/imcce/tests/data/get_examples.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Definition of parameters
target=3552
ep=now
observer=X05

# For each type of coordinates:
# https://ssp.imcce.fr/webservices/miriade/api/ephemcc/
for tcoor in 1 2 3 4 5;
do
echo ${tcoor}

url="https://ssp.imcce.fr/webservices/miriade/api/ephemcc.php?-name=a:${target}&-type=&-ep=${ep}&-nbd=1&-step=1d&-tscale=UTC&-observer=${observer}&-theory=INPOP&-teph=1&-tcoor=${tcoor}&-oscelem=astorb&-mime=votable&-output=--jd,--rv&-from=TestAstropy"
file="${target}_coordtype${tcoor}.dat"

wget ${url} -O ${file}
done

Loading