Merge pull request #2136 from keflavich/issue2135

splatalogue.utils minimize bugfix

Author: bsipocz

CHANGES.rst

@@ -8,6 +8,8 @@ New Tools and Services
 Service fixes and enhancements
 ------------------------------
 
+- Splatalogue table merging can now handle unmasked columns [#2136]
+
 
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------

astroquery/splatalogue/tests/test_utils.py

@@ -2,6 +2,7 @@
 from ... import splatalogue
 from astropy import units as u
 import numpy as np
+import pytest
 from .test_splatalogue import patch_post
 from .. import utils
 
@@ -31,3 +32,18 @@ def test_minimize(patch_post):
     assert np.all(c['Freq'] > 0)
     assert 'Resolved QNs' not in c.colnames
     assert 'QNs' in c.colnames
+
+
+@pytest.mark.remote_data
+def test_minimize_issue2135():
+    rslt = splatalogue.Splatalogue.query_lines(100*u.GHz, 200*u.GHz,
+                                               chemical_name=' SiO ',
+                                               energy_max=1840,
+                                               energy_type='eu_k',
+                                               line_lists=['JPL', 'CDMS', 'SLAIM'],
+                                               show_upper_degeneracy=True)
+
+    minimized = utils.minimize_table(rslt)
+
+    theomask = rslt['Freq-GHz(rest frame,redshifted)'].mask
+    np.testing.assert_allclose(minimized['Freq'][theomask], rslt['Meas Freq-GHz(rest frame,redshifted)'][theomask])

astroquery/splatalogue/utils.py

@@ -56,11 +56,17 @@ def merge_frequencies(table, prefer='measured',
 
     if prefer == 'measured':
         Freq = np.copy(table[theor_kwd]).astype('float')
-        measmask = np.logical_not(table[meas_kwd].mask)
+        if hasattr(table[meas_kwd], 'mask'):
+            measmask = np.logical_not(table[meas_kwd].mask)
+        else:
+            measmask = slice(None)  # equivalent to [:] - all data are good
         Freq[measmask] = table[meas_kwd][measmask].astype('float')
     elif prefer == 'theoretical':
         Freq = np.copy(table[meas_kwd]).astype('float')
-        theomask = np.logical_not(table[theor_kwd].mask)
+        if hasattr(table[theor_kwd], 'mask'):
+            theomask = np.logical_not(table[theor_kwd].mask)
+        else:
+            theomask = slice(None)  # equivalent to [:] - all data are good
         Freq[theomask] = table[theor_kwd][theomask].astype('float')
     else:
         raise ValueError('prefer must be one of "measured" or "theoretical"')