Merge pull request #370 from casangi/332-visibilityxds_xradio_version

VisibilityXds, SpectrumXds: xradio_version => creator

Author: FedeMPouzols

docs/source/measurement_set/schema_and_api/measurement_set_schema.rst

@@ -115,6 +115,12 @@ Data Group dictionary
 
    .. xradio_dict_schema_table:: xradio.measurement_set.schema.DataGroupDict
 
+Creator dictionary
+~~~~~~~~~~~~~~~~~~
+.. autoclass:: xradio.measurement_set.schema.CreatorDict()
+
+   .. xradio_dict_schema_table:: xradio.measurement_set.schema.CreatorDict
+
 .. _correlated data arrays:
 
 Data Arrays

src/xradio/measurement_set/_utils/_msv2/conversion.py

@@ -11,12 +11,14 @@
 
 import toolviper.utils.logger as logger
 from casacore import tables
+
 from xradio.measurement_set._utils._msv2.msv4_sub_xdss import (
     create_pointing_xds,
     create_system_calibration_xds,
     create_weather_xds,
 )
 from .msv4_info_dicts import create_info_dicts
+from xradio.measurement_set.schema import MSV4_SCHEMA_VERSION
 from xradio.measurement_set._utils._msv2.create_antenna_xds import (
     create_antenna_xds,
     create_gain_curve_xds,
@@ -1025,11 +1027,14 @@ def get_observation_info(in_file, observation_id, intents):
             start = time.time()
             xds = xr.Dataset(
                 attrs={
+                    "schema_version": MSV4_SCHEMA_VERSION,
+                    "creator": {
+                        "software_name": "xradio",
+                        "version": importlib.metadata.version("xradio"),
+                    },
                     "creation_date": datetime.datetime.now(
                         datetime.timezone.utc
                     ).isoformat(),
-                    "xradio_version": importlib.metadata.version("xradio"),
-                    "schema_version": "4.0.-9989",
                     "type": "visibility",
                 }
             )
@@ -1283,8 +1288,8 @@ def get_observation_info(in_file, observation_id, intents):
                 xds = xds.drop_vars(["UVW"])
                 del xds["uvw_label"]
             else:
-                if any("WVR" in s for s in intents):
-                    xds.attrs["type"] = "wvr"
+                if xds.attrs["processor_info"]["type"] == "RADIOMETER":
+                    xds.attrs["type"] = "radiometer"
                 else:
                     xds.attrs["type"] = "visibility"
 

src/xradio/measurement_set/schema.py

@@ -9,6 +9,8 @@
 from xradio.schema.typing import Attr, Coord, Coordof, Data, Dataof, Name
 import numpy
 
+MSV4_SCHEMA_VERSION = "4.0.-9988"
+
 # Dimensions
 Time = Literal["time"]
 """ Observation time dimension """
@@ -1342,9 +1344,19 @@ class DataGroupDict:
 
 @dict_schema
 class DataGroupsDict:
+    """Dictionary of data group dictionaries."""
+
     base: DataGroupDict
 
 
+@dict_schema
+class CreatorDict:
+    software_name: str
+    """ Software that created the Measurement Set (XRadio, etc.). """
+    version: str
+    """ Version of the software. """
+
+
 # Data Sets
 
 
@@ -1959,11 +1971,13 @@ class VisibilityXds:
     """ Defines groups of correlated data + flag + weight + uvw variables. """
 
     schema_version: Attr[str]
-    """Semantic version of xradio data format"""
+    """Semantic version of MSv4 data format."""
+    creator: Attr[CreatorDict]
+    """Creator information (software, version)."""
     creation_date: Attr[str]
-    """Date visibility dataset was created . Format: YYYY-MM-DDTHH:mm:ss.SSS (ISO 8601)"""
+    """Date visibility dataset was created. Format: YYYY-MM-DDTHH:mm:ss.SSS (ISO 8601)"""
 
-    type: Attr[Literal["visibility"]] = "visibility"
+    type: Attr[Literal["visibility", "radiometer"]] = "visibility"
     """
     Dataset type
     """
@@ -2024,9 +2038,6 @@ class VisibilityXds:
     weather_xds: Optional[Attr[WeatherXds]] = None
     phased_array_xds: Optional[Attr[PhasedArrayXds]] = None
 
-    xradio_version: Optional[Attr[str]] = None
-    """ Version of XRADIO used if converted from MSv2. """
-
 
 @xarray_dataset_schema
 class SpectrumXds:
@@ -2061,9 +2072,11 @@ class SpectrumXds:
     """ Defines groups of correlated data + flag + weight variables. """
 
     schema_version: Attr[str]
-    """Semantic version of xradio data format"""
+    """Semantic version of MSv4 data format."""
+    creator: Attr[CreatorDict]
+    """Creator information (software, version)."""
     creation_date: Attr[str]
-    """Date MSv4 was created . Format: YYYY-MM-DDTHH:mm:ss.SSS (ISO 8601)"""
+    """Date spectrum dataset was created . Format: YYYY-MM-DDTHH:mm:ss.SSS (ISO 8601)"""
 
     type: Attr[Literal["spectrum"]] = "spectrum"
     """
@@ -2121,6 +2134,3 @@ class SpectrumXds:
     phase_calibration_xds: Optional[Attr[PhaseCalibrationXds]] = None
     weather_xds: Optional[Attr[WeatherXds]] = None
     phased_array_xds: Optional[Attr[PhasedArrayXds]] = None
-
-    xradio_version: Optional[Attr[str]] = None
-    """ Version of XRADIO used if converted from MSv2. """

tests/stakeholder/test_measure_set_stakeholder.py

@@ -171,7 +171,7 @@ def base_test(
         if do_schema_check:
             start_check = time.time()
             for xds_name in ps.keys():
-                if ps[xds_name].attrs["type"] == "visibility":
+                if ps[xds_name].attrs["type"] in ["visibility", "radiometer"]:
                     check_dataset(ps[xds_name], VisibilityXds).expect()
                 elif ps[xds_name].attrs["type"] == "spectrum":
                     check_dataset(ps[xds_name], SpectrumXds).expect()