diff --git a/CHANGES.rst b/CHANGES.rst index a682affaba..1bebfb59b0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -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 ^^^^ diff --git a/astroquery/imcce/__init__.py b/astroquery/imcce/__init__.py index 5247e0f551..b4432cc939 100644 --- a/astroquery/imcce/__init__.py +++ b/astroquery/imcce/__init__.py @@ -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'], diff --git a/astroquery/imcce/core.py b/astroquery/imcce/core.py index 2fde9f9763..a534c40412 100644 --- a/astroquery/imcce/core.py +++ b/astroquery/imcce/core.py @@ -25,7 +25,7 @@ class MiriadeClass(BaseQuery): """ A class for querying the - `IMCCE/Miriade `_ service. + `IMCCE/Miriade `_ service. """ _query_uri = None # uri used in query @@ -51,8 +51,8 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid', get_raw_response=False, cache=True): """ Query the - `IMCCE Miriade `_ - `ephemcc `_ + `IMCCE Miriade `_ + `ephemcc `_ service. @@ -87,14 +87,14 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid', location : str, optional Location of the observer on Earth as a code or a set of coordinates. See the - `Miriade manual `_ + `Miriade manual `_ for details. Default: geocentric location (``'500'``) coordtype : int, optional Type of coordinates to be calculated: ``1``: spherical, ``2``: rectangular, ``3``: local coordinates (azimuth and elevation), - ``4``: hour angle coordinates, ``5``: dedicated to observation, - ``6``: dedicated to AO observation. Default: ``1`` + ``4``: hour angle coordinates, ``5``: dedicated to observation. + Default: ``1`` timescale : str, optional The time scale used in the computation of the ephemerides: @@ -141,85 +141,94 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid', parameters; number in parentheses denote which ``coordtype`` settings include the parameters. - +------------------+-----------------------------------------------+ - | Column Name | Definition | - +==================+===============================================+ - | ``target`` | Target name (str, 1, 2, 3, 4, 5, 6 ) | - +------------------+-----------------------------------------------+ - | ``epoch`` | Ephemerides epoch (JD, float, 1, 2, 3, 4, 5, | - | | 6) | - +------------------+-----------------------------------------------+ - | ``RA`` | Target RA at ``ephtype`` (deg, float, 1) | - +------------------+-----------------------------------------------+ - | ``DEC`` | Target declination at ``ephtype`` (deg, | - | | float, 1, 4, 5) | - +------------------+-----------------------------------------------+ - | ``RAJ2000`` | Target RA at J2000 (deg, float, 5, 6) | - +------------------+-----------------------------------------------+ - | ``DECJ2000`` | Target declination at J2000 (deg, float, 5, 6)| - +------------------+-----------------------------------------------+ - | ``AZ`` | Target azimuth (deg, float, 3, 5) | - +------------------+-----------------------------------------------+ - | ``EL`` | Target elevation (deg, float, 3, 5) | - +------------------+-----------------------------------------------+ - | ``delta`` | Distance from observer (au, float, 1, 2, 3, | - | | 4, 5, 6) | - +------------------+-----------------------------------------------+ - | ``delta_rate`` | Rate in observer distance (km/s, float, | - | | 1, 5, 6) | - +------------------+-----------------------------------------------+ - | ``V`` | Apparent visual magnitude (mag, float, 1, 2, | - | | 3, 4, 5, 6) | - +------------------+-----------------------------------------------+ - | ``alpha`` | Solar phase angle (deg, 1, 2, 3, 4, 5, 6) | - +------------------+-----------------------------------------------+ - | ``elong`` | Solar elongation angle (deg, 1, 2, 3, 4, 5, 6)| - +------------------+-----------------------------------------------+ - | ``RAcosD_rate`` | Rate of motion in RA * cos(DEC) (arcsec/min, | - | | float, 1, 5, 6) | - +------------------+-----------------------------------------------+ - | ``DEC_rate`` | Rate of motion in DEC (arcsec/min, float, 1, | - | | 5, 6) | - +------------------+-----------------------------------------------+ - | ``x`` | X position state vector (au, float, 2) | - +------------------+-----------------------------------------------+ - | ``y`` | Y position state vector (au, float, 2) | - +------------------+-----------------------------------------------+ - | ``z`` | Z position state vector (au, float, 2) | - +------------------+-----------------------------------------------+ - | ``vx`` | X velocity state vector (au/d, float, 2) | - +------------------+-----------------------------------------------+ - | ``vy`` | Y velocity state vector (au/d, float, 2) | - +------------------+-----------------------------------------------+ - | ``vz`` | Z velocity state vector (au/d, float, 2) | - +------------------+-----------------------------------------------+ - | ``rv`` | Radial velocity (km/s, float, 2) | - +------------------+-----------------------------------------------+ - | ``heldist`` | Target heliocentric distance (au, float, 2, | - | | 5, 6) | - +------------------+-----------------------------------------------+ - | ``x_h`` | X heliocentric position vector (au, float, 2) | - +------------------+-----------------------------------------------+ - | ``y_h`` | Y heliocentric position vector (au, float, 2) | - +------------------+-----------------------------------------------+ - | ``z_h`` | Z heliocentric position vector (au, float, 2) | - +------------------+-----------------------------------------------+ - | ``vx_h`` | X heliocentric vel. vector (au/d, float, 2) | - +------------------+-----------------------------------------------+ - | ``vy_h`` | Y heliocentric vel. vector (au/d, float, 2) | - +------------------+-----------------------------------------------+ - | ``vz_h`` | Z heliocentric vel. vector (au/d, float, 2) | - +------------------+-----------------------------------------------+ - | ``hourangle`` | Target hour angle (deg, float, 4, 5) | - +------------------+-----------------------------------------------+ - | ``siderealtime`` | Local sidereal time (hr, float, 5, 6) | - +------------------+-----------------------------------------------+ - | ``refraction`` | Atmospheric refraction (arcsec, float, 5, 6) | - +------------------+-----------------------------------------------+ - | ``airmass`` | Target airmass (float, 5, 6) | - +------------------+-----------------------------------------------+ - | ``posunc`` | Positional uncertainty (arcsec, float, 5, 6) | - +------------------+-----------------------------------------------+ + +---------------------+-----------------------------------------------+ + | Column Name | Definition | + +=====================+===============================================+ + | ``target`` | Target name (str, 1, 2, 3, 4, 5) | + +---------------------+-----------------------------------------------+ + | ``epoch`` | Ephemerides epoch (JD, float, 1, 2, 3, 4, 5) | + +---------------------+-----------------------------------------------+ + | ``RA`` | Target RA at ``ephtype`` (deg, float, 1) | + +---------------------+-----------------------------------------------+ + | ``DEC`` | Target declination at ``ephtype`` (deg, | + | | float, 1, 4, 5) | + +---------------------+-----------------------------------------------+ + | ``RAJ2000`` | Target RA at J2000 (deg, float, 5) | + +---------------------+-----------------------------------------------+ + | ``DECJ2000`` | Target declination at J2000 (deg, float, 5) | + +---------------------+-----------------------------------------------+ + | ``LONG`` | Target Ecliptic longitude at ``refplane`` | + | | (deg, float, "ecliptic") | + +---------------------+-----------------------------------------------+ + | ``LAT`` | Target declination at ``refplane`` (deg, | + | | float, "ecliptic") | + +---------------------+-----------------------------------------------+ + | ``AZ`` | Target azimuth (deg, float, 3, 5) | + +---------------------+-----------------------------------------------+ + | ``EL`` | Target elevation (deg, float, 3, 5) | + +---------------------+-----------------------------------------------+ + | ``delta`` | Distance from observer (au, float, 1, 2, 3, | + | | 4, 5) | + +---------------------+-----------------------------------------------+ + | ``delta_rate`` | Rate in observer distance (km/s, float, | + | | 1, 5) | + +---------------------+-----------------------------------------------+ + | ``V`` | Apparent visual magnitude (mag, float, 1, 2, | + | | 3, 4, 5) | + +---------------------+-----------------------------------------------+ + | ``alpha`` | Solar phase angle (deg, 1, 2, 3, 4, 5) | + +---------------------+-----------------------------------------------+ + | ``elong`` | Solar elongation angle (deg, 1, 2, 3, 4, 5) | + +---------------------+-----------------------------------------------+ + | ``RAcosD_rate`` | Rate of motion in RA * cos(DEC) (arcsec/min, | + | | float, 1, 5) | + +---------------------+-----------------------------------------------+ + | ``DEC_rate`` | Rate of motion in DEC (arcsec/min, float, 1, | + | | 5) | + +---------------------+-----------------------------------------------+ + | ``LONGcosLAT_rate`` | Rate of motion in LONG * cos(LAT) (arcsec/min,| + | | float, 1, 5) | + +---------------------+-----------------------------------------------+ + | ``LAT_rate`` | Rate of motion in LAT (arcsec/min, float, 1, | + | | 5) | + +---------------------+-----------------------------------------------+ + | ``x`` | X position state vector (au, float, 2) | + +---------------------+-----------------------------------------------+ + | ``y`` | Y position state vector (au, float, 2) | + +---------------------+-----------------------------------------------+ + | ``z`` | Z position state vector (au, float, 2) | + +---------------------+-----------------------------------------------+ + | ``vx`` | X velocity state vector (au/d, float, 2) | + +---------------------+-----------------------------------------------+ + | ``vy`` | Y velocity state vector (au/d, float, 2) | + +---------------------+-----------------------------------------------+ + | ``vz`` | Z velocity state vector (au/d, float, 2) | + +---------------------+-----------------------------------------------+ + | ``rv`` | Radial velocity (km/s, float, 2) | + +---------------------+-----------------------------------------------+ + | ``heldist`` | Target heliocentric distance (au, float, 2, | + | | 5, 6) | + +---------------------+-----------------------------------------------+ + | ``x_h`` | X heliocentric position vector (au, float, 2) | + +---------------------+-----------------------------------------------+ + | ``y_h`` | Y heliocentric position vector (au, float, 2) | + +---------------------+-----------------------------------------------+ + | ``z_h`` | Z heliocentric position vector (au, float, 2) | + +---------------------+-----------------------------------------------+ + | ``vx_h`` | X heliocentric vel. vector (au/d, float, 2) | + +---------------------+-----------------------------------------------+ + | ``vy_h`` | Y heliocentric vel. vector (au/d, float, 2) | + +---------------------+-----------------------------------------------+ + | ``vz_h`` | Z heliocentric vel. vector (au/d, float, 2) | + +---------------------+-----------------------------------------------+ + | ``hourangle`` | Target hour angle (deg, float, 4, 5) | + +---------------------+-----------------------------------------------+ + | ``siderealtime`` | Local sidereal time (hr, float, 5) | + +---------------------+-----------------------------------------------+ + | ``refraction`` | Atmospheric refraction (arcsec, float, 5) | + +---------------------+-----------------------------------------------+ + | ``airmass`` | Target airmass (float, 5) | + +---------------------+-----------------------------------------------+ Examples @@ -229,12 +238,13 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid', >>> from astropy.time import Time >>> epoch = Time('2019-01-01', format='iso') >>> Miriade.get_ephemerides('3552', epoch=epoch) # doctest: +SKIP - - target epoch RA ... DEC_rate delta_rate - d deg ... arcs / min km / s - bytes20 float64 float64 ... float64 float64 - ----------- -------------------- ------------------ ... ---------- ------------ - Don Quixote 2458484.5 16.105294999999998 ... -0.25244 31.4752734 +
+ epoch RA DEC ... RAcosD_rate DEC_rate delta_rate + d deg deg ... arcsec / min arcsec / min km / s + float64 float64 float64 ... float64 float64 float64 + --------- ------------------ ----------------- ... ------------ ------------ ---------- + 2458484.5 16.105201666666666 45.50291433333334 ... 0.3221 -0.2524 31.47530 + """ URL = conf.ephemcc_server @@ -254,7 +264,7 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid', ('-step', epoch_step), ('-nbd', epoch_nsteps), ('-observer', location), - ('-output', '--jul'), + ('-output', '--jd'), ('-tscale', timescale), ('-theory', planetary_theory), ('-teph', ephtype), @@ -273,7 +283,6 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid', response = self._request('GET', URL, params=request_payload, timeout=TIMEOUT, cache=cache) self._query_uri = response.url - self._get_raw_response = get_raw_response return response @@ -302,15 +311,20 @@ def _parse_result(self, response, *, verbose=None): data = votable.get_first_table().to_table() # modify table columns + data.rename_column('date', 'epoch') data['epoch'].unit = u.d - if 'ra' in data.columns: - data['ra'] = Angle(data['ra'], unit=u.hourangle).deg*u.deg - data.rename_column('ra', 'RA') + if 'RA' in data.columns: + data['RA'] = Angle(data['RA'], unit=u.hourangle).deg*u.deg + + if 'DEC' in data.columns: + data['DEC'] = Angle(data['DEC'], unit=u.deg).deg*u.deg - if 'dec' in data.columns: - data['dec'] = Angle(data['dec'], unit=u.deg).deg*u.deg - data.rename_column('dec', 'DEC') + if 'LONG' in data.columns: + data['LONG'] = Angle(data['LONG'], unit=u.deg).deg*u.deg + + if 'LAT' in data.columns: + data['LAT'] = Angle(data['LAT'], unit=u.deg).deg*u.deg if 'raJ2000' in data.columns and 'decJ2000' in data.columns: data['raJ2000'] = Angle( @@ -344,47 +358,62 @@ def _parse_result(self, response, *, verbose=None): data['vy_h'].unit = u.au/u.day data['vz_h'].unit = u.au/u.day + if 'dobs' in data.columns: + data.rename_column('dobs', 'delta') + if 'distance' in data.columns: data.rename_column('distance', 'delta') - if 'obsdistance' in data.columns: - data.rename_column('obsdistance', 'delta') + if 'dobs' in data.columns: + data.rename_column('dobs', 'delta') - if 'heliodistance' in data.columns: - data.rename_column('heliodistance', 'heldist') + if 'dhelio' in data.columns: + data.rename_column('dhelio', 'heldist') - if 'azimut' in data.columns and 'elevation' in data.columns: - data['azimut'] = Angle(data['azimut'], unit=u.deg).deg * u.deg - data['elevation'] = Angle( - data['elevation'], unit=u.deg).deg * u.deg - data.rename_column('azimut', 'AZ') - data.rename_column('elevation', 'EL') + if 'az' in data.columns and 'elev' in data.columns: + data['az'] = Angle(data['az'], unit=u.deg).deg * u.deg + data['elev'] = Angle( + data['elev'], unit=u.deg).deg * u.deg + data.rename_column('az', 'AZ') + data.rename_column('elev', 'EL') - if 'mv' in data.columns: - data.rename_column('mv', 'V') + if 'vmag' in data.columns: + data.rename_column('vmag', 'V') data['V'].unit = u.mag if 'phase' in data.columns: data.rename_column('phase', 'alpha') - if 'elongation' in data.columns: - data.rename_column('elongation', 'elong') + if 'dRAcosDEC' in data.columns: + data.rename_column('dRAcosDEC', 'RAcosD_rate') + + if 'dDEC' in data.columns: + data.rename_column('dDEC', 'DEC_rate') + + if 'dRAcosDEC' in data.columns: + data.rename_column('dRAcosDEC', 'RAcosD_rate') + + if 'dLONGcosLAT' in data.columns: + data.rename_column('dLONGcosLAT', 'LONGcosLAT_rate') - if 'dracosdec' in data.columns: - data.rename_column('dracosdec', 'RAcosD_rate') + if 'dDEC' in data.columns: + data.rename_column('dDEC', 'DEC_rate') - if 'ddec' in data.columns: - data.rename_column('ddec', 'DEC_rate') + if 'dLAT' in data.columns: + data.rename_column('dLAT', 'LAT_rate') - if 'dist_dot' in data.columns: - data.rename_column('dist_dot', 'delta_rate') + if 'rv' in data.columns: + data.rename_column('rv', 'delta_rate') if 'lst' in data.columns: data.rename_column('lst', 'siderealtime') - if 'hourangle' in data.columns: + if 'ha' in data.columns: + data.rename_column('ha', 'hourangle') data['hourangle'] = Angle(data['hourangle'], unit=u.hourangle).deg * u.deg + if 'am' in data.columns: + data.rename_column('am', 'airmass') if 'aeu' in data.columns: data.rename_column('aeu', 'posunc') @@ -398,7 +427,7 @@ def _parse_result(self, response, *, verbose=None): @async_to_sync class SkybotClass(BaseQuery): """A class for querying the `IMCCE SkyBoT - `_ service. + `_ service. """ _uri = None # query uri _get_raw_response = False diff --git a/astroquery/imcce/tests/data/3552_coordtype1.dat b/astroquery/imcce/tests/data/3552_coordtype1.dat index d8e5f62ad9..d9b7afdbc5 100644 --- a/astroquery/imcce/tests/data/3552_coordtype1.dat +++ b/astroquery/imcce/tests/data/3552_coordtype1.dat @@ -1,68 +1,157 @@ - - - - - - -Miriade - Positional ephemeris - -Positional ephemeris - - - - - - - - - - - - - - - - - - -Name or designation of the target - - -Julian day (UTC) - - -Right ascension of target centre - - -Declination of target centre - - -Distance from observer - - -Apparent visual magnitude - - -Phase angle - - -Solar elongation - - -Rate of change of target center RA (multiplied by the cosine of the declination) - - -Rate of change of target center DE - - -Rate of change of target distance from observer - - - -Don Quixote 2458516.4295727154201 37 2.87184+43 35 17.4235 3.008900447 18.72 18.36 87.55 0.56253E+00-0.58523E-01 34.0401852 - - - - + + + + + + + + + + + + + + + Planetary theory used to compute the ephemeris + + + + + + + + + + + + + + + Berthier et al., 2009, EPSC, 676 + + + + Positional ephemerides of solar system objects + + + + + + + + + Planetary theory + + + Frame type + + + Coordinate type + + + Frame center + + + Topocentric location name + + + Topocentric location code + + + Topocentric location coordinates + + + Precession/nutation model + + + Relativistic perturbations + + + PPN coordinate system + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date + + + Right ascension + + + Declination + + + Range of target center to observer + + + Apparent magnitude + + + Phase angle + + + Sun elongation + + + Component of proper motion in right ascension corrected for the declination + + + Component of proper motion in declination + + + Radial velocity of target wrt observer + + + ? + + + Barycentric Earth radial velocity + + + ? + + + + + 2.461025113368e6 + +12 15 43.37428 + -02 42 24.9255 + 4.323332807 + 20.13 + 13.15 + 78.84 + 0.2433E+00 + -0.2264E+00 + -37.39786 + -18.25730 + -29.39698 + -10.25641 + + + + + - diff --git a/astroquery/imcce/tests/data/3552_coordtype2.dat b/astroquery/imcce/tests/data/3552_coordtype2.dat index cf099200b4..15d8a1679f 100644 --- a/astroquery/imcce/tests/data/3552_coordtype2.dat +++ b/astroquery/imcce/tests/data/3552_coordtype2.dat @@ -1,95 +1,171 @@ - - - - - - -Miriade - Positional ephemeris - -Positional ephemeris - - - - - - - - - - - - - - - - - - -Name or designation of the target - - -Julian day (UTC) - - -X position state vector - - -Y position state vector - - -Z position state vector - - -X velocity state vector - - -Y velocity state vector - - -Z velocity state vector - - -Target-observer distance - - -Apparent visual magnitude - - -Phase angle - - -Solar elongation - - -Radial velocity - - -Sun-target distance - - -X heliocentric position state vector - - -Y heliocentric position state vector - - -Z heliocentric position state vector - - -X heliocentric velocity state vector - - -Y heliocentric velocity state vector - - -Z heliocentric velocity state vector - - - -Don Quixote 2458516.42987012491 1.9869001083502 0.8955362983387 2.0745505019470 0.0088993149147 0.0169725486824 0.0126644662530 3.0089062942094 18.72 18.36 87.55 34.040 3.1311694826006 1.3210362670716 1.5621709981656 2.3636294969639 -0.0040714189833 0.0062462212313 0.0080150276734 - - - - + + + + + + + + + + + + + + + Planetary theory used to compute the ephemeris + + + + + + + + + + + + + + + Berthier et al., 2009, EPSC, 676 + + + + Positional ephemerides of solar system objects + + + + + + + + + + + Planetary theory + + + Frame type + + + Coordinate type + + + Frame center + + + Topocentric location name + + + Topocentric location code + + + Topocentric location coordinates + + + Precession/nutation model + + + Relativistic perturbations + + + PPN coordinate system + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date + + + X-component of position vector of the target + + + Y-component of position vector of the target + + + Z-component of position vector of the target + + + Range of target center to observer + + + Heliocentric range + + + Phase angle + + + Sun elongation + + + Apparent magnitude + + + X-component of velocity vector of the target + + + Y-component of velocity vector of the target + + + Z-component of velocity vector of the target + + + Radial velocity of target wrt observer + + + ? + + + Barycentric Earth radial velocity + + + ? + + + + + 2.461025113368e6 + -4.3083501272352 + -0.2960351201723 + -0.2041787234081 + 4.323332807258 + 4.244138566231 + 13.15 + 78.84 + 20.126 + 0.0223496681091 + -0.0058263660849 + -0.0058057435190 + -37.398 + -18.25730 + -29.39698 + -10.25641 + + + + + - diff --git a/astroquery/imcce/tests/data/3552_coordtype3.dat b/astroquery/imcce/tests/data/3552_coordtype3.dat index dcc2457ccf..766d0b2b26 100644 --- a/astroquery/imcce/tests/data/3552_coordtype3.dat +++ b/astroquery/imcce/tests/data/3552_coordtype3.dat @@ -1,61 +1,155 @@ - - - - - - -Miriade - Positional ephemeris - -Positional ephemeris - - - - - - - - - - - - - - - - - - - - -Name or designation of the target - - -Julian day (UTC) - - -Azimuth of target centre - - -Elevation of target centre - - -Apparent visual magnitude - - -Distance from observer - - -Phase angle - - -Solar elongation - - - -Don Quixote 2458516.42997361580299 13 9.022+34 16 22.96 18.72 3.008884287 18.36 87.55 - - - - + + + + + + + + + + + + + + + Planetary theory used to compute the ephemeris + + + + + + + + + + + + + + + Berthier et al., 2009, EPSC, 676 + + + + Positional ephemerides of solar system objects + + + + + + + Planetary theory + + + Frame type + + + Coordinate type + + + Frame center + + + Topocentric location name + + + Topocentric location code + + + Topocentric location coordinates + + + Precession/nutation model + + + Relativistic perturbations + + + PPN coordinate system + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date + + + Local sidereal time + + + Azimuth + + + Elevation + + + Range of target center to observer + + + Apparent magnitude + + + Phase angle + + + Sun elongation + + + Atmospheric refraction + + + Radial velocity of target wrt observer + + + ? + + + Barycentric Earth radial velocity + + + ? + + + + + 2.461025113380e6 + 15 38 18.67 + 289.8102 + 34.8173 + 4.323332557264 + 20.126 + 13.15 + 78.84 + 90.211 + -37.398 + -18.25730 + -29.39696 + -10.25641 + + + + + - diff --git a/astroquery/imcce/tests/data/3552_coordtype4.dat b/astroquery/imcce/tests/data/3552_coordtype4.dat index 3d98aee1f0..9a337a0226 100644 --- a/astroquery/imcce/tests/data/3552_coordtype4.dat +++ b/astroquery/imcce/tests/data/3552_coordtype4.dat @@ -1,61 +1,156 @@ - - - - - - -Miriade - Positional ephemeris - -Positional ephemeris - - - - - - - - - - - - - - - - - - - - -Name or designation of the target - - -Julian day (UTC) - - -Hour angle of target centre - - -Declination of target centre - - -Apparent visual magnitude - - -Distance from observer - - -Phase angle - - -Solar elongation - - - -Don Quixote 2458516.43007193878 5 38 55.14+43 35 15.92 18.72 3.008886232 18.36 87.55 - - - - + + + + + + + + + + + + + + + Planetary theory used to compute the ephemeris + + + + + + + + + + + + + + + Berthier et al., 2009, EPSC, 676 + + + + Positional ephemerides of solar system objects + + + + + + + + Planetary theory + + + Frame type + + + Coordinate type + + + Frame center + + + Topocentric location name + + + Topocentric location code + + + Topocentric location coordinates + + + Precession/nutation model + + + Relativistic perturbations + + + PPN coordinate system + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date + + + Local sidereal time + + + Hour angle + + + Declination + + + Range of target center to observer + + + Apparent magnitude + + + Phase angle + + + Sun elongation + + + Air mass + + + Radial velocity of target wrt observer + + + ? + + + Barycentric Earth radial velocity + + + ? + + + + + 2.461025113380e6 + 15 38 18.67 + 3.3765 + -2.7069 + 4.323332557264 + 20.126 + 13.15 + 78.84 + 1.748 + -37.398 + -18.25730 + -29.39696 + -10.25641 + + + + + - diff --git a/astroquery/imcce/tests/data/3552_coordtype5.dat b/astroquery/imcce/tests/data/3552_coordtype5.dat index c2485deb48..d6de8aae75 100644 --- a/astroquery/imcce/tests/data/3552_coordtype5.dat +++ b/astroquery/imcce/tests/data/3552_coordtype5.dat @@ -1,97 +1,182 @@ - - - - - - -Miriade - Positional ephemeris - -Positional ephemeris - - - - - - - - - - - - - - - - - - - - -Name or designation of the target - - -Julian day (UTC) - - -Local sideral time - - -J2000 right ascension of the target - - -J2000 declination of the target - - -Hour angle of target centre - - -Declination of target centre - - -Azimuth of target centre - - -Elevation of target centre - - -Atmospheric refraction - - -Air mass - - -Apparent visual magnitude - - -Observer-target distance - - -Sun-target distance - - -Phase angle - - -Solar elongation - - -Current ephemeris uncertainty - - -Rate of change of target center RA (multiplied by the cosine of the declination) - - -Rate of change of target center DE - - -Rate of change of target distance from observer - - - -Don Quixote 2458516.43017231347 7.26849 1 37 2.74+43 35 15.92 5 39 3.83+43 35 15.92 299 15 26.75+34 13 54.7792.411.77 18.72 3.00888822 3.131171741 18.36 87.55 0.0244 0.56174E+00-0.64308E-01 34.2608039 - - - - + + + + + + + + + + + + + + + Planetary theory used to compute the ephemeris + + + + + + + + + + + + + + + Berthier et al., 2009, EPSC, 676 + + + + Positional ephemerides of solar system objects + + + + + + + + + + Planetary theory + + + Frame type + + + Coordinate type + + + Frame center + + + Topocentric location name + + + Topocentric location code + + + Topocentric location coordinates + + + Precession/nutation model + + + Relativistic perturbations + + + PPN coordinate system + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date + + + Local sidereal time + + + Right ascension + + + Declination + + + Hour angle + + + Azimuth + + + Elevation + + + Range of target center to observer + + + Heliocentric range + + + Apparent magnitude + + + Phase angle + + + Sun elongation + + + Air mass + + + Component of proper motion in right ascension corrected for the declination + + + Component of proper motion in declination + + + Radial velocity of target wrt observer + + + ? + + + Barycentric Earth radial velocity + + + ? + + + + + 2.461025113391e6 + 15 38 19.67 + 183.9307284310 + -2.7069258451 + 3.3767 + 289.8073 + 34.8139 + 4.323332307 + 4.244138429 + 20.126 + 13.15 + 78.84 + 1.748 + 0.2433E+00 + -0.2264E+00 + -37.39783 + -18.25730 + -29.39695 + -10.25642 + + + + + - diff --git a/astroquery/imcce/tests/data/3552_coordtype6.dat b/astroquery/imcce/tests/data/3552_coordtype6.dat deleted file mode 100644 index 2489d450db..0000000000 --- a/astroquery/imcce/tests/data/3552_coordtype6.dat +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - -Miriade - Positional ephemeris - -Positional ephemeris - - - - - - - - - - - - - - - - - - -Name or designation of the target - - -Julian day (UTC) - - -Local sideral time - - -J2000 right ascension of the target - - -J2000 declination of the target - - -Atmospheric refraction - - -Air mass - - -Apparent visual magnitude - - -Observer-target distance - - -Sun-target distance - - -Phase angle - - -Solar elongation - - -Current ephemeris uncertainty - - -Rate of change of target center RA (multiplied by the cosine of the declination) - - -Rate of change of target center DE - - -Rate of change of target distance from observer - - - -Don Quixote 2458516.43759827130 7.44720 1 37 3.47+43 35 16.7597.891.85 18.72 3.00905822 3.131227200 18.36 87.55 0.0244 0.56257E+00-0.58484E-01 34.0402653 - - - - - - diff --git a/astroquery/imcce/tests/data/get_examples.sh b/astroquery/imcce/tests/data/get_examples.sh new file mode 100644 index 0000000000..19bf0841d1 --- /dev/null +++ b/astroquery/imcce/tests/data/get_examples.sh @@ -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 + diff --git a/astroquery/imcce/tests/test_miriade.py b/astroquery/imcce/tests/test_miriade.py index ac9049502b..a839a3b97f 100644 --- a/astroquery/imcce/tests/test_miriade.py +++ b/astroquery/imcce/tests/test_miriade.py @@ -42,10 +42,11 @@ def patch_request(request): def test_spherical_coordinates(patch_request): eph = Miriade.get_ephemerides('3552', coordtype=1) - cols = ('target', 'epoch', 'RA', 'DEC', 'delta', 'V', 'alpha', 'elong', - 'RAcosD_rate', 'DEC_rate', 'delta_rate') - units = (None, u.d, u.deg, u.deg, u.au, u.mag, u.deg, u.deg, - u.arcsec / u.minute, u.arcsec / u.minute, u.km / u.s) + cols = ('epoch', 'RA', 'DEC', 'delta', 'V', 'alpha', 'elong', 'RAcosD_rate', + 'DEC_rate', 'delta_rate', 'rvc', 'berv', 'rvs') + units = (u.d, u.deg, u.deg, u.au, u.mag, u.deg, u.deg, + u.arcsec / u.minute, u.arcsec / u.minute, u.km / u.s, + u.km / u.s, u.km / u.s, u.km / u.s) for i in range(len(cols)): assert cols[i] in eph.columns assert eph[cols[i]].unit == units[i] @@ -53,14 +54,11 @@ def test_spherical_coordinates(patch_request): def test_rectangular_coordinates(patch_request): eph = Miriade.get_ephemerides('3552', coordtype=2) - cols = ('target', 'epoch', 'x', 'y', 'z', - 'vx', 'vy', 'vz', 'delta', 'V', - 'alpha', 'elong', 'rv', 'heldist', - 'x_h', 'y_h', 'z_h', - 'vx_h', 'vy_h', 'vz_h') - units = (None, u.d, u.au, u.au, u.au, u.au/u.day, u.au/u.day, - u.au/u.day, u.au, u.mag, u.deg, u.deg, u.km/u.s, - u.au, u.au, u.au, u.au, u.au/u.day, u.au/u.day, u.au/u.day) + cols = ('epoch', 'px', 'py', 'pz', 'delta', 'heldist', 'alpha', 'elong', 'V', + 'vx', 'vy', 'vz', 'delta_rate', 'rvc', 'berv', 'rvs') + units = (u.d, u.au, u.au, u.au, u.au, u.au, u.deg, u.deg, u.mag, + u.au / u.day, u.au / u.day, u.au / u.day, + u.km / u.s, u.km / u.s, u.km / u.s, u.km / u.s) for i in range(len(cols)): assert cols[i] in eph.columns assert eph[cols[i]].unit == units[i] @@ -68,8 +66,11 @@ def test_rectangular_coordinates(patch_request): def test_local_coordinates(patch_request): eph = Miriade.get_ephemerides('3552', coordtype=3) - cols = ('target', 'epoch', 'AZ', 'EL', 'V', 'delta', 'alpha', 'elong') - units = (None, u.day, u.deg, u.deg, u.mag, u.au, u.deg, u.deg) + cols = ('epoch', 'siderealtime', 'AZ', 'EL', 'delta', 'V', + 'alpha', 'elong', 'refrac', 'delta_rate', 'rvc', 'berv', 'rvs') + units = (u.d, 'h min s', u.deg, u.deg, u.au, u.mag, + u.deg, u.deg, u.arcsec, u.km / u.s, u.km / u.s, + u.km / u.s, u.km / u.s) for i in range(len(cols)): assert cols[i] in eph.columns assert eph[cols[i]].unit == units[i] @@ -77,9 +78,11 @@ def test_local_coordinates(patch_request): def test_hourangle_coordinates(patch_request): eph = Miriade.get_ephemerides('3552', coordtype=4) - cols = ('target', 'epoch', 'hourangle', - 'DEC', 'V', 'delta', 'alpha', 'elong') - units = (None, u.d, u.deg, u.deg, u.mag, u.au, u.deg, u.deg) + cols = ['epoch', 'siderealtime', 'hourangle', 'dec', 'delta', 'V', + 'alpha', 'elong', 'airmass', 'delta_rate', 'rvc', 'berv', 'rvs'] + units = (u.d, 'h min s', u.deg, u.deg, u.au, u.mag, + u.deg, u.deg, None, u.km / u.s, u.km / u.s, + u.km / u.s, u.km / u.s) for i in range(len(cols)): assert cols[i] in eph.columns assert eph[cols[i]].unit == units[i] @@ -87,26 +90,13 @@ def test_hourangle_coordinates(patch_request): def test_observation_coordinates(patch_request): eph = Miriade.get_ephemerides('3552', coordtype=5) - cols = ('target', 'epoch', 'siderealtime', 'RAJ2000', 'DECJ2000', - 'hourangle', 'DEC', 'AZ', 'EL', 'refraction', - 'V', 'delta', 'heldist', 'alpha', 'elong', 'posunc', - 'RAcosD_rate', 'DEC_rate', 'delta_rate') - units = (None, u.d, u.h, u.deg, u.deg, u.deg, u.deg, u.deg, u.deg, - u.arcsec, u.mag, u.au, u.au, u.deg, u.deg, u.arcsec, - u.arcsec / u.minute, u.arcsec / u.minute, u.km / u.s) - for i in range(len(cols)): - assert cols[i] in eph.columns - assert eph[cols[i]].unit == units[i] - - -def test_aoobservation_coordinates(patch_request): - eph = Miriade.get_ephemerides('3552', coordtype=6) - cols = ('target', 'epoch', 'siderealtime', 'RAJ2000', 'DECJ2000', - 'refraction', 'V', 'delta', 'heldist', 'alpha', - 'elong', 'posunc', 'RAcosD_rate', 'DEC_rate', 'delta_rate') - units = (None, u.d, u.h, u.deg, u.deg, u.arcsec, u.mag, - u.au, u.au, u.deg, u.deg, u.arcsec, u.arcsec / u.minute, - u.arcsec / u.minute, u.km / u.s) + cols = ['epoch', 'siderealtime', 'RA', 'DEC', 'hourangle', 'AZ', 'EL', + 'delta', 'heldist', 'V', 'alpha', 'elong', 'airmass', + 'RAcosD_rate', 'DEC_rate', 'delta_rate', 'rvc', 'berv', 'rvs'] + units = (u.d, "h min s", u.deg, u.deg, u.deg, u.deg, u.deg, + u.au, u.au, u.mag, u.deg, u.deg, None, + u.arcsec / u.min, u.arcsec / u.min, u.km / u.s, u.km / u.s, + u.km / u.s, u.km / u.s) for i in range(len(cols)): assert cols[i] in eph.columns assert eph[cols[i]].unit == units[i] @@ -115,4 +105,4 @@ def test_aoobservation_coordinates(patch_request): def test_get_raw_response(patch_request): raw_eph = Miriade.get_ephemerides( '3552', coordtype=1, get_raw_response=True) - assert "" in raw_eph + assert '' in raw_eph diff --git a/astroquery/imcce/tests/test_miriade_remote.py b/astroquery/imcce/tests/test_miriade_remote.py index 4037850cca..8c8709d3c7 100644 --- a/astroquery/imcce/tests/test_miriade_remote.py +++ b/astroquery/imcce/tests/test_miriade_remote.py @@ -1,8 +1,8 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst -import numpy.testing as npt import pytest +import astropy.units as u from .. import core @@ -16,9 +16,11 @@ def test_ephemerides(self): res = core.Miriade.get_ephemerides('Ceres', location='500', epoch=2451544.5) - assert res['target'] == "Ceres" + assert u.allclose(res["epoch"].quantity, [2451544.5] * u.d) - npt.assert_allclose( - [2451544.5, 188.70280, 9.09829], - [res['epoch'][0], res['RA'][0], res['DEC'][0]], - rtol=1e-5) + # the orbit solution change with time, but anything within 10" is enough + # for this test + assert u.allclose((res['RA'].quantity, res['DEC'].quantity), + ([188.7032992], [9.0980213]) * u.deg, + atol=10 * u.arcsec) + diff --git a/docs/imcce/imcce.rst b/docs/imcce/imcce.rst index a8b54a9b69..fbee9a7b3e 100644 --- a/docs/imcce/imcce.rst +++ b/docs/imcce/imcce.rst @@ -154,11 +154,11 @@ query looks like this: >>> from astroquery.imcce import Miriade >>> Miriade.get_ephemerides('Ceres') # doctest: +IGNORE_OUTPUT
- target epoch RA ... DEC_rate delta_rate - d deg ... arcsec / min km / s - str20 float64 float64 ... float64 float64 - ------ -------------------- ------------------ ... ------------ ------------ - Ceres 2459914.7406457304 178.71843708333333 ... -0.18976 -21.5458636 + epoch RA DEC ... DEC_rate rv + d deg deg ... arcsec / min km / s + float64 float64 float64 ... float64 float64 + -------------- ------------ ------------------ ... ------------ ---------- + 2461053.384583 11.912435375 -3.715397138888889 ... 0.3874 22.45706 This query will return ephemerides for asteroid Ceres, for the current epoch, and for a geocentric location. The query output is formatted as @@ -194,21 +194,21 @@ Pallas over an entire year with a time step of 1 day: >>> Miriade.get_ephemerides('Pallas', epoch='2019-01-01', ... epoch_step='1d', epoch_nsteps=365) # doctest: +IGNORE_OUTPUT
- target epoch RA ... DEC_rate delta_rate - d deg ... arcsec / min km / s - str20 float64 float64 ... float64 float64 - ------ -------------------- ------------------ ... ------------ ------------ - Pallas 2458484.5 200.58653041666665 ... 0.15854 -19.3678426 - Pallas 2458485.5 200.92696041666662 ... 0.16727 -19.4137911 - Pallas 2458486.5 201.2641308333333 ... 0.17613 -19.4552654 - Pallas 2458487.5 201.59797541666663 ... 0.18511 -19.4921119 - Pallas 2458488.5 201.92842624999997 ... 0.19421 -19.5241979 - ... ... ... ... ... ... - Pallas 2458844.5 261.5083995833333 ... 0.029542 -2.5107101 - Pallas 2458845.5 261.8853333333333 ... 0.034077 -2.7290984 - Pallas 2458846.5 262.26158625 ... 0.038612 -2.9467484 - Pallas 2458847.5 262.63713083333334 ... 0.043144 -3.1635878 - Pallas 2458848.5 263.01193875 ... 0.047672 -3.3795661 + epoch RA DEC ... DEC_rate rv + d deg deg ... arcsec / min km / s + float64 float64 float64 ... float64 float64 + --------- ------------------ ------------------- ... ------------ ---------- + 2458484.5 200.58658462499997 -5.998279138888889 ... 0.1585 -19.36784 + 2458485.5 200.92701474999998 -5.933115777777778 ... 0.1673 -19.41378 + 2458486.5 201.26418570833332 -5.864435027777778 ... 0.1761 -19.45526 + 2458487.5 201.59803025 -5.7921869444444445 ... 0.1851 -19.49211 + 2458488.5 201.92848124999998 -5.716322083333334 ... 0.1942 -19.52419 + ... ... ... ... ... ... + 2458844.5 261.5084273333333 3.596639722222222 ... 0.0295 -2.51070 + 2458845.5 261.885360875 3.6093634722222223 ... 0.0341 -2.72909 + 2458846.5 262.261614 3.6239013055555556 ... 0.0386 -2.94674 + 2458847.5 262.63715837499996 3.6402525 ... 0.0431 -3.16358 + 2458848.5 263.0119662916667 3.658415888888889 ... 0.0477 -3.37956 The observer location is defined through the ``location`` keyword, @@ -243,8 +243,6 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | Column Name | Definition | +==================+===============================================+ - | ``target`` | Target name (str) | - +------------------+-----------------------------------------------+ | ``epoch`` | Ephemerides epoch (JD, float) | +------------------+-----------------------------------------------+ | ``RA`` | Target RA at ``ephtype`` (deg, float) | @@ -253,8 +251,6 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | ``delta`` | Distance from observer (au, float) | +------------------+-----------------------------------------------+ - | ``delta_rate`` | Rate in observer distance (km/s, float) | - +------------------+-----------------------------------------------+ | ``V`` | Apparent visual magnitude (mag, float) | +------------------+-----------------------------------------------+ | ``alpha`` | Solar phase angle (deg) | @@ -272,23 +268,23 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | Column Name | Definition | +==================+===============================================+ - | ``target`` | Target name (str) | - +------------------+-----------------------------------------------+ | ``epoch`` | Ephemerides epoch (JD, float) | +------------------+-----------------------------------------------+ + | ``px`` | X position state vector (au, float) | + +------------------+-----------------------------------------------+ + | ``py`` | Y position state vector (au, float) | + +------------------+-----------------------------------------------+ + | ``pz`` | Z position state vector (au, float) | + +------------------+-----------------------------------------------+ | ``delta`` | Distance from observer (au, float) | +------------------+-----------------------------------------------+ - | ``V`` | Apparent visual magnitude (mag, float) | + | ``heldist`` | Target heliocentric distance (au, float) | +------------------+-----------------------------------------------+ | ``alpha`` | Solar phase angle (deg) | +------------------+-----------------------------------------------+ | ``elong`` | Solar elongation angle (deg) | +------------------+-----------------------------------------------+ - | ``x`` | X position state vector (au, float) | - +------------------+-----------------------------------------------+ - | ``y`` | Y position state vector (au, float) | - +------------------+-----------------------------------------------+ - | ``z`` | Z position state vector (au, float) | + | ``V`` | Apparent visual magnitude (mag, float) | +------------------+-----------------------------------------------+ | ``vx`` | X velocity state vector (au/d, float) | +------------------+-----------------------------------------------+ @@ -296,22 +292,6 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | ``vz`` | Z velocity state vector (au/d, float) | +------------------+-----------------------------------------------+ - | ``rv`` | Radial velocity (km/s, float) | - +------------------+-----------------------------------------------+ - | ``heldist`` | Target heliocentric distance (au, float) | - +------------------+-----------------------------------------------+ - | ``x_h`` | X heliocentric position vector (au, float) | - +------------------+-----------------------------------------------+ - | ``y_h`` | Y heliocentric position vector (au, float) | - +------------------+-----------------------------------------------+ - | ``z_h`` | Z heliocentric position vector (au, float) | - +------------------+-----------------------------------------------+ - | ``vx_h`` | X heliocentric vel. vector (au/d, float) | - +------------------+-----------------------------------------------+ - | ``vy_h`` | Y heliocentric vel. vector (au/d, float) | - +------------------+-----------------------------------------------+ - | ``vz_h`` | Z heliocentric vel. vector (au/d, float) | - +------------------+-----------------------------------------------+ 3. Local coordinates: @@ -319,10 +299,10 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | Column Name | Definition | +==================+===============================================+ - | ``target`` | Target name (str) | - +------------------+-----------------------------------------------+ | ``epoch`` | Ephemerides epoch (JD, float) | +------------------+-----------------------------------------------+ + | ``siderealtime`` | Local sidereal time (h min s, float) | + +------------------+-----------------------------------------------+ | ``AZ`` | Target azimuth (deg, float) | +------------------+-----------------------------------------------+ | ``EL`` | Target elevation (deg, float) | @@ -335,17 +315,21 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | ``elong`` | Solar elongation angle (deg) | +------------------+-----------------------------------------------+ + | ``refrac`` | Refraction (arcsec) | + +------------------+-----------------------------------------------+ 4. Hour angle coordinates: +------------------+-----------------------------------------------+ | Column Name | Definition | +==================+===============================================+ - | ``target`` | Target name (str) | - +------------------+-----------------------------------------------+ | ``epoch`` | Ephemerides epoch (JD, float) | +------------------+-----------------------------------------------+ - | ``DEC`` | Target declination at ``ephtype`` (deg) | + | ``siderealtime`` | Local sidereal time (h min s, float) | + +------------------+-----------------------------------------------+ + | ``hourangle`` | Target hour angle (deg, float) | + +------------------+-----------------------------------------------+ + | ``dec`` | Target declination at ``ephtype`` (deg) | +------------------+-----------------------------------------------+ | ``delta`` | Distance from observer (au, float) | +------------------+-----------------------------------------------+ @@ -355,23 +339,23 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | ``elong`` | Solar elongation angle (deg) | +------------------+-----------------------------------------------+ - | ``hourangle`` | Target hour angle (deg, float) | + | ``airmass`` | Target airmass (float) | +------------------+-----------------------------------------------+ -5. dedicated to observations: +5. Dedicated to observations: +------------------+-----------------------------------------------+ | Column Name | Definition | +==================+===============================================+ - | ``target`` | Target name (str) | - +------------------+-----------------------------------------------+ | ``epoch`` | Ephemerides epoch (JD, float) | +------------------+-----------------------------------------------+ - | ``DEC`` | Target declination at ``ephtype`` (deg) | + | ``siderealtime`` | Local sidereal time (h min s, float) | +------------------+-----------------------------------------------+ - | ``RAJ2000`` | Target RA at J2000 (deg, float) | + | ``RA`` | Target RA at ``ephtype`` (deg, float) | +------------------+-----------------------------------------------+ - | ``DECJ2000`` | Target declination at J2000 (deg, float) | + | ``DEC`` | Target declination at ``ephtype`` (deg, float)| + +------------------+-----------------------------------------------+ + | ``hourangle`` | Target hour angle (deg, float) | +------------------+-----------------------------------------------+ | ``AZ`` | Target azimuth (deg, float) | +------------------+-----------------------------------------------+ @@ -379,70 +363,19 @@ to be provided to the keyword ``coordtype`` to use these sets) : +------------------+-----------------------------------------------+ | ``delta`` | Distance from observer (au, float) | +------------------+-----------------------------------------------+ - | ``delta_rate`` | Rate in observer distance (km/s, float) | - +------------------+-----------------------------------------------+ | ``V`` | Apparent visual magnitude (mag, float) | +------------------+-----------------------------------------------+ | ``alpha`` | Solar phase angle (deg) | +------------------+-----------------------------------------------+ | ``elong`` | Solar elongation angle (deg) | +------------------+-----------------------------------------------+ - | ``RAcosD_rate`` | Rate of motion in RA * cos(DEC) (arcsec/min, | - | | float) | - +------------------+-----------------------------------------------+ - | ``DEC_rate`` | Rate of motion in DEC (arcsec/min, float) | - +------------------+-----------------------------------------------+ - | ``heldist`` | Target heliocentric distance (au, float) | - +------------------+-----------------------------------------------+ - | ``hourangle`` | Target hour angle (deg, float) | - +------------------+-----------------------------------------------+ - | ``siderealtime`` | Local sidereal time (hr, float) | - +------------------+-----------------------------------------------+ - | ``refraction`` | Atmospheric refraction (arcsec, float) | - +------------------+-----------------------------------------------+ | ``airmass`` | Target airmass (float) | +------------------+-----------------------------------------------+ - | ``posunc`` | Positional uncertainty (arcsec, float) | - +------------------+-----------------------------------------------+ - -6. dedicated to AO observations: - - +------------------+-----------------------------------------------+ - | Column Name | Definition | - +==================+===============================================+ - | ``target`` | Target name (str) | - +------------------+-----------------------------------------------+ - | ``epoch`` | Ephemerides epoch (JD, float) | - +------------------+-----------------------------------------------+ - | ``RAJ2000`` | Target RA at J2000 (deg, float) | - +------------------+-----------------------------------------------+ - | ``DECJ2000`` | Target declination at J2000 (deg, float) | - +------------------+-----------------------------------------------+ - | ``delta`` | Distance from observer (au, float) | - +------------------+-----------------------------------------------+ - | ``delta_rate`` | Rate in observer distance (km/s, float) | - +------------------+-----------------------------------------------+ - | ``V`` | Apparent visual magnitude (mag, float) | - +------------------+-----------------------------------------------+ - | ``alpha`` | Solar phase angle (deg) | - +------------------+-----------------------------------------------+ - | ``elong`` | Solar elongation angle (deg) | - +------------------+-----------------------------------------------+ | ``RAcosD_rate`` | Rate of motion in RA * cos(DEC) (arcsec/min, | | | float) | +------------------+-----------------------------------------------+ | ``DEC_rate`` | Rate of motion in DEC (arcsec/min, float) | +------------------+-----------------------------------------------+ - | ``heldist`` | Target heliocentric distance (au, float) | - +------------------+-----------------------------------------------+ - | ``siderealtime`` | Local sidereal time (hr, float) | - +------------------+-----------------------------------------------+ - | ``refraction`` | Atmospheric refraction (arcsec, float) | - +------------------+-----------------------------------------------+ - | ``airmass`` | Target airmass (float) | - +------------------+-----------------------------------------------+ - | ``posunc`` | Positional uncertainty (arcsec, float) | - +------------------+-----------------------------------------------+ Other parameters @@ -462,6 +395,8 @@ results: * ``radial_velocity``: provides additional information on target's radial velocity +See the `Miridae documentation +`_ for details. Acknowledgements @@ -485,7 +420,7 @@ Please consider the following notes from IMCCE: acknowledgment would be appreciated: "*This research has made use of IMCCE's Miriade VO tool*" -The development of this submodule is funded through NASA PDART Grant +The development of this submodule was funded through NASA PDART Grant No. 80NSSC18K0987 to the `sbpy project `_.