Merge pull request #174 from pllim/scalar-vegamag

BUG: Fix scalar unit conversion for VEGAMAG
spacetelescope · Mar 23, 2019 · f0ef22d · f0ef22d
1 parent 0decd4c
commit f0ef22d
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 30 deletions.
diff --git a/synphot/tests/test_spectrum.py b/synphot/tests/test_spectrum.py
@@ -93,6 +93,12 @@ def test_flux_conversion_vega(in_q, out_u, ans):
     np.testing.assert_allclose(result.value, ans.value, rtol=1e-2)
     assert result.unit == ans.unit
 
+    # Scalar
+    i = 0
+    result = units.convert_flux(_wave[i], in_q[i], out_u, vegaspec=_vspec)
+    np.testing.assert_allclose(result.value, ans[i].value, rtol=1e-2)
+    assert result.unit == ans[i].unit
+
 
 @pytest.mark.remote_data
 @pytest.mark.skipif('not HAS_SCIPY')

diff --git a/synphot/tests/test_units.py b/synphot/tests/test_units.py
@@ -116,40 +116,47 @@ def test_wave_conversion(in_q, out_u, ans):
 
 
 @pytest.mark.parametrize(
-    ('in_q', 'out_u', 'ans'),
-    [(_flux_photlam.value, units.PHOTLAM, _flux_photlam),
-     (_flux_photlam, u.count, _flux_count),
-     (_flux_count, units.PHOTLAM, _flux_photlam),
-     (_flux_photlam, units.OBMAG, _flux_obmag),
-     (_flux_obmag, units.PHOTLAM, _flux_photlam),
-     (_flux_count, units.OBMAG, _flux_obmag),
-     (_flux_obmag, u.count, _flux_count),
-     (_flux_photlam, units.FLAM, _flux_flam),
-     (_flux_flam, units.PHOTLAM, _flux_photlam),
-     (_flux_photlam, u.STmag, _flux_stmag),
-     (_flux_stmag, units.PHOTLAM, _flux_photlam),
-     (_flux_flam, u.STmag, _flux_stmag),
-     (_flux_stmag, units.FLAM, _flux_flam),
-     (_flux_photlam, units.PHOTNU, _flux_photnu),
-     (_flux_photnu, units.PHOTLAM, _flux_photlam),
-     (_flux_photlam, units.FNU, _flux_fnu),
-     (_flux_fnu, units.PHOTLAM, _flux_photlam),
-     (_flux_photlam, u.ABmag, _flux_abmag),
-     (_flux_abmag, units.PHOTLAM, _flux_photlam),
-     (_flux_fnu, u.ABmag, _flux_abmag),
-     (_flux_abmag, units.FNU, _flux_fnu),
-     (_flux_fnu, u.STmag, _flux_stmag),
-     (_flux_fnu, u.mJy, _flux_jy.to(u.mJy)),
-     (_flux_photlam, u.Jy, _flux_jy),
-     (_flux_jy, units.PHOTLAM, _flux_photlam),
-     (_flux_flam, u.Jy, _flux_jy),
-     (np.zeros(3) * units.FNU, units.FLAM, np.zeros(3) * units.FLAM)])
-def test_flux_conversion(in_q, out_u, ans):
+    ('in_q', 'out_u', 'ans', 'support_scalar'),
+    [(_flux_photlam.value, units.PHOTLAM, _flux_photlam, True),
+     (_flux_photlam, u.count, _flux_count, False),
+     (_flux_count, units.PHOTLAM, _flux_photlam, False),
+     (_flux_photlam, units.OBMAG, _flux_obmag, False),
+     (_flux_obmag, units.PHOTLAM, _flux_photlam, False),
+     (_flux_count, units.OBMAG, _flux_obmag, False),
+     (_flux_obmag, u.count, _flux_count, False),
+     (_flux_photlam, units.FLAM, _flux_flam, True),
+     (_flux_flam, units.PHOTLAM, _flux_photlam, True),
+     (_flux_photlam, u.STmag, _flux_stmag, True),
+     (_flux_stmag, units.PHOTLAM, _flux_photlam, True),
+     (_flux_flam, u.STmag, _flux_stmag, True),
+     (_flux_stmag, units.FLAM, _flux_flam, True),
+     (_flux_photlam, units.PHOTNU, _flux_photnu, True),
+     (_flux_photnu, units.PHOTLAM, _flux_photlam, True),
+     (_flux_photlam, units.FNU, _flux_fnu, True),
+     (_flux_fnu, units.PHOTLAM, _flux_photlam, True),
+     (_flux_photlam, u.ABmag, _flux_abmag, True),
+     (_flux_abmag, units.PHOTLAM, _flux_photlam, True),
+     (_flux_fnu, u.ABmag, _flux_abmag, True),
+     (_flux_abmag, units.FNU, _flux_fnu, True),
+     (_flux_fnu, u.STmag, _flux_stmag, True),
+     (_flux_fnu, u.mJy, _flux_jy.to(u.mJy), True),
+     (_flux_photlam, u.Jy, _flux_jy, True),
+     (_flux_jy, units.PHOTLAM, _flux_photlam, True),
+     (_flux_flam, u.Jy, _flux_jy, True),
+     (np.zeros(3) * units.FNU, units.FLAM, np.zeros(3) * units.FLAM, True)])
+def test_flux_conversion(in_q, out_u, ans, support_scalar):
     """Test flux conversion, except VEGAMAG."""
     result = units.convert_flux(_wave, in_q, out_u, area=_area)
     np.testing.assert_allclose(result.value, ans.value, rtol=1e-6)
     assert result.unit == ans.unit
 
+    # Scalar should work, except for count and OBMAG, which need bin centers.
+    if support_scalar:
+        i = 0
+        result = units.convert_flux(_wave[i], in_q[i], out_u, area=_area)
+        np.testing.assert_allclose(result.value, ans[i].value, rtol=1e-6)
+        assert result.unit == ans[i].unit
+
 
 def test_flux_conversion_exceptions():
     """Test for appropriate exceptions."""

diff --git a/synphot/units.py b/synphot/units.py
@@ -89,7 +89,10 @@ def converter(x):
         val = -2.5 * np.log10(x / vega_photlam)
         result = np.zeros(val.shape, dtype=np.float64) - 99
         mask = np.isfinite(val)
-        result[mask] = val[mask]
+        if result.ndim > 0:
+            result[mask] = val[mask]
+        elif mask:
+            result = np.asarray(val)
         return result
 
     def iconverter(x):