Merge pull request #2377 from jianyangli/fix_sbdb_import_unit_error

Bugfix: SBDB query return unit with exponentials

Author: ceb8

CHANGES.rst

@@ -18,6 +18,11 @@ casda
 
 - Add the ability to produce 2D and 3D cutouts from ASKAP images and cubes. [#2366]
 
+jplsbdb
+^^^^^^^
+
+- Fix a bug for jplsdbd query when the returned physical quantity contains
+  a unit with exponential. [#2377]
 
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------

astroquery/jplsbdb/core.py

@@ -337,8 +337,13 @@ def _process_data_element(self, val):
             # change units where necessary
             if q['units'] in conf.data_unit_replace.keys():
                 q['units'] = conf.data_unit_replace[q['units']]
+            # change exponential symbol in unit string from '^' to '**'
+            if (q['units'] is not None) and ('^' in q['units']):
+                q['units'] = q['units'].replace('^', '**')
             try:
                 unit = u.Unit(q['units'])
+            except ValueError:
+                unit = u.Unit(q['units'], format='ogip')
             except TypeError:
                 unit = 1
 

astroquery/jplsbdb/tests/test_jplsbdb_remote.py

@@ -44,3 +44,6 @@ def test_units(self):
         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
+
+        sbdb = SBDB.query('Bennu', id_type='search', phys=True)
+        assert sbdb['phys_par']['I'].unit == u.Unit('J / (K m2 s(1/2))')