Skip to content

Commit dca4f5d

Browse files
bsipoczbsipocz
authored
Merge pull request #3595 from mkelley/imcce-miriade-url-202605
Update IMCCE MIRIADE service URL and format
2 parents 12c84bb + 10c1b57 commit dca4f5d

19 files changed

Lines changed: 1249 additions & 746 deletions

‎CHANGES.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,13 @@ esa.hubble
122122
- Update ``get_datalabs_path`` method to check for files for new collections (HLSP and HSLA) [#3578]
123123

124124

125+
imcce
126+
^^^^^
127+
128+
- Change the URL for SkyBot and Miriade Web Services [#3595]
129+
- Adapted the ``Miriade`` Class to the new outputs of the Web Service [#3595]
130+
131+
125132
mast
126133
^^^^
127134

‎astroquery/imcce/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Conf(_config.ConfigNamespace):
1717

1818
# server settings
1919
ephemcc_server = _config.ConfigItem(
20-
'http://vo.imcce.fr/webservices/miriade/ephemcc_query.php',
20+
'https://ssp.imcce.fr/webservices/miriade/api/ephemcc.php',
2121
'IMCCE/Miriade.ephemcc base server')
2222
skybot_server = _config.ConfigItem(
2323
['https://ssp.imcce.fr/webservices/skybot/api/conesearch.php'],

‎astroquery/imcce/core.py‎

Lines changed: 142 additions & 122 deletions
Large diffs are not rendered by default.

‎astroquery/imcce/tests/data/3552_coordtype1-rplane1.dat‎

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<vot:VOTABLE version="1.4" xsi:schemaLocation="http://www.ivoa.net/xml/VOTable/v1.3 http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vot="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:stc="http://www.ivoa.net/xml/STC">
3+
<vot:COOSYS ID="ICRS" system="ICRS" equinox="J2000"/>
4+
<vot:INFO ID="status" name="QUERY_STATUS" value="OK"/>
5+
<vot:INFO ID="supplier" name="Supplier" value="Provided by IMCCE/OBSPM/CNRS"/>
6+
<vot:GROUP ID="ICRS-INPOP" utype="stc:AstroCoordSystem">
7+
<vot:GROUP utype="stc:AstroCoordSystem.TimeFrame">
8+
<vot:PARAM name="TimeScale" datatype="char" arraysize="*" utype="stc:AstroCoordSystem.TimeFrame.TimeScale" value="UTC"/>
9+
<vot:PARAM name="RefPosition" datatype="char" arraysize="*" utype="stc:AstroCoordSystem.TimeFrame.ReferencePosition" value="TOPOCENTER"/>
10+
</vot:GROUP>
11+
<vot:GROUP utype="stc:AstroCoordSystem.SpaceFrame">
12+
<vot:PARAM name="CooFrame" datatype="char" arraysize="*" utype="stc:AstroCoordSystem.SpaceFrame.CoordRefFrame" value="ICRS"/>
13+
<vot:PARAM name="CooFrameOrigin" datatype="char" arraysize="*" utype="stc:AstroCoordSystem.SpaceFrame.ReferencePosition" value="TOPOCENTER"/>
14+
<vot:PARAM name="Ephemeris" datatype="char" arraysize="*" utype="stc:AstroCoordSystem.SpaceFrame.ReferencePosition.PlanetaryEphem" value="INPOP">
15+
<vot:DESCRIPTION>Planetary theory used to compute the ephemeris</vot:DESCRIPTION>
16+
</vot:PARAM>
17+
<vot:PARAM name="CooType" datatype="char" arraysize="*" utype="stc:AstroCoordSystem.SpaceFrame.CoordFlavor" value="SPHERICAL"/>
18+
<vot:PARAM name="Naxes" datatype="char" arraysize="*" utype="stc:AstroCoordSystem.SpaceFrame.coord_naxes" value="3"/>
19+
</vot:GROUP>
20+
</vot:GROUP>
21+
<vot:GROUP ID="Curation" utype="Curation">
22+
<vot:PARAM name="Collection" datatype="char" arraysize="*" utype="DataID.Collection" value="Miriade.ephemcc"/>
23+
<vot:PARAM name="Contact" datatype="char" arraysize="*" ucd="meta.human;meta.curation" utype="Curation.Contact.Name" value="J. Berthier"/>
24+
<vot:PARAM name="CreationType" datatype="char" arraysize="*" utype="sed:Segment.DataID.CreationType" value="Calculation"/>
25+
<vot:PARAM name="Creator" datatype="char" arraysize="*" utype="DataID.Creator" value="J. Berthier, F. Vachier, B. Carry"/>
26+
<vot:PARAM name="Email" datatype="char" arraysize="*" utype="Curation.ContactEmail" value="vossp.lte@obspm.fr"/>
27+
<vot:PARAM name="PubID" datatype="char" arraysize="*" ucd="meta.curation.pubid" utype="Curation.PubID" value="ivo://vopdc.obspm/imcce"/>
28+
<vot:PARAM name="Publisher" datatype="char" arraysize="*" ucd="meta.organization;meta.curation" utype="Curation.Publisher" value="Service des ephemerides, LTE/OBSPM/CNRS"/>
29+
<vot:PARAM name="Reference" datatype="char" arraysize="*" ucd="meta.bib.bibcode" utype="spec:Curation.Reference" value="2009epsc.conf..676B">
30+
<vot:DESCRIPTION>Berthier et al., 2009, EPSC, 676</vot:DESCRIPTION>
31+
</vot:PARAM>
32+
</vot:GROUP>
33+
<vot:RESOURCE name="Miriade.ephemcc">
34+
<vot:DESCRIPTION>Positional ephemerides of solar system objects</vot:DESCRIPTION>
35+
<vot:TABLE ID="Miriade.ephemcc.ephemeris" name="Miriade.ephemcc.ephemeris" nrows="1">
36+
<vot:GROUP ID="Ephemeris" utype="stc:AstroCoords" ref="Ephemeris">
37+
<vot:PARAM name="Ephemerides" datatype="char" arraysize="*" utype="stc:AstroCoords.coord_system_id" value="UTC-ICRS-TOPO"/>
38+
<vot:FIELDref ref="ra"/>
39+
<vot:FIELDref ref="dec"/>
40+
<vot:FIELDref ref="dobs"/>
41+
</vot:GROUP>
42+
<vot:PARAM ID="planetary_theory" name="Planetary theory" datatype="char" arraysize="*" ucd="meta.note" value="INPOP19A">
43+
<vot:DESCRIPTION>Planetary theory</vot:DESCRIPTION>
44+
</vot:PARAM>
45+
<vot:PARAM ID="frame_type" name="Frame type" datatype="char" arraysize="*" ucd="pos.frame" value="J2000 astrometric">
46+
<vot:DESCRIPTION>Frame type</vot:DESCRIPTION>
47+
</vot:PARAM>
48+
<vot:PARAM ID="coord_type" name="Coordinate type" datatype="char" arraysize="*" ucd="meta.note" value="Equatorial">
49+
<vot:DESCRIPTION>Coordinate type</vot:DESCRIPTION>
50+
</vot:PARAM>
51+
<vot:PARAM ID="frame_center" name="Frame center" datatype="char" arraysize="*" ucd="meta.note" value="Topocenter">
52+
<vot:DESCRIPTION>Frame center</vot:DESCRIPTION>
53+
</vot:PARAM>
54+
<vot:PARAM ID="location_name" name="Location name" datatype="char" arraysize="*" ucd="meta.note" value="Simonyi Survey Telescope, Rubin Observatory">
55+
<vot:DESCRIPTION>Topocentric location name</vot:DESCRIPTION>
56+
</vot:PARAM>
57+
<vot:PARAM ID="location_code" name="Location code" datatype="char" arraysize="*" ucd="meta.note" value="X05">
58+
<vot:DESCRIPTION>Topocentric location code</vot:DESCRIPTION>
59+
</vot:PARAM>
60+
<vot:PARAM ID="location_coord" name="Location coordinates" datatype="char" arraysize="*" unit="deg deg m" ucd="" value="-70.749419999999986 -30.244600905565548 2683.5903446307930">
61+
<vot:DESCRIPTION>Topocentric location coordinates</vot:DESCRIPTION>
62+
</vot:PARAM>
63+
<vot:PARAM ID="precnut_model" name="Precession-Nutation model" datatype="char" arraysize="*" ucd="meta.note" value="IAU2000">
64+
<vot:DESCRIPTION>Precession/nutation model</vot:DESCRIPTION>
65+
</vot:PARAM>
66+
<vot:PARAM ID="relativistic_correction" name="Relativistic correction" datatype="char" arraysize="*" ucd="meta.note" value="yes">
67+
<vot:DESCRIPTION>Relativistic perturbations</vot:DESCRIPTION>
68+
</vot:PARAM>
69+
<vot:PARAM ID="relativistic_parameters" name="Relativistic parameters" datatype="char" arraysize="*" ucd="meta.note" value="beta=gamma=1,alpha=0">
70+
<vot:DESCRIPTION>PPN coordinate system</vot:DESCRIPTION>
71+
</vot:PARAM>
72+
<vot:PARAM ID="target_type" name="Target type" datatype="char" arraysize="*" ucd="src.class" value="Asteroid"/>
73+
<vot:PARAM ID="target_name" name="Target name" datatype="char" arraysize="*" ucd="meta.id" value="Don Quixote"/>
74+
<vot:PARAM ID="target_num" name="Target number" datatype="int" ucd="meta.id.part" value="3552"/>
75+
<vot:PARAM ID="target_source" name="Target source" datatype="char" arraysize="*" ucd="meta.id.part" value="ASTORB"/>
76+
<vot:PARAM ID="author_name" name="Author name" datatype="char" arraysize="*" ucd="meta.note" value="L.H. Wasserman"/>
77+
<vot:PARAM ID="number_obs" name="Number of observations" datatype="int" ucd="meta.note" value="1444"/>
78+
<vot:PARAM ID="orbit_arc" name="Orbital arc" datatype="int" ucd="meta.note" unit="d" value="15179"/>
79+
<vot:PARAM ID="ceu" name="CEU" datatype="double" unit="arcsec" ucd="stat.error;pos" value="0.160E-01"/>
80+
<vot:PARAM ID="ceu_rate" name="CEU rate" unit="arcsec/d" datatype="double" ucd="stat.error;arith.rate;pos" value="0.550E-04"/>
81+
<vot:PARAM ID="diameter" name="Diameter" unit="km" datatype="double" ucd="phys.size.diameter" value="0.0000000000000000"/>
82+
<vot:PARAM ID="absolute_magnitude" name="Absolute magnitude" unit="mag" datatype="double" ucd="meta.note" value="13.039999999999999"/>
83+
<vot:PARAM ID="slope_parameter" name="Slope parameter" datatype="double" ucd="meta.note" value="0.14999999999999999"/>
84+
<vot:PARAM ID="orbital_period" name="Orbital period" unit="d" datatype="double" ucd="meta.note" value="3222.4297794526351"/>
85+
<vot:PARAM ID="system_mass" name="System mass" unit="kg" datatype="double" ucd="meta.note" value="0.0000000000000000"/>
86+
<vot:PARAM ID="dynamical_class" name="Dynamical class" datatype="char" arraysize="*" ucd="meta.note" value="NEA&gt;Amor"/>
87+
<vot:PARAM ID="taxonomical_class" name="Taxonomical class" datatype="char" arraysize="*" ucd="meta.note" value="D"/>
88+
<vot:PARAM ID="taxonomical_param" name="Taxonomical parameter" datatype="char" arraysize="*" ucd="meta.note" value="4"/>
89+
<vot:PARAM ID="taxonomical_source" name="Taxonomical source" datatype="char" arraysize="*" ucd="meta.note" value="Tholen (1984, 1989)"/>
90+
<vot:PARAM ID="ref_epoch" name="Reference epoch" unit="d" datatype="double" ucd="meta.note" value="2461000.5000000000"/>
91+
<vot:PARAM ID="semimajor_axis" name="Semi-major axis" unit="au" datatype="double" ucd="meta.note" value="4.2696278599999999"/>
92+
<vot:PARAM ID="eccentricity" name="Eccentricity" datatype="double" ucd="meta.note" value="0.70728760999999996"/>
93+
<vot:PARAM ID="inclination" name="Inclination" unit="deg" datatype="double" ucd="meta.note" value="31.051777999999995"/>
94+
<vot:PARAM ID="node_longitude" name="Longitude of the node" unit="deg" datatype="double" ucd="meta.note" value="349.96697399999999"/>
95+
<vot:PARAM ID="perihelion_argument" name="Perihelion argument" unit="deg" datatype="double" ucd="meta.note" value="316.49469099999999"/>
96+
<vot:PARAM ID="mean_anomaly" name="Mean anomaly" unit="deg" datatype="double" ucd="meta.note" value="308.25968300000000"/>
97+
<vot:FIELD ID="date" name="Date" datatype="double" ucd="time.epoch" ref="Ephemeris" utype="stc:AstroCoords.Time.TimeInstant.JDTime">
98+
<vot:DESCRIPTION>Date</vot:DESCRIPTION>
99+
</vot:FIELD>
100+
<vot:FIELD ID="RA" name="RA" datatype="char" arraysize="*" ucd="pos.eq.ra;meta.main" unit="h min s" ref="Ephemeris" utype="stc:AstroCoords.Position3D.Value3.C1">
101+
<vot:DESCRIPTION>Right ascension</vot:DESCRIPTION>
102+
</vot:FIELD>
103+
<vot:FIELD ID="DEC" name="DEC" datatype="char" arraysize="*" ucd="pos.eq.dec;meta.main" unit="deg arcmin arcsec" ref="Ephemeris" utype="stc:AstroCoords.Position3D.Value3.C2">
104+
<vot:DESCRIPTION>Declination</vot:DESCRIPTION>
105+
</vot:FIELD>
106+
<vot:FIELD ID="dobs" name="Dobs" datatype="double" width="14" precision="9" ucd="phys.distance" unit="au" ref="Ephemeris" utype="stc:AstroCoords.Position3D.Value3.C3">
107+
<vot:DESCRIPTION>Range of target center to observer</vot:DESCRIPTION>
108+
</vot:FIELD>
109+
<vot:FIELD ID="vmag" name="VMag" datatype="double" width="7" precision="2" ucd="phot.mag" unit="mag">
110+
<vot:DESCRIPTION>Apparent magnitude</vot:DESCRIPTION>
111+
</vot:FIELD>
112+
<vot:FIELD ID="phase" name="Phase" datatype="double" width="7" precision="2" ucd="pos.phaseAng" unit="deg">
113+
<vot:DESCRIPTION>Phase angle</vot:DESCRIPTION>
114+
</vot:FIELD>
115+
<vot:FIELD ID="elong" name="Elong." datatype="double" width="8" precision="2" ucd="pos.angDistance" unit="deg">
116+
<vot:DESCRIPTION>Sun elongation</vot:DESCRIPTION>
117+
</vot:FIELD>
118+
<vot:FIELD ID="dRAcosDEC" name="dRAcosDEC" datatype="double" width="12" precision="4" ucd="pos.eq.ra;arith.rate" unit="arcsec/min" ref="Ephemeris" utype="stc:AstroCoords.Velocity3D.C1">
119+
<vot:DESCRIPTION>Component of proper motion in right ascension corrected for the declination</vot:DESCRIPTION>
120+
</vot:FIELD>
121+
<vot:FIELD ID="dDEC" name="dDEC" datatype="double" width="12" precision="4" ucd="pos.eq.dec;arith.rate" unit="arcsec/min" ref="Ephemeris" utype="stc:AstroCoords.Velocity3D.C2">
122+
<vot:DESCRIPTION>Component of proper motion in declination</vot:DESCRIPTION>
123+
</vot:FIELD>
124+
<vot:FIELD ID="rv" name="RV" datatype="double" width="10" precision="5" ucd="phys.distance;arith.rate" unit="km/s">
125+
<vot:DESCRIPTION>Radial velocity of target wrt observer</vot:DESCRIPTION>
126+
</vot:FIELD>
127+
<vot:FIELD ID="rvc" name="RVc" datatype="double" width="10" precision="5" unit="km/s">
128+
<vot:DESCRIPTION>?</vot:DESCRIPTION>
129+
</vot:FIELD>
130+
<vot:FIELD ID="berv" name="BERV" datatype="double" width="10" precision="5" ucd="phys.distance;arith.rate" unit="km/s" ref="Ephemeris" utype="stc:AstroCoords.Velocity3D.C3">
131+
<vot:DESCRIPTION>Barycentric Earth radial velocity</vot:DESCRIPTION>
132+
</vot:FIELD>
133+
<vot:FIELD ID="rvs" name="RVs" datatype="double" width="10" precision="5" unit="km/s">
134+
<vot:DESCRIPTION>?</vot:DESCRIPTION>
135+
</vot:FIELD>
136+
<vot:DATA>
137+
<vot:TABLEDATA>
138+
<vot:TR>
139+
<vot:TD>2.461025113368e6</vot:TD>
140+
<vot:TD>+12 15 43.37428</vot:TD>
141+
<vot:TD>-02 42 24.9255</vot:TD>
142+
<vot:TD>4.323332807</vot:TD>
143+
<vot:TD>20.13</vot:TD>
144+
<vot:TD>13.15</vot:TD>
145+
<vot:TD>78.84</vot:TD>
146+
<vot:TD>0.2433E+00</vot:TD>
147+
<vot:TD>-0.2264E+00</vot:TD>
148+
<vot:TD>-37.39786</vot:TD>
149+
<vot:TD>-18.25730</vot:TD>
150+
<vot:TD>-29.39698</vot:TD>
151+
<vot:TD>-10.25641</vot:TD>
152+
</vot:TR>
153+
</vot:TABLEDATA>
154+
</vot:DATA>
155+
</vot:TABLE>
156+
</vot:RESOURCE>
157+
</vot:VOTABLE>

0 commit comments

Comments
 (0)