casa / casa6 / b51086e06c4

Commits

Takeshi Nakazato authored and Ville Suoranta committed b51086e06c4 Merge 21 Feb 2025

Pull request #913: CAS-14401 set image brightness unit according to the unit of MS data column

Merge in CASA/casa6 from CAS-14401 to master

* commit '26fe7533fa5c48d4f094f7af9596d1626b74432b':
  add one more test case: check if task parameter overrides brightness unit
  Add type hint and docstring to test helper function
  Add description on unit search order
  fixed wrong test name
  Add supplementary comment
  CAS-14401 refactoring, type hints, docstrings, and one more test case
  CAS-14401 make sure CORRECTED_DATA column takes priority
  CAS-14401 add unit test to verify brightnessunit
  CAS-14401 add another keyword name to search for brightness unit

casatasks/src/private/task_tsdimaging.py

Modified

-870
+            collapsed.close()
-871
+        except RuntimeError as e:
-872
+            if 'All selected pixels are masked' in str(e):
-873
+                valid_pixels_after = 0
-874
+            else:
-875
+                raise
-876
-877
+    masked_fraction = 100. * (1. - valid_pixels_after / float(valid_pixels[0]))
-878
-879
+    logger.post(f"This amounts to {masked_fraction:5.1f} % "
--
+                  "of the area with nonzero weight.",
-+
+                  "of the area with nonzero weight.",
-881
+                  priority="INFO")
-882
+    logger.post(
-883
+        f"The weight image '{weightimage}' is returned by this task, "
-884
+        "if the user wishes to assess the results in detail.",
-885
+        priority="INFO")
-886
-887
-888
+def get_ms_column_unit(tb, colname):
-889
+    col_unit = ''
-890
+    if colname in tb.colnames():
-891
+        cdkw = tb.getcoldesc(colname)['keywords']
--
+        if 'QuantumUnits' in cdkw:
--
+            u = cdkw['QuantumUnits']
--
+            if isinstance(u, str):
--
+                col_unit = u.strip()
--
+            elif isinstance(u, list):
--
+                col_unit = u[0].strip()
-+
+        for key in ['UNIT', 'QuantumUnits']:
-+
+            if key in cdkw:
-+
+                u = cdkw[key]
-+
+                if isinstance(u, str):
-+
+                    col_unit = u.strip()
-+
+                elif isinstance(u, (list, numpy.ndarray)) and len(u) > 0:
-+
+                    col_unit = u[0].strip()
-+
+            if col_unit:
-+
+                break
-901
+    return col_unit
-902
-903
-904
+def get_brightness_unit_from_ms(msname):
-905
+    image_unit = ''
-906
+    with sdutil.table_manager(msname) as tb:
--
+        image_unit = get_ms_column_unit(tb, 'DATA')
--
+        if image_unit == '':
--
+            image_unit = get_ms_column_unit(tb, 'FLOAT_DATA')
-+
+        for column in ['CORRECTED_DATA', 'FLOAT_DATA', 'DATA']:
-+
+            image_unit = get_ms_column_unit(tb, column)
-+
+            if image_unit:
-+
+                break
-+
-912
+    if image_unit.upper() == 'K':
-913
+        image_unit = 'K'
-914
+    else:
-915
+        image_unit = 'Jy/beam'
-916
-917
+    return image_unit
-918
-919
-920
+@sdutil.sdtask_decorator
-921
+def tsdimaging(

casa6

Commits

Jira Issues

Add shortcut