Merge pull request #2011 from mkelley/jplsbdb-quantities

jplsbdb: Use Quantity for physical values.

Author: C. E. Brasseur

CHANGES.rst

@@ -30,6 +30,10 @@ irsa
 
 - Used more specific exceptions in IRSA. [#1854]
 
+jplsbdb
+^^^^^^^
+
+- Returns astropy quantities, rather than scaled units. [#2011]
 
 mast
 ^^^^

astroquery/jplsbdb/core.py

@@ -317,9 +317,10 @@ def _process_data(self, src):
 
             # use leaf scalars (and apply units, where applicable)
             else:
-                res[key] = val
                 if key in conf.field_unit.keys() and val is not None:
-                    res[key] *= u.Unit(conf.field_unit[key])
+                    res[key] = float(val) * u.Unit(conf.field_unit[key])
+                else:
+                    res[key] = val
 
         return res
 
@@ -344,11 +345,11 @@ def _process_data_element(self, val):
             # try to combine value with units provided
             try:
                 if q['value'] is not None:
-                    eldict[q['name']] = (q['value'] * unit)
+                    eldict[q['name']] = (float(q['value']) * unit)
                 else:
                     eldict[q['name']] = q['value']
                 if q['sigma'] is not None:
-                    eldict[q['name']+'_sig'] = (q['sigma'] *
+                    eldict[q['name']+'_sig'] = (float(q['sigma']) *
                                                 unit)
                 else:
                     eldict[q['name']+'_sig'] = q['sigma']

astroquery/jplsbdb/tests/test_jplsbdb.py

@@ -23,11 +23,11 @@
               'Ceres': '| +-- n_del_obs_used: 405'
               }
 
-SEMI_MAJOR = {'1': 2.767046248500289,
-              'Apophis': .9224383019077086,
-              '3200': 1.271196435728355,
-              '67P': 3.46473701803964,
-              'Ceres': 2.767046248500289}
+SEMI_MAJOR = {'1': 2.767046248500289 * u.au,
+              'Apophis': .9224383019077086 * u.au,
+              '3200': 1.271196435728355 * u.au,
+              '67P': 3.46473701803964 * u.au,
+              'Ceres': 2.767046248500289 * u.au}
 
 
 def data_path(filename):
@@ -70,7 +70,7 @@ def test_objects_numerically(patch_request):
                           virtual_impactor=True,
                           discovery=True, radar=True)
 
-        assert_quantity_allclose(sbdb['orbit']['elements']['a'].scale,
+        assert_quantity_allclose(sbdb['orbit']['elements']['a'],
                                  SEMI_MAJOR[targetname])
 
 
@@ -86,6 +86,23 @@ def test_missing_value(patch_request):
     assert sbdb['orbit']['elements']['per'] is None
 
 
+def test_quantities(patch_request):
+    """Make sure query returns quantities.
+
+    Regression test for astroquery #2011.
+
+    """
+
+    sbdb = SBDB.query('Ceres', id_type='search', phys=True,
+                      alternate_id=True, full_precision=True,
+                      covariance='mat', validity=True,
+                      alternate_orbit=True, close_approach=True,
+                      virtual_impactor=True,
+                      discovery=True, radar=True)
+
+    assert isinstance(sbdb['phys_par']['H'], u.Quantity)
+    assert sbdb['phys_par']['H'].unit == u.mag
+
 # def test_objects_against_schema(patch_request):
 #     for targetname in DATA_FILES.keys():
 

astroquery/jplsbdb/tests/test_jplsbdb_remote.py

@@ -40,6 +40,7 @@ def test_units(self):
         sbdb = SBDB.query('Apophis', id_type='search',
                           close_approach=True)
 
-        assert sbdb['orbit']['moid_jup'].bases[0] == u.au
-        assert sbdb['orbit']['model_pars']['A2'].bases == [u.au, u.d]
-        assert sbdb['orbit']['elements']['tp'].bases[0] == u.d
+        assert sbdb['orbit']['moid_jup'].unit.bases[0] == u.au
+        assert sbdb['orbit']['model_pars']['A2'].unit.bases == [u.au, u.d]
+        assert sbdb['orbit']['model_pars']['A2'].unit.is_equivalent(u.au / u.d**2)
+        assert sbdb['orbit']['elements']['tp'].unit.bases[0] == u.d