xarray-ms 0.4.0a4__tar.gz → 0.4.0a5__tar.gz

{xarray_ms-0.4.0a4 → xarray_ms-0.4.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xarray-ms
-Version: 0.4.0a4
+Version: 0.4.0a5
 Summary: xarray MSv4 views over MSv2 Measurement Sets
 Author-email: Simon Perkins <simon.perkins@gmail.com>
 License-File: LICENSE

{xarray_ms-0.4.0a4 → xarray_ms-0.4.0a5}/doc/source/changelog.rst

@@ -3,8 +3,9 @@
 Changelog
 =========
 
-X.Y.Z (DD-MM-YYYY)
+0.5.3 (11-05-2026)
 ------------------
+* Expand standard msv2 columns supported during reads (:pr:`153`)
 * Handle duplicate antenna name (:pr:`151`)
 * Deprecate python 3.10 support (:pr:`150`)
 * Add python 3.14 to CI testing matrix (:pr:`150`)

{xarray_ms-0.4.0a4 → xarray_ms-0.4.0a5}/doc/source/conf.py

@@ -11,7 +11,7 @@
 project = "xarray-ms"
 copyright = "2024 - 2025 NRF (SARAO) and Rhodes University (RATT) Centre"
 author = "Simon Perkins"
-release = "0.4.0-alpha.4"
+release = "0.4.0-alpha.5"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

{xarray_ms-0.4.0a4 → xarray_ms-0.4.0a5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xarray-ms"
-version = "0.4.0-alpha.4"
+version = "0.4.0-alpha.5"
 description = "xarray MSv4 views over MSv2 Measurement Sets"
 authors = [{name = "Simon Perkins", email = "simon.perkins@gmail.com"}]
 readme = "README.rst"
@@ -55,7 +55,7 @@ extend-select = ["I"]
 # github_url = "https://github.com/<user or organization>/<project>/"
 
 [tool.tbump.version]
-current = "0.4.0-alpha.4"
+current = "0.4.0-alpha.5"
 
 # https://semver.org/#spec-item-9
 regex = '''
@@ -77,11 +77,11 @@ tag_template = "{new_version}"
 # tbump.toml location.
 [[tool.tbump.file]]
 src = "pyproject.toml"
-search = "^(current|version)\\s*=\\s*\"{current_version}\""
+search = 'version = "{current_version}"'
 
 [[tool.tbump.file]]
 src = "doc/source/conf.py"
-search = "^release\\s*=\\s*\"{current_version}\""
+search = 'release = "{current_version}"'
 
 # You can specify a list of commands to
 # run after the files have been patched

{xarray_ms-0.4.0a4 → xarray_ms-0.4.0a5}/tests/test_read.py

@@ -415,6 +415,30 @@ NONSTANDARD_TABLE_DESC = {
     # 'shape': ...,  # Variably shaped
     "valueType": "COMPLEX",
   },
+  "MODEL_DATA": {
+    "_c_order": True,
+    "comment": "MODEL_DATA column",
+    "dataManagerGroup": "StandardStMan",
+    "dataManagerType": "StandardStMan",
+    "keywords": {},
+    "maxlen": 0,
+    "ndim": 2,
+    "option": 0,
+    # 'shape': ...,  # Variably shaped
+    "valueType": "COMPLEX",
+  },
+  "FLOAT_DATA": {
+    "_c_order": True,
+    "comment": "FLOAT_DATA column",
+    "dataManagerGroup": "StandardStMan",
+    "dataManagerType": "StandardStMan",
+    "keywords": {},
+    "maxlen": 0,
+    "ndim": 2,
+    "option": 0,
+    # 'shape': ...,  # Variably shaped
+    "valueType": "FLOAT",
+  },
   "CORRELATED_WEIGHT_SPECTRUM": {
     "_c_order": True,
     "comment": "CORRELATED_WEIGHT_SPECTRUM column",
@@ -432,6 +456,8 @@ NONSTANDARD_TABLE_DESC = {
 
 def _add_non_standard_columns(chunk_desc, data_dict):
   data_dict["CORRELATED_DATA"] = data_dict["DATA"]
+  data_dict["MODEL_DATA"] = data_dict["DATA"]
+  data_dict["FLOAT_DATA"] = (data_dict["DATA"][0], data_dict["DATA"][1].real)
   return data_dict
 
 
@@ -463,3 +489,18 @@ def test_additional_columns(simmed_ms):
         "polarization",
       )
       assert node["CORRELATED_DATA"].equals(node["VISIBILITY"])
+      assert node["FLOAT_DATA"].dims == (
+        "time",
+        "baseline_id",
+        "frequency",
+        "polarization",
+      )
+      assert node["FLOAT_DATA"].equals(node["VISIBILITY"].real)
+
+      assert node["MODEL_DATA"].dims == (
+        "time",
+        "baseline_id",
+        "frequency",
+        "polarization",
+      )
+      assert node["MODEL_DATA"].equals(node["VISIBILITY"])

{xarray_ms-0.4.0a4 → xarray_ms-0.4.0a5}/xarray_ms/backend/msv2/factories/correlated.py

@@ -176,11 +176,16 @@ class CorrelatedFactory(DatasetFactory):
     from arcae.lib.arrow_tables import ms_descriptor
 
     # Ignore all standard msv2 columns, except
-    # for CORRECTED_DATA and CORRECTED_WEIGHT_SPECTRUM
+    # for CORRECTED_DATA, CORRECTED_WEIGHT_SPECTRUM, FLOAT_DATA and MODEL_DATA
     ignored_msv2_column_set = {
       c for c in ms_descriptor("MAIN", complete=True).keys() if not c.startswith("_")
     }
-    ignored_msv2_column_set -= {"CORRECTED_DATA", "CORRECTED_WEIGHT_SPECTRUM"}
+    ignored_msv2_column_set -= {
+      "CORRECTED_DATA",
+      "CORRECTED_WEIGHT_SPECTRUM",
+      "MODEL_DATA",
+      "FLOAT_DATA",
+    }
     remaining_columns = set(self._ms_factory.instance.columns())
     remaining_columns -= ignored_msv2_column_set
     remaining_columns -= processed_columns