Fix unit conversion from flux to surface brightness

spacetelescope · May 30, 2024 · 05d2b99 · 05d2b99
1 parent e4fdd5b
commit 05d2b99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/jdaviz/app.py b/jdaviz/app.py
@@ -117,14 +117,14 @@ def to_unit(self, data, cid, values, original_units, target_units):
                     # target_units dictate the conversion to take place.
 
                     if (u.sr in u.Unit(original_units).bases) and \
-                          (u.sr not in u.Unit(target_units).bases):
+                        (u.sr not in u.Unit(target_units).bases):
                         # Surface Brightness -> Flux
                         eqv = [(u.MJy / u.sr,
                                 u.MJy,
                                 lambda x: (x * spec.meta['_pixel_scale_factor']),
                                 lambda x: x)]
                     elif (u.sr not in u.Unit(original_units).bases) and \
-                         (u.sr in u.Unit(target_units).bases):
+                        (u.sr in u.Unit(target_units).bases):
                         # Flux -> Surface Brightness
                         eqv = [(u.MJy,
                                 u.MJy / u.sr,

diff --git a/jdaviz/tests/test_app.py b/jdaviz/tests/test_app.py
@@ -224,14 +224,14 @@ def test_to_unit(cubeviz_helper):
 
     cid = cubeviz_helper.app.data_collection[0].data.find_component_id('flux')
     data = cubeviz_helper.app.data_collection[-1].data
-    values = 1
 
     # Surface brightness to flux
 
+    value = 1
     original_units = u.MJy / u.sr
     target_units = u.MJy
 
-    value = uc.to_unit(cubeviz_helper, data, cid, values, original_units, target_units)
+    value = uc.to_unit(cubeviz_helper, data, cid, value, original_units, target_units)
 
     assert np.allclose(value, 4.7945742429049767e-11)
 
@@ -240,4 +240,6 @@ def test_to_unit(cubeviz_helper):
     original_units = u.MJy
     target_units = u.MJy / u.sr
 
-    value = uc.to_unit(cubeviz_helper, data, cid, values, original_units, target_units)
+    value = uc.to_unit(cubeviz_helper, data, cid, value, original_units, target_units)
+
+    assert np.allclose(value, 1)