tcoor=6 is not a valid option any more

Author: bsipocz

astroquery/imcce/core.py

@@ -92,7 +92,7 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid',
             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``
+            Default: ``1``
 
         timescale : str, optional
             The time scale used in the computation of the ephemerides:
@@ -144,40 +144,38 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid',
         +==================+===============================================+
         | ``target``       | Target name (str, 1, 2, 3, 4, 5, 6 )          |
         +------------------+-----------------------------------------------+
-        | ``epoch``        | Ephemerides epoch (JD, float, 1, 2, 3, 4, 5,  |
-        |                  | 6)                                            |
+        | ``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, 6)         |
+        | ``RAJ2000``      | Target RA at J2000 (deg, float, 5)            |
         +------------------+-----------------------------------------------+
-        | ``DECJ2000``     | Target declination at J2000 (deg, float, 5, 6)|
+        | ``DECJ2000``     | Target declination at J2000 (deg, float, 5)   |
         +------------------+-----------------------------------------------+
         | ``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)                                      |
+        |                  | 4, 5)                                         |
         +------------------+-----------------------------------------------+
-        | ``delta_rate``   | Rate in observer distance (km/s, float,       |
-        |                  | 1, 5, 6)                                      |
+        | ``delta_rate``   | Rate in observer distance (km/s, float, 1, 5) |
         +------------------+-----------------------------------------------+
         | ``V``            | Apparent visual magnitude (mag, float, 1, 2,  |
-        |                  | 3, 4, 5, 6)                                   |
+        |                  | 3, 4, 5)                                      |
         +------------------+-----------------------------------------------+
-        | ``alpha``        | Solar phase angle (deg, 1, 2, 3, 4, 5, 6)     |
+        | ``alpha``        | Solar phase angle (deg, 1, 2, 3, 4, 5)        |
         +------------------+-----------------------------------------------+
-        | ``elong``        | Solar elongation angle (deg, 1, 2, 3, 4, 5, 6)|
+        | ``elong``        | Solar elongation angle (deg, 1, 2, 3, 4, 5)   |
         +------------------+-----------------------------------------------+
         | ``RAcosD_rate``  | Rate of motion in RA * cos(DEC) (arcsec/min,  |
-        |                  | float, 1, 5, 6)                               |
+        |                  | float, 1, 5)                                  |
         +------------------+-----------------------------------------------+
         | ``DEC_rate``     | Rate of motion in DEC (arcsec/min, float, 1,  |
-        |                  | 5, 6)                                         |
+        |                  | 5)                                            |
         +------------------+-----------------------------------------------+
         | ``x``            | X position state vector (au, float, 2)        |
         +------------------+-----------------------------------------------+
@@ -193,8 +191,7 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid',
         +------------------+-----------------------------------------------+
         | ``rv``           | Radial velocity (km/s, float, 2)              |
         +------------------+-----------------------------------------------+
-        | ``heldist``      | Target heliocentric distance (au, float, 2,   |
-        |                  | 5, 6)                                         |
+        | ``heldist``      | Target heliocentric distance (au, float, 2, 5)|
         +------------------+-----------------------------------------------+
         | ``x_h``          | X heliocentric position vector (au, float, 2) |
         +------------------+-----------------------------------------------+
@@ -210,13 +207,13 @@ def get_ephemerides_async(self, targetname, *, objtype='asteroid',
         +------------------+-----------------------------------------------+
         | ``hourangle``    | Target hour angle (deg, float, 4, 5)          |
         +------------------+-----------------------------------------------+
-        | ``siderealtime`` | Local sidereal time (hr, float, 5, 6)         |
+        | ``siderealtime`` | Local sidereal time (hr, float, 5)            |
         +------------------+-----------------------------------------------+
-        | ``refraction``   | Atmospheric refraction (arcsec, float, 5, 6)  |
+        | ``refraction``   | Atmospheric refraction (arcsec, float, 5)     |
         +------------------+-----------------------------------------------+
-        | ``airmass``      | Target airmass (float, 5, 6)                  |
+        | ``airmass``      | Target airmass (float, 5)                     |
         +------------------+-----------------------------------------------+
-        | ``posunc``       | Positional uncertainty (arcsec, float, 5, 6)  |
+        | ``posunc``       | Positional uncertainty (arcsec, float, 5)     |
         +------------------+-----------------------------------------------+
 
 

astroquery/imcce/tests/data/3552_coordtype6.dat

@@ -99,19 +99,6 @@ def test_observation_coordinates(patch_request):
         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)
-    for i in range(len(cols)):
-        assert cols[i] in eph.columns
-        assert eph[cols[i]].unit == units[i]
-
-
 def test_get_raw_response(patch_request):
     raw_eph = Miriade.get_ephemerides(
         '3552', coordtype=1, get_raw_response=True)