Merge pull request #2218 from bsipocz/nasa_exoplanet_archive_fix_units

Add more units to nasa_exoplanet_archive unit mapper

Author: bsipocz

astroquery/ipac/nexsci/nasa_exoplanet_archive/core.py

@@ -44,24 +44,31 @@
     "Fearth": u.L_sun / (4 * np.pi * u.au**2),
     "M_E": u.M_earth,
     "Earth Mass": u.M_earth,
+    "Mearth": u.M_earth,
     "M_J": u.M_jupiter,
+    "Mjupiter": u.M_jupiter,
     "Jupiter Mass": u.M_jupiter,
     "R_Earth": u.R_earth,  # Add u.R_jupiter
+    "Rearth": u.R_earth,
     "Earth Radius": u.R_earth,
     "Jupiter Radius": u.R_jupiter,
+    "Rjupiter": u.R_jupiter,
+    "Searth": u.L_sun / (4 * np.pi * u.au**2),
     "R_Sun": u.R_sun,
     "Rstar": u.R_sun,
     "a_perp": u.au,
     "arc-sec/year": u.arcsec / u.yr,
     "cm/s**2": u.cm / u.s ** 2,
     "g/cm**3": u.g / u.cm ** 3,
+    "day": u.day,
     "days": u.day,
     "degrees": u.deg,
     "dexincgs": u.dex(u.cm / u.s ** 2),
     "hours": u.hr,
     "hrs": u.hr,
     "kelvin": u.K,
     "logLsun": u.dex(u.L_sun),
+    "log(Lsun)": u.dex(u.L_sun),
     "log(Solar)": u.dex(u.L_sun),
     "mags": u.mag,
     "microas": u.uas,
@@ -76,6 +83,7 @@
     "solarradius": u.R_sun,
     "Solar Radius": u.R_sun,
     "log10(cm/s**2)": u.dex(u.cm / u.s ** 2),
+    "log(cm/s**2)": u.dex(u.cm / u.s ** 2),
     "dex": u.dex(None),
     "sexagesimal": None
 }
@@ -521,7 +529,7 @@ def _fix_units(self, data):
                     unit = u.mag
 
                 else:  # pragma: nocover
-                    warnings.warn("Unrecognized unit: '{0}'".format(unit), AstropyWarning)
+                    warnings.warn(f"Unrecognized unit: '{unit}' for column {col}.", AstropyWarning)
 
             # Unmask since astropy doesn't like masked values in columns with units
             try:

docs/index.rst

@@ -228,7 +228,7 @@ These others are functional, but do not follow a common & consistent API:
   jplhorizons/jplhorizons.rst
   jplsbdb/jplsbdb.rst
   lamda/lamda.rst
-  ipac/nasa_exoplanet_archive/nasa_exoplanet_archive.rst
+  ipac/nexsci/nasa_exoplanet_archive.rst
   oac/oac.rst
   ogle/ogle.rst
   open_exoplanet_catalogue/open_exoplanet_catalogue.rst
@@ -265,7 +265,7 @@ for each source)
   ipac/irsa/irsa.rst
   ipac/irsa/irsa_dust/irsa_dust.rst
   mast/mast.rst
-  ipac/nasa_exoplanet_archive/nasa_exoplanet_archive.rst
+  ipac/nexsci/nasa_exoplanet_archive.rst
   ipac/ned/ned.rst
   ogle/ogle.rst
   open_exoplanet_catalogue/open_exoplanet_catalogue.rst

docs/ipac/nasa_exoplanet_archive/nasa_exoplanet_archive.rst renamed to docs/ipac/nexsci/nasa_exoplanet_archive.rst

@@ -75,7 +75,7 @@ For example, a full table can be queried as follows:
     <QTable masked=True length=9564>
      kepid   kepoi_name kepler_name  ... koi_fittype koi_score      sky_coord
                                      ...                             deg,deg
-     int64      str9       str15     ...     str7     float64         object
+     int64      str9       str14     ...     str7     float64         object
     -------- ---------- ------------ ... ----------- --------- -------------------
     10797460  K00752.01 Kepler-227 b ...     LS+MCMC       1.0 291.93423,48.141651
     10797460  K00752.02 Kepler-227 c ...     LS+MCMC     0.969 291.93423,48.141651
@@ -99,33 +99,31 @@ In this section, we demonstrate
 
     >>> from astroquery.ipac.nexsci.nasa_exoplanet_archive import NasaExoplanetArchive
     >>> NasaExoplanetArchive.query_criteria(table="pscomppars", select="count(*)",
-    ...                                     where="disc_facility like '%TESS%'")
+    ...                                     where="disc_facility like '%TESS%'")  # doctest: +IGNORE_OUTPUT
     <QTable masked=True length=1>
     count(*)
      int32
     --------
          131
 
 
-2. The list of confirmed planets discovered by TESS and their host star coordinates:
+2. The list of 10 confirmed planets discovered by TESS and their host star coordinates:
 
 .. doctest-remote-data::
 
     >>> from astroquery.ipac.nexsci.nasa_exoplanet_archive import NasaExoplanetArchive
-    >>> NasaExoplanetArchive.query_criteria(table="pscomppars", select="pl_name,ra,dec",
+    >>> NasaExoplanetArchive.query_criteria(table="pscomppars", select="top 10 pl_name,ra,dec",
     ...                                     where="disc_facility like '%TESS%'")
-    <QTable masked=True length=131>
+    <QTable masked=True length=10>
        pl_name         ra         dec            sky_coord
                       deg         deg             deg,deg
-        str15       float64     float64            object
+        str13       float64     float64            object
     ------------- ----------- ----------- -----------------------
     WD 1856+534 b  284.415675  53.5090244   284.415675,53.5090244
+       TOI-1201 b  42.2476999 -14.5372835  42.2476999,-14.5372835
       HD 213885 b 338.9837166  -59.864829  338.9837166,-59.864829
       HD 219666 b 349.5592665 -56.9039857 349.5592665,-56.9039857
               ...         ...         ...                     ...
-        TOI-257 b  47.5172608 -50.8322632  47.5172608,-50.8322632
-        HD 5278 b  12.5467785 -83.7437671  12.5467785,-83.7437671
-       LHS 1478 b  44.3388743  76.5514045   44.3388743,76.5514045
 
 
 3. The list of confirmed planets discovered using microlensing that have data available in the archive:
@@ -134,7 +132,7 @@ In this section, we demonstrate
 
     >>> from astroquery.ipac.nexsci.nasa_exoplanet_archive import NasaExoplanetArchive
     >>> NasaExoplanetArchive.query_criteria(
-    ...     table="pscomppars", where="discoverymethod like 'Microlensing'")
+    ...     table="pscomppars", where="discoverymethod like 'Microlensing'")  # doctest: +IGNORE_OUTPUT
     <QTable masked=True length=108>
            pl_name        pl_letter ...    htm20           sky_coord
                                     ...                     deg,deg
@@ -158,7 +156,7 @@ In this section, we demonstrate
     >>> from astroquery.ipac.nexsci.nasa_exoplanet_archive import NasaExoplanetArchive
     >>> NasaExoplanetArchive.query_criteria(
     ...     table="pscomppars", where="hostname like 'Kepler%'", order="hostname")
-    <QTable masked=True length=2369>
+    <QTable masked=True length=2370>
        pl_name    pl_letter   hostname  ...    htm20          sky_coord
                                         ...                    deg,deg
         str14        str1      str12    ...    int32            object