Better column normalization.

Remove ability to run module via __main__ to avoid package import warning.

Author: mkelley

docs/sbpy/data/ephem.rst

@@ -325,7 +325,10 @@ For example to get the ephemeris of comet 2P/Encke from the Minor Planet Center
 over the next month::
 
     $ sbpy-ephem mpc 2P
-            Date               RA         Dec       r   Delta Phase Elongation  V   Proper motion Direction
+    # requested target: 2P
+    # returned target: 2P
+    # location: 500
+            date               RA         Dec       rh  delta phase solarelong  V   Proper motion Direction
                                 deg         deg       AU    AU   deg     deg     mag    arcsec / h     deg   
     ----------------------- ----------- ----------- ----- ----- ----- ---------- ---- ------------- ---------
     2024-06-27 00:00:00.000 22:46:17.90 -11:05:59.0 3.079 2.485  17.2      116.7 20.8         18.25     249.6
@@ -359,5 +362,3 @@ over the next month::
     2024-07-25 00:00:00.000 22:23:58.60 -13:03:20.0 3.245 2.331   9.2      149.1 21.0         42.17     251.1
     2024-07-26 00:00:00.000 22:22:52.60 -13:08:49.0  3.25 2.329   8.9      150.3 21.0         42.77     251.2
     2024-07-27 00:00:00.000 22:21:45.60 -13:14:21.0 3.256 2.327   8.5      151.6 21.0         43.34     251.3
-
-Alternatively, the script may be run via ``python3 -m sbpy.data.ephem``.

sbpy/data/__init__.py

@@ -38,7 +38,7 @@ class Conf():
     fieldnames_info = [
         # General
         {'description': 'Target Identifier',
-         'fieldnames': ['targetname', 'id', 'Object'],
+         'fieldnames': ['targetname', 'Targetname', 'id', 'Object', 'object', 'target', 'Target'],
          'provenance': ['orbit', 'ephem', 'obs', 'phys'],
          'dimension': None},
         {'description': 'Target Designation',

sbpy/data/ephem.py

@@ -20,7 +20,7 @@
 import os
 import argparse
 from warnings import warn
-from typing import Union
+from typing import List, Union
 
 import numpy as np
 from numpy import ndarray, hstack, iterable
@@ -484,12 +484,12 @@ def from_mpc(cls, targetids, epochs=None, location='500', ra_format=None,
 
     @classmethod
     @requires("astroquery")
-    @cite({'data source': 'http://vo.imcce.fr/webservices/miriade/',
+    @cite({'data source': 'https://vo.imcce.fr/webservices/miriade/',
            'software: astroquery': '2019AJ....157...98G'})
     def from_miriade(cls, targetids, objtype='asteroid',
                      epochs=None, location='500', **kwargs):
         """Load target ephemerides from
-        `IMCCE Miriade <http://vo.imcce.fr/webservices/miriade/>`_ using
+        `IMCCE Miriade <https://vo.imcce.fr/webservices/miriade/>`_ using
         `astroquery.imcce.MiriadeClass.get_ephemerides`
 
         Parameters
@@ -984,14 +984,8 @@ def main():
             epochs=epochs,
             location=args.location,
         )
-
-        # simplify output
-        for k in ["Targetname"]:
-            del eph.table[k]
     elif args.service == "horizons":
-        epochs["step"] = (
-            int(args.step) if args.step.unit == u.dimensionless_unscaled else args.step
-        )
+        epochs["step"] = args.step
 
         # comet specific options: always avoid multiple fragment matches, always
         # return closest apparition
@@ -1020,8 +1014,9 @@ def main():
         eph["epoch"].format = "iso"
         eph["ra"] = eph["ra"].unmasked
         eph["dec"] = eph["dec"].unmasked
-        for k in ["M1", "k1", "solar_presence", "lunar_presence", "targetname"]:
-            del eph.table[k]
+        for k in ["M1", "k1", "solar_presence", "lunar_presence"]:
+            if k in eph.table.colnames:
+                del eph.table[k]
     elif args.service == "miriade":
         if args.step.unit == u.dimensionless_unscaled:
             epochs["number"] = int(args.step)
@@ -1038,8 +1033,7 @@ def main():
 
         # simplify output
         eph["epoch"].format = "iso"
-        for k in ["target"]:
-            del eph.table[k]
+
         for k in eph.field_names:
             if hasattr(eph[k], "unmasked"):
                 eph[k] = eph[k].unmasked
@@ -1057,28 +1051,40 @@ def main():
         eph["ra"].info.format = lambda x: x.to_string()
         eph["dec"].info.format = lambda x: x.to_string()
 
-    # unified output order for most common columns
-    fields = eph.field_names
-    for k in eph._translate_columns(
-        [
-            "RA*cos(Dec)_rate",
-            "DEC_rate",
-            "elong",
-            "phase",
-            "delta",
-            "rh",
-            "dec",
-            "ra",
-            "epoch",
-        ],
-        ignore_missing=True,
-    ):
+    # normalize output for most common columns
+    first_fields: List[str] = [
+        "target",
+        "date",
+        "RA",
+        "Dec",
+        "rh",
+        "delta",
+        "phase",
+        "solarelong",
+        "DEC_rate",
+        "RA*cos(Dec)_rate",
+    ]
+
+    k: str
+    translated: str
+    for k in first_fields:
+        if k not in eph:
+            continue
+        translated = eph._translate_columns(k)[0]
+        eph.table.rename_column(translated, k)
+
+    # re-order
+    fields: List[str] = eph.field_names
+    for k in reversed(first_fields):
         if k not in fields:
             continue
         fields.insert(0, fields.pop(fields.index(k)))
 
-    eph[fields].table.pprint_all()
-
+    eph = eph[fields]
+    target = eph["target"][0]
+    del eph.table["target"]
 
-if __name__ == "__main__":
-    main()
+    print(f"# requested target: {args.target}")
+    print(f"# returned target: {target}")
+    print(f"# location: {args.location}")
+    eph.table.pprint_all()