Merge 3233385 into eb846fa

NASA-Planetary-Science · Nov 28, 2018 · 27363d3 · 27363d3
2 parents eb846fa + 3233385
commit 27363d3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/sbpy/data/__init__.py b/sbpy/data/__init__.py
@@ -13,23 +13,26 @@ class Conf():
     # alternative field names for DataClass
     # append field description as final item in the list (for documentation)
     fieldnames = [
-        ['targetname', 'id', 'Target Identifier'],
+        ['targetname', 'id', 'Object', 'Target Identifier'],
 
         # orbital elements
         ['i', 'inc', 'incl', 'Inclination'],
-        ['epoch', 'datetime_jd', 'Date', 'date', 'Epoch'],
+        ['epoch', 'datetime_jd', 'JD', 'Date', 'date', 'Epoch'],
         ['Omega', 'longnode', 'Longitude of the Ascending Node'],
         ['w', 'argper', 'Argument of the Periapsis'],
 
         # ephemerides
-        ['r', 'r_hel', 'heldist', 'Heliocentric Distance'],
+        ['r', 'rh', 'r_hel', 'heldist', 'Heliocentric Distance'],
         ['delta', 'Delta', 'obsdist', 'Distance to the Observer'],
         ['ra', 'RA', 'Right Ascension'],
         ['dec', 'DEC', 'Dec', 'Declination'],
         ['ra_rate', 'RA_rate', 'ra_rates', 'RA_rates', 'dRA',
          'dra', 'RA Rate'],
+        ['dra cos(dec)', 'dRA cos(Dec)', 'RA*cos(Dec) Rate'],
         ['dec_rate', 'DEC_rate', 'Dec_rate', 'dec_rates', 'DEC_rates',
          'Dec_rates', 'dDec', 'dDEC', 'ddec', 'Dec Rate'],
+        ['mu', 'Proper motion', 'Proper Motion'],
+        ['Direction', 'Proper Motion Direction'],
         ['alpha', 'phaseangle', 'Phase', 'Solar Phase Angle'],
         ['elong', 'solarelong', 'solarelongation', 'elongation',
          'Elongation', 'Solar Elongation'],
@@ -38,8 +41,9 @@ class Conf():
          'helecllon', 'Heliocentric Ecliptic Longitude'],
         ['hlat', 'EclLat', 'ecllat', 'HelEclLat', 'helecllat',
          'Heliocentric Ecliptic Latitude'],
-        ['el', 'EL', 'elevation', 'alt',
-         'altitude', 'Elevation'],
+        ['el', 'EL', 'elevation', 'alt', 'altitude', 'Altitude',
+         'Elevation'],
+        ['az', 'AZ', 'azimuth', 'Azimuth'],
         ['lunar_elong', 'elong_moon', 'elongation_moon',
          'lunar_elongation', 'lunarelong', 'Lunar Elongation'],
         ['vx', 'dx', 'dx/dt', 'x Velocity Component'],