xradio 0.0.39__py3-none-any.whl → 0.0.40__py3-none-any.whl

xradio/__init__.py

@@ -1,5 +1,5 @@
 import os
-from graphviper.utils.logger import setup_logger
+from toolviper.utils.logger import setup_logger
 
 # _logger_name = "xradio"
 # if os.getenv("VIPER_LOGGER_NAME") != _logger_name:

xradio/_utils/schema.py

@@ -1,12 +1,12 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import xarray as xr
 
 
 def convert_generic_xds_to_xradio_schema(
     generic_xds: xr.Dataset,
     msv4_xds: xr.Dataset,
-    to_new_data_variables: dict,
-    to_new_coords: dict,
+    to_new_data_variables: dict[str, list],
+    to_new_coords: dict[str, list],
 ) -> xr.Dataset:
     """Converts a generic xarray Dataset to the xradio schema.
 
@@ -55,6 +55,7 @@ def convert_generic_xds_to_xradio_schema(
         "column_descriptions"
     ]
     coords = {}
+    coord_attrs = {}
 
     name_keys = list(generic_xds.data_vars.keys()) + list(generic_xds.coords.keys())
 
@@ -80,7 +81,14 @@ def convert_generic_xds_to_xradio_schema(
                 new_coord[1],
                 generic_xds[key].data,
             )
+
+            if msv4_measure:
+                coord_attrs[new_coord[0]] = msv4_measure
+
     msv4_xds = msv4_xds.assign_coords(coords)
+    for coord, coord_attrs in coord_attrs.items():
+        msv4_xds.coords[coord].attrs.update(coord_attrs)
+
     return msv4_xds
 
 
@@ -102,6 +110,9 @@ def column_description_casacore_to_msv4_measure(
             casacore_column_description["keywords"]["QuantumUnits"]
         )
 
+        # Beware: casa_ref won't be found in cases such as the custom
+        # 'NRAO_GBT_USER/NRAO_GBT_USER_DIR_REF' in POINTING
+        casa_ref = None
         # Reference frame to convert?
         if "Ref" in msv4_measure_conversion:
             # Find reference frame

xradio/image/_util/_casacore/xds_from_casacore.py

@@ -5,7 +5,7 @@ from typing import List, Tuple, Union
 
 import dask
 import dask.array as da
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import numpy as np
 import xarray as xr
 from astropy import units as u

xradio/image/_util/_zarr/xds_from_zarr.py

@@ -1,7 +1,7 @@
 import copy
 import dask.array as da
 
-# import graphviper.utils.logger as logger
+# import toolviper.utils.logger as logger
 import numpy as np
 import os
 import xarray as xr

xradio/image/_util/_zarr/zarr_low_level.py

@@ -112,7 +112,7 @@ def write_binary_blob_to_disk(arr, file_path, compressor):
     Returns:
     - None
     """
-    import graphviper.utils.logger as logger
+    import toolviper.utils.logger as logger
 
     # Encode the NumPy array using the codec
     logger.debug("1. Before compressor " + file_path)

xradio/vis/_vis_utils/_ms/_tables/load_main_table.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from typing import Dict, List, Tuple, Union
 
 import pandas as pd

xradio/vis/_vis_utils/_ms/_tables/read.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import os
 from pathlib import Path
 import re

xradio/vis/_vis_utils/_ms/_tables/read_main_table.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from typing import Any, Dict, List, Tuple, Union
 
 import dask, dask.array

xradio/vis/_vis_utils/_ms/_tables/read_subtables.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from pathlib import Path
 from typing import Dict, Tuple, Union
 

xradio/vis/_vis_utils/_ms/_tables/write.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger, os
+import toolviper.utils.logger as logger, os
 from typing import Tuple
 
 import numpy as np

xradio/vis/_vis_utils/_ms/conversion.py

@@ -2,7 +2,7 @@ import numcodecs
 import time
 from .._zarr.encoding import add_encoding
 from typing import Dict, Union
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import os
 import pathlib
 

xradio/vis/_vis_utils/_ms/create_antenna_xds.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import time
 from typing import Tuple, Union
 

xradio/vis/_vis_utils/_ms/create_field_and_source_xds.py

@@ -5,7 +5,7 @@ from typing import Tuple, Union
 import numpy as np
 import xarray as xr
 
-from xradio._utils.schema import column_description_casacore_to_msv4_measure
+import toolviper.utils.logger as logger
 from xradio.vis._vis_utils._ms.msv4_sub_xdss import interpolate_to_time
 from xradio.vis._vis_utils._ms.subtables import subt_rename_ids
 from xradio.vis._vis_utils._ms._tables.read import (
@@ -13,13 +13,16 @@ from xradio.vis._vis_utils._ms._tables.read import (
     make_taql_where_between_min_max,
     load_generic_table,
 )
-import graphviper.utils.logger as logger
+from xradio._utils.common import cast_to_str, convert_to_si_units, add_position_offsets
 from xradio._utils.list_and_array import (
     check_if_consistent,
     unique_1d,
     to_np_array,
 )
-from xradio._utils.common import cast_to_str, convert_to_si_units, add_position_offsets
+from xradio._utils.schema import (
+    column_description_casacore_to_msv4_measure,
+    convert_generic_xds_to_xradio_schema,
+)
 
 
 def create_field_and_source_xds(
@@ -176,16 +179,29 @@ def extract_ephemeris_info(
     else:
         unit_keyword = "QuantumUnits"
 
-    # We are using the "time_ephemeris_axis" label because it might not match the optional time axis of the source and field info. If ephemeris_interpolate=True then rename it to time.
-    coords = {
-        "ellipsoid_pos_label": ["lon", "lat", "dist"],
-        "time_ephemeris_axis": ephemeris_xds["time"].data,
-        "sky_pos_label": ["ra", "dec", "dist"],
-    }
-
     temp_xds = xr.Dataset()
 
-    # Add mandatory data: SOURCE_LOCATION (POSITION / sky_pos_label)
+    # Add mandatory data: OBSERVATION_POSITION
+    observation_position = [
+        ephemeris_meta["GeoLong"],
+        ephemeris_meta["GeoLat"],
+        ephemeris_meta["GeoDist"],
+    ]
+    temp_xds["OBSERVATION_POSITION"] = xr.DataArray(
+        observation_position, dims=["ellipsoid_pos_label"]
+    )
+    temp_xds["OBSERVATION_POSITION"].attrs.update(
+        {
+            "type": "location",
+            "units": ["deg", "deg", "m"],
+            "data": observation_position,
+            "ellipsoid": "WGS84",
+            "origin_object_name": "Earth",
+            "coordinate_system": ephemeris_meta["obsloc"].lower(),
+        }
+    )  # I think the units are ['deg','deg','m'] and 'WGS84'.
+
+    # Add (optional) data: SOURCE_LOCATION (POSITION / sky_pos_label)
     temp_xds["SOURCE_LOCATION"] = xr.DataArray(
         np.column_stack(
             (
@@ -206,71 +222,42 @@ def extract_ephemeris_info(
         {"type": "sky_coord", "frame": sky_coord_frame, "units": sky_coord_units}
     )
 
-    # Add mandatory data: SOURCE_RADIAL_VELOCITY
-    temp_xds["SOURCE_RADIAL_VELOCITY"] = xr.DataArray(
-        ephemeris_xds["RadVel"].data, dims=["time_ephemeris_axis"]
-    )
-    temp_xds["SOURCE_RADIAL_VELOCITY"].attrs.update(
-        {
-            "type": "quantity",
-            "units": [
-                cast_to_str(
-                    ephemris_column_description["RadVel"]["keywords"][unit_keyword]
-                )
-            ],
-        }
-    )
-
-    # Add mandatory data: OBSERVATION_POSITION
-    observation_position = [
-        ephemeris_meta["GeoLong"],
-        ephemeris_meta["GeoLat"],
-        ephemeris_meta["GeoDist"],
-    ]
-    temp_xds["OBSERVATION_POSITION"] = xr.DataArray(
-        observation_position, dims=["ellipsoid_pos_label"]
+    # Convert a few columns/variables that can be converted with standard
+    # convert_generic_xds_to_xradio_schema().
+    # Metadata has to be fixed manually. Alternatively, issues like
+    # UNIT/QuantumUnits issue could be handled in convert_generic_xds_to_xradio_schema,
+    # but for now preferring not to pollute that function.
+    to_new_data_variables = {
+        # mandatory: SOURCE_RADIAL_VELOCITY
+        "RadVel": ["SOURCE_RADIAL_VELOCITY", ["time_ephemeris_axis"]],
+        # optional: data NORTH_POLE_POSITION_ANGLE and NORTH_POLE_ANGULAR_DISTANCE
+        "NP_ang": ["NORTH_POLE_POSITION_ANGLE", ["time_ephemeris_axis"]],
+        "NP_dist": ["NORTH_POLE_ANGULAR_DISTANCE", ["time_ephemeris_axis"]],
+        # optional: HELIOCENTRIC_RADIAL_VELOCITY
+        "rdot": ["HELIOCENTRIC_RADIAL_VELOCITY", ["time_ephemeris_axis"]],
+        # optional: OBSERVER_PHASE_ANGLE
+        "phang": ["OBSERVER_PHASE_ANGLE", ["time_ephemeris_axis"]],
+    }
+    convert_generic_xds_to_xradio_schema(
+        ephemeris_xds, temp_xds, to_new_data_variables, {}
     )
-    temp_xds["OBSERVATION_POSITION"].attrs.update(
-        {
-            "type": "location",
-            "units": ["deg", "deg", "m"],
-            "data": observation_position,
-            "ellipsoid": "WGS84",
-            "origin_object_name": "Earth",
-            "coordinate_system": ephemeris_meta["obsloc"].lower(),
-        }
-    )  # I think the units are ['deg','deg','m'] and 'WGS84'.
 
-    # Add optional data NORTH_POLE_POSITION_ANGLE and NORTH_POLE_ANGULAR_DISTANCE
-    if "NP_ang" in ephemeris_xds.data_vars:
-        temp_xds["NORTH_POLE_POSITION_ANGLE"] = xr.DataArray(
-            ephemeris_xds["NP_ang"].data, dims=["time_ephemeris_axis"]
-        )
-        temp_xds["NORTH_POLE_POSITION_ANGLE"].attrs.update(
-            {
-                "type": "quantity",
-                "units": [
-                    cast_to_str(
-                        ephemris_column_description["NP_ang"]["keywords"][unit_keyword]
-                    )
-                ],
-            }
-        )
-
-    if "NP_dist" in ephemeris_xds.data_vars:
-        temp_xds["NORTH_POLE_ANGULAR_DISTANCE"] = xr.DataArray(
-            ephemeris_xds["NP_dist"].data, dims=["time_ephemeris_axis"]
-        )
-        temp_xds["NORTH_POLE_ANGULAR_DISTANCE"].attrs.update(
-            {
-                "type": "quantity",
-                "units": [
-                    cast_to_str(
-                        ephemris_column_description["NP_dist"]["keywords"][unit_keyword]
-                    )
-                ],
-            }
-        )
+    # Adjust metadata:
+    for generic_var_name, msv4_variable_def in to_new_data_variables.items():
+        msv4_var_name = msv4_variable_def[0]
+        if msv4_var_name in temp_xds:
+            temp_xds[msv4_var_name].attrs.update(
+                {
+                    "type": "quantity",
+                    "units": [
+                        cast_to_str(
+                            ephemris_column_description[generic_var_name]["keywords"][
+                                unit_keyword
+                            ]
+                        )
+                    ],
+                }
+            )
 
     # Add optional data: SUB_OBSERVER_POSITION and SUB_SOLAR_POSITION
     if "DiskLong" in ephemris_column_description:
@@ -341,38 +328,12 @@ def extract_ephemeris_info(
             }
         )
 
-    # Add optional data: HELIOCENTRIC_RADIAL_VELOCITY
-    if "rdot" in ephemeris_xds.data_vars:
-        temp_xds["HELIOCENTRIC_RADIAL_VELOCITY"] = xr.DataArray(
-            ephemeris_xds["rdot"].data, dims=["time_ephemeris_axis"]
-        )
-        temp_xds["HELIOCENTRIC_RADIAL_VELOCITY"].attrs.update(
-            {
-                "type": "quantity",
-                "units": [
-                    cast_to_str(
-                        ephemris_column_description["rdot"]["keywords"][unit_keyword]
-                    )
-                ],
-            }
-        )
-
-    # Add optional data: OBSERVER_PHASE_ANGLE
-    if "phang" in ephemeris_xds.data_vars:
-        temp_xds["OBSERVER_PHASE_ANGLE"] = xr.DataArray(
-            ephemeris_xds["phang"].data, dims=["time_ephemeris_axis"]
-        )
-        temp_xds["OBSERVER_PHASE_ANGLE"].attrs.update(
-            {
-                "type": "quantity",
-                "units": [
-                    cast_to_str(
-                        ephemris_column_description["phang"]["keywords"][unit_keyword]
-                    )
-                ],
-            }
-        )
-
+    # We are using the "time_ephemeris_axis" label because it might not match the optional time axis of the source and field info. If ephemeris_interpolate=True then rename it to time.
+    coords = {
+        "ellipsoid_pos_label": ["lon", "lat", "dist"],
+        "time_ephemeris_axis": ephemeris_xds["time"].data,
+        "sky_pos_label": ["ra", "dec", "dist"],
+    }
     temp_xds = temp_xds.assign_coords(coords)
     time_coord_attrs = {
         "type": "time",
@@ -435,8 +396,74 @@ def extract_ephemeris_info(
     return xds
 
 
+def make_line_dims_and_coords(
+    source_xds: xr.Dataset, source_id: Union[int, np.ndarray], num_lines: int
+) -> tuple[list, dict]:
+    """
+    Produces the dimensions and coordinates used in data variables related
+    to line information (LINE_REST_FREQUENCY, LINE_SYSTEMIC_VELOCITY).
+
+    In the dimensions, "time" is optional. To produce the points of the
+    coordinates we need to look into the (optional) TRANSITION column or
+    alternatively other columns (DIRECTION) to produce coordinates points of
+    appropriate shape, given the "num_lines" "and source_id".
+
+    Parameters:
+    ----------
+    source_xds: xr.Dataset
+        generic source xarray dataset
+    source_id: Union[int, np.ndarray]
+        source_id of the dataset, when it is an array that indicates the
+        presence of the "time" dimension
+    num_line: int
+        number of lines in the source dataset
+
+    Returns:
+    -------
+    tuple : tuple[list, dict]
+        The dimensions and coordinates to use with line data variables. The
+        dimensions are produced as a list of dimension names, and the
+        coordinates as a dict for xarray coords.
+    """
+
+    # Transition is an optional column and occasionally not populated
+    if "TRANSITION" in source_xds.data_vars:
+        transition_var_data = source_xds["TRANSITION"].data
+    else:
+        transition_var_data = np.zeros(source_xds["DIRECTION"].shape, dtype="str")
+
+    # if TRANSITION is left empty (or otherwise incomplete), and num_lines > 1,
+    # the data_vars expect a "num_lines" size in the last dimension
+    vars_shape = transition_var_data.shape[:-1] + (np.max(num_lines),)
+    if transition_var_data.shape == vars_shape:
+        coords_lines_data = transition_var_data
+    else:
+        coords_lines_data = np.broadcast_to(
+            transition_var_data, max(transition_var_data.shape, vars_shape)
+        )
+
+    line_label_data = np.arange(coords_lines_data.shape[-1]).astype(str)
+    if len(source_id) == 1:
+        line_coords = {
+            "line_name": ("line_label", coords_lines_data),
+            "line_label": line_label_data,
+        }
+        line_dims = ["line_label"]
+    else:
+        line_coords = {
+            "line_name": (("time", "line_label"), coords_lines_data),
+            "line_label": line_label_data,
+        }
+        line_dims = ["time", "line_label"]
+
+    return line_dims, line_coords
+
+
 def extract_source_info(
-    xds: xr.Dataset, path: str, source_id: int, spectral_window_id: int
+    xds: xr.Dataset,
+    path: str,
+    source_id: Union[int, np.ndarray],
+    spectral_window_id: int,
 ) -> tuple[xr.Dataset, int]:
     """
     Extracts source information from the given path and adds it to the xarray dataset.
@@ -447,7 +474,7 @@ def extract_source_info(
         The xarray dataset to which the source information will be added.
     path : str
         The path to the input file.
-    source_id : int
+    source_id : Union[int, np.ndarray]
         The ID of the source.
     spectral_window_id : int
         The ID of the spectral window.
@@ -554,11 +581,12 @@ def extract_source_info(
             direction_var = source_xds[direction_msv2_col]
 
         # SOURCE_LOCATION (DIRECTION / sky_dir_label)
-        xds["SOURCE_LOCATION"] = xr.DataArray(direction_var.data, dims=direction_dims)
         location_msv4_measure = column_description_casacore_to_msv4_measure(
             source_column_description[direction_msv2_col]
         )
-        xds["SOURCE_LOCATION"].attrs.update(location_msv4_measure)
+        xds["SOURCE_LOCATION"] = xr.DataArray(
+            direction_var.data, dims=direction_dims, attrs=location_msv4_measure
+        )
 
     # Do we have line data:
     if source_xds["NUM_LINES"].data.ndim == 0:
@@ -567,53 +595,21 @@ def extract_source_info(
         num_lines = source_xds["NUM_LINES"].data
 
     if any(num_lines > 0):
+        line_dims, line_coords = make_line_dims_and_coords(
+            source_xds, source_id, num_lines
+        )
+        xds = xds.assign_coords(line_coords)
 
-        # Transition is an optional column and occasionally not populated
-        if "TRANSITION" in source_xds.data_vars:
-            transition_var_data = source_xds["TRANSITION"].data
-        else:
-            transition_var_data = np.zeros(source_xds["DIRECTION"].shape, dtype="str")
-
-        # if TRANSITION is left empty (or otherwise incomplete), and num_lines > 1,
-        # the data_vars expect a "num_lines" size in the last dimension
-        vars_shape = transition_var_data.shape[:-1] + (np.max(num_lines),)
-        if transition_var_data.shape == vars_shape:
-            coords_lines_data = transition_var_data
-        else:
-            coords_lines_data = np.broadcast_to(
-                transition_var_data, max(transition_var_data.shape, vars_shape)
-            )
-
-        line_label_data = np.arange(coords_lines_data.shape[-1]).astype(str)
-        if len(source_id) == 1:
-            coords_lines = {
-                "line_name": ("line_label", coords_lines_data),
-                "line_label": line_label_data,
-            }
-            xds = xds.assign_coords(coords_lines)
-            line_dims = ["line_label"]
-        else:
-            coords_lines = {
-                "line_name": (("time", "line_label"), coords_lines_data),
-                "line_label": line_label_data,
-            }
-            xds = xds.assign_coords(coords_lines)
-            line_dims = ["time", "line_label"]
-
-        optional_data_variables = {
-            "REST_FREQUENCY": "LINE_REST_FREQUENCY",
-            "SYSVEL": "LINE_SYSTEMIC_VELOCITY",
+        to_new_data_variables = {
+            "REST_FREQUENCY": ["LINE_REST_FREQUENCY", line_dims],
+            "SYSVEL": ["LINE_SYSTEMIC_VELOCITY", line_dims],
         }
-        for generic_name, msv4_name in optional_data_variables.items():
-            if generic_name in source_xds:
-                msv4_measure = column_description_casacore_to_msv4_measure(
-                    source_column_description[generic_name]
-                )
-
-                xds[msv4_name] = xr.DataArray(
-                    source_xds[generic_name].data, dims=line_dims
-                )
-                xds[msv4_name].attrs.update(msv4_measure)
+        to_new_coords = {
+            "TIME": ["time", ["time"]],
+        }
+        convert_generic_xds_to_xradio_schema(
+            source_xds, xds, to_new_data_variables, to_new_coords
+        )
 
     # Need to add doppler info if present. Add check.
     try:
@@ -634,8 +630,56 @@ def extract_source_info(
     return xds, np.sum(num_lines[unique_source_ids_indices])
 
 
+def make_field_dims_and_coords(
+    field_xds: xr.Dataset, field_id: Union[int, np.ndarray], field_times: list
+) -> tuple[list, dict]:
+    """
+    Produces the dimensions and coordinates used in the field data variables
+    extracted from the MSv2 FIELD subtable (FIELD_PHASE_CENTER/
+    FIELD_REFERENCE_CENTER).
+
+    Parameters:
+    ----------
+    field_xds: xr.Dataset
+        generic field xarray dataset
+    field_id: Union[int, np.ndarray]
+        field_id of the dataset
+    field_times:
+        Unique times for the dataset (when not partitioning by FIELD_ID)
+
+    Returns:
+    -------
+    tuple : tuple[list, dict]
+        The dimensions and coordinates to use with field data variables. The
+        dimensions are produced as a list of dimension names, and the
+        coordinates as a dict for xarray coords.
+    """
+
+    coords = {"sky_dir_label": ["ra", "dec"]}
+
+    # field_times is the same as the time axis in the main MSv4 dataset and is used if more than one field is present.
+    if field_times is not None:
+        coords["time"] = field_times
+        dims = ["time", "sky_dir_label"]
+        coords["field_name"] = (
+            "time",
+            np.char.add(field_xds["NAME"].data, np.char.add("_", field_id.astype(str))),
+        )
+        # coords["field_id"] = ("time", field_id)
+    else:
+        coords["field_name"] = field_xds["NAME"].values.item() + "_" + str(field_id)
+        # coords["field_id"] = field_id
+        dims = ["sky_dir_label"]
+
+    return dims, coords
+
+
 def extract_field_info_and_check_ephemeris(
-    field_and_source_xds, in_file, field_id, field_times, is_single_dish
+    field_and_source_xds: xr.Dataset,
+    in_file: str,
+    field_id: Union[int, np.ndarray],
+    field_times: list,
+    is_single_dish: bool,
 ):
     """
     Create field information and check for ephemeris in the FIELD table folder.
@@ -646,8 +690,12 @@ def extract_field_info_and_check_ephemeris(
         The xarray dataset to which the field and source information will be added.
     in_file : str
         The path to the input file.
-    field_id : int
+    field_id : Union[int, np.ndarray]
         The ID of the field.
+    field_times: list
+        Time of the MSv4
+    is_single_dish: bool
+        Whether to extract single dish (FIELD_REFERENCE_CENTER) info
 
     Returns:
     -------
@@ -658,7 +706,6 @@ def extract_field_info_and_check_ephemeris(
     ephemeris_table_name : str
         The name of the ephemeris table.
     """
-    coords = {}
 
     unique_field_id = unique_1d(
         field_id
@@ -718,6 +765,8 @@ def extract_field_info_and_check_ephemeris(
                     f"Could not find ephemeris table for field_id {field_id}. Ephemeris information will not be included in the field_and_source_xds."
                 )
 
+    dims, coords = make_field_dims_and_coords(field_xds, field_id, field_times)
+
     if is_single_dish:
         field_data_variables = {
             "REFERENCE_DIR": "FIELD_REFERENCE_CENTER",
@@ -729,27 +778,10 @@ def extract_field_info_and_check_ephemeris(
             # "REFERENCE_DIR": "FIELD_REFERENCE_CENTER",
         }
 
-    field_measures_type = "sky_coord"
-
-    coords["sky_dir_label"] = ["ra", "dec"]
     field_column_description = field_xds.attrs["other"]["msv2"]["ctds_attrs"][
         "column_descriptions"
     ]
 
-    # field_times is the same as the time axis in the main MSv4 dataset and is used if more than one field is present.
-    if field_times is not None:
-        coords["time"] = field_times
-        dims = ["time", "sky_dir_label"]
-        coords["field_name"] = (
-            "time",
-            np.char.add(field_xds["NAME"].data, np.char.add("_", field_id.astype(str))),
-        )
-        # coords["field_id"] = ("time", field_id)
-    else:
-        coords["field_name"] = field_xds["NAME"].values.item() + "_" + str(field_id)
-        # coords["field_id"] = field_id
-        dims = ["sky_dir_label"]
-
     for generic_name, msv4_name in field_data_variables.items():
 
         delay_dir_ref_col = "DelayDir_Ref"
@@ -772,6 +804,7 @@ def extract_field_info_and_check_ephemeris(
             }
         )
 
+        field_measures_type = "sky_coord"
         field_and_source_xds[msv4_name].attrs["type"] = field_measures_type
 
     field_and_source_xds = field_and_source_xds.assign_coords(coords)

xradio/vis/_vis_utils/_ms/msv2_to_msv4_meta.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from xradio._utils.schema import column_description_casacore_to_msv4_measure
 
 col_to_data_variable_names = {

xradio/vis/_vis_utils/_ms/msv4_sub_xdss.py

@@ -1,11 +1,14 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import time
 from typing import Tuple, Union
 
 import numpy as np
 import xarray as xr
 
-from xradio._utils.schema import column_description_casacore_to_msv4_measure
+from xradio._utils.schema import (
+    column_description_casacore_to_msv4_measure,
+    convert_generic_xds_to_xradio_schema,
+)
 from .subtables import subt_rename_ids
 from ._tables.read import make_taql_where_between_min_max, load_generic_table
 
@@ -70,37 +73,22 @@ def create_weather_xds(in_file: str):
     xr.Dataset
         Weather Xarray Dataset.
     """
-    # Dictionaries that define the conversion from MSv2 to MSv4:
-    # Dict from col/data_var names in generic_weather_xds (from MSv2) to MSV4
-    # weather_xds produced here
-    to_new_data_variable_names = {
-        "H2O": "H2O",
-        "IONOS_ELECTRON": "IONOS_ELECTRON",
-        "PRESSURE": "PRESSURE",
-        "REL_HUMIDITY": "REL_HUMIDITY",
-        "TEMPERATURE": "TEMPERATURE",
-        "DEW_POINT": "DEW_POINT",
-        "WIND_DIRECTION": "WIND_DIRECTION",
-        "WIND_SPEED": "WIND_SPEED",
-    }
-    data_variable_dims = {
-        "H2O": ["station_id", "time"],
-        "IONOS_ELECTRON": ["station_id", "time"],
-        "PRESSURE": ["station_id", "time"],
-        "REL_HUMIDITY": ["station_id", "time"],
-        "TEMPERATURE": ["station_id", "time"],
-        "DEW_POINT": ["station_id", "time"],
-        "WIND_DIRECTION": ["station_id", "time"],
-        "WIND_SPEED": ["station_id", "time"],
-    }
-    to_new_coord_names = {
-        # No MS data cols are turned into xds coords
-    }
-    coord_dims = {
-        # No MS data cols are turned into xds coords
+
+    dims_station_time = ["station_id", "time"]
+    to_new_data_variables = {
+        "H20": ["H2O", dims_station_time],
+        "IONOS_ELECTRON": ["IONOS_ELECTRON", dims_station_time],
+        "PRESSURE": ["PRESSURE", dims_station_time],
+        "REL_HUMIDITY": ["REL_HUMIDITY", dims_station_time],
+        "TEMPERATURE": ["TEMPERATURE", dims_station_time],
+        "DEW_POINT": ["DEW_POINT", dims_station_time],
+        "WIND_DIRECTION": ["WIND_DIRECTION", dims_station_time],
+        "WIND_SPEED": ["WIND_SPEED", dims_station_time],
     }
-    to_new_dim_names = {
-        "ANTENNA_ID": "STATION_ID",
+
+    to_new_coords = {
+        "ANTENNA_ID": ["station_id", ["station_id"]],
+        "TIME": ["time", ["time"]],
     }
 
     # Read WEATHER table into a Xarray Dataset.
@@ -113,74 +101,88 @@ def create_weather_xds(in_file: str):
     except ValueError as _exc:
         return None
 
-    generic_weather_xds = generic_weather_xds.rename_dims(to_new_dim_names)
-
-    weather_column_description = generic_weather_xds.attrs["other"]["msv2"][
-        "ctds_attrs"
-    ]["column_descriptions"]
-    # ['ANTENNA_ID', 'TIME', 'INTERVAL', 'H2O', 'IONOS_ELECTRON',
-    #  'PRESSURE', 'REL_HUMIDITY', 'TEMPERATURE', 'DEW_POINT',
-    #  'WIND_DIRECTION', 'WIND_SPEED']
     weather_xds = xr.Dataset(attrs={"type": "weather"})
-    time_attrs = column_description_casacore_to_msv4_measure(
-        weather_column_description["TIME"]
+    weather_xds = convert_generic_xds_to_xradio_schema(
+        generic_weather_xds, weather_xds, to_new_data_variables, to_new_coords
     )
-    coords = {
-        "station_id": generic_weather_xds["STATION_ID"].data,
-        "time": ("time", generic_weather_xds["TIME"].data, time_attrs),
-    }
-    for key in generic_weather_xds:
-        msv4_measure = column_description_casacore_to_msv4_measure(
-            weather_column_description[key.upper()]
-        )
-        if key in to_new_data_variable_names:
-            var_name = to_new_data_variable_names[key]
-            weather_xds[var_name] = xr.DataArray(
-                generic_weather_xds[key].data, dims=data_variable_dims[key]
-            )
-
-            if msv4_measure:
-                weather_xds[var_name].attrs.update(msv4_measure)
-
-            if key in ["INTERVAL"]:
-                weather_xds[var_name].attrs.update({"units": ["s"], "type": "quantity"})
-            elif key in ["H2O"]:
-                weather_xds[var_name].attrs.update(
-                    {"units": ["/m^2"], "type": "quantity"}
-                )
-            elif key in ["IONOS_ELECTRON"]:
-                weather_xds[var_name].attrs.update(
-                    {"units": ["/m^2"], "type": "quantity"}
-                )
-            elif key in ["PRESSURE"]:
-                weather_xds[var_name].attrs.update(
-                    {"units": ["Pa"], "type": "quantity"}
-                )
-            elif key in ["REL_HUMIDITY"]:
-                weather_xds[var_name].attrs.update({"units": ["%"], "type": "quantity"})
-            elif key in ["TEMPERATURE"]:
-                weather_xds[var_name].attrs.update({"units": ["K"], "type": "quantity"})
-            elif key in ["DEW_POINT"]:
-                weather_xds[var_name].attrs.update({"units": ["K"], "type": "quantity"})
-            elif key in ["WIND_DIRECTION"]:
-                weather_xds[var_name].attrs.update(
-                    {"units": ["rad"], "type": "quantity"}
-                )
-            elif key in ["WIND_SPEED"]:
-                weather_xds[var_name].attrs.update(
-                    {"units": ["m/s"], "type": "quantity"}
-                )
-
-        if key in to_new_coord_names:
-            coords[to_new_coord_names[key]] = (
-                coord_dims[key],
-                generic_weather_xds[key].data,
-            )
-
-    weather_xds = weather_xds.assign_coords(coords)
+
+    # correct expected types
+    weather_xds["station_id"] = weather_xds["station_id"].astype(np.int64)
+
     return weather_xds
 
 
+def correct_generic_pointing_xds(
+    generic_pointing_xds: xr.Dataset, to_new_data_variables: dict[str, list]
+) -> xr.Dataset:
+    """
+    Takes a (generic) pointing_xds as read from a POINTING subtable of an MSv2
+    and tries to correct several deviations from the MSv2 specs seen in
+    common test data.
+    The problems fixed here include wrong dimensions:
+    - for example transposed dimensions with respect to the MSv2 specs (output
+    from CASA simulator),
+    - missing/additional unexpected dimensions when some of the columns are
+    empty (in the sense of "empty casacore cells").
+
+    This function modifies the data arrays of the data vars affected by such
+    issues.
+
+    Parameters
+    ----------
+    generic_pointing_xds: xr.Dataset
+        The generic pointing dataset (loaded from MSv2) to be fixed
+    to_new_data_variables: dict
+        The dict used for convert_generic_xds_to_xradio_schema, which gives all
+        the data variables relevant for the final MSv4 dataset.
+
+    Returns:
+    --------
+    xr.Dataset
+        Corrected dataset with dimensions conforming to MSv2 specs.
+    """
+
+    correct_pointing_xds = generic_pointing_xds.copy()
+
+    for key in generic_pointing_xds:
+        if key in to_new_data_variables:
+            data_var_name = to_new_data_variables[key]
+            # Corrects dim sizes of "empty cell" variables, such as empty DIRECTION, TARGET, etc.
+            if (
+                "dim_2" in generic_pointing_xds.sizes
+                and generic_pointing_xds.sizes["dim_2"] == 0
+            ):
+                # When all direction variables are "empty"
+                data_var_data = xr.DataArray(
+                    [[[[np.nan, np.nan]]]],
+                    dims=generic_pointing_xds.dims,
+                ).isel(n_polynomial=0, drop=True)
+                correct_pointing_xds[data_var_name].data = data_var_data
+
+            elif (
+                "dir" in generic_pointing_xds.sizes
+                and generic_pointing_xds.sizes["dir"] == 0
+            ):
+                # When some direction variables are "empty" but some are populated properly
+                if "dim_2" in generic_pointing_xds[key].sizes:
+                    data_var_data = xr.DataArray(
+                        generic_pointing_xds[key].values,
+                        dims=generic_pointing_xds[key].dims,
+                    )
+                else:
+                    shape = tuple(
+                        generic_pointing_xds.sizes[dim]
+                        for dim in ["TIME", "ANTENNA_ID"]
+                    ) + (2,)
+                    data_var_data = xr.DataArray(
+                        np.full(shape, np.nan),
+                        dims=generic_pointing_xds[key].dims,
+                    )
+                correct_pointing_xds[data_var_name].data = data_var_data
+
+    return correct_pointing_xds
+
+
 def create_pointing_xds(
     in_file: str,
     ant_xds_name_ids: xr.DataArray,
@@ -211,49 +213,43 @@ def create_pointing_xds(
     """
     start = time.time()
 
-    # Dictionaries that define the conversion from MSv2 to MSv4:
-    to_new_data_variable_names = {
-        # "name": "NAME",   # removed
-        # "time_origin": "TIME_ORIGIN",  # removed?
-        "DIRECTION": "BEAM_POINTING",
-        "ENCODER": "DISH_MEASURED_POINTING",
-        "TARGET": "TARGET",  # => attribute?
-        "POINTING_OFFSET": "POINTING_OFFSET",
-        "SOURCE_OFFSET": "SOURCE_OFFSET",
-        # "pointing_model_id": "POINTING_MODEL_ID",   # removed
-        # "tracking": "TRACKING",   # => attribute
-        # "on_source": "ON_SOURCE",   # removed
-        "OVER_THE_TOP": "OVER_THE_TOP",
-    }
     time_ant_dims = ["time", "antenna_name"]
     time_ant_dir_dims = time_ant_dims + ["sky_dir_label"]
-    data_variable_dims = {
-        # "name": ["time", "antenna_name"],   # removed
-        # "time_origin": ["time", "antenna_name"],   # removed?
-        "DIRECTION": time_ant_dir_dims,
-        "ENCODER": time_ant_dir_dims,
-        "TARGET": time_ant_dir_dims,
-        "POINTING_OFFSET": time_ant_dir_dims,
-        "SOURCE_OFFSET": time_ant_dir_dims,
-        # "pointing_model_id": ["time", "antenna_name"],   # removed
-        # "tracking": ["time", "antenna_name"],   # => attribute
-        # "on_source": ["time", "antenna_name"],  # removed
-        "OVER_THE_TOP": time_ant_dims,
+    to_new_data_variables = {
+        "DIRECTION": ["BEAM_POINTING", time_ant_dir_dims],
+        "ENCODER": ["DISH_MEASURED_POINTING", time_ant_dir_dims],
+        # => attribute?
+        "TARGET": ["TARGET", time_ant_dir_dims],
+        "POINTING_OFFSET": ["POINTING_OFFSET", time_ant_dir_dims],
+        "SOURCE_OFFSET": ["SOURCE_OFFSET", time_ant_dir_dims],
+        "OVER_THE_TOP": ["OVER_THE_TOP", time_ant_dims],
+    }
+
+    to_new_coords = {
+        "TIME": ["time", ["time"]],
+        # "ANTENNA_ID": ["antenna_name", ["antenna_name"]],
+        "dim_2": ["sky_dir_label", ["sky_dir_label"]],
     }
-    # Unused here
-    # to_new_coord_names = {"ra/dec": "direction"}
-    # coord_dims = {}
 
     taql_time_range = make_taql_where_between_min_max(
         time_min_max, in_file, "POINTING", "TIME"
     )
+
+    if taql_time_range is None:
+        taql_where = f"WHERE (ANTENNA_ID IN [{','.join(map(str, ant_xds_name_ids.antenna_id.values))}])"
+    else:
+        taql_where = (
+            taql_time_range
+            + f" AND (ANTENNA_ID IN [{','.join(map(str, ant_xds_name_ids.antenna_id.values))}])"
+        )
     # Read POINTING table into a Xarray Dataset.
     generic_pointing_xds = load_generic_table(
         in_file,
         "POINTING",
         rename_ids=subt_rename_ids["POINTING"],
-        taql_where=taql_time_range,
+        taql_where=taql_where,
     )
+
     if not generic_pointing_xds.data_vars:
         # apparently empty MS/POINTING table => produce empty xds
         return xr.Dataset()
@@ -264,69 +260,23 @@ def create_pointing_xds(
         if size == 1:
             generic_pointing_xds = generic_pointing_xds.sel({"n_polynomial": 0})
 
-    pointing_column_descriptions = generic_pointing_xds.attrs["other"]["msv2"][
-        "ctds_attrs"
-    ]["column_descriptions"]
+    generic_pointing_xds = correct_generic_pointing_xds(
+        generic_pointing_xds, to_new_data_variables
+    )
 
     pointing_xds = xr.Dataset(attrs={"type": "pointing"})
-    for key in generic_pointing_xds:
-        if key in to_new_data_variable_names:
-            data_var_name = to_new_data_variable_names[key]
-            # Corrects dim sizes of "empty cell" variables, such as empty DIRECTION, TARGET, etc.
-            # TODO: this should be moved to a function when/if stable - perhaps 'correct_generic_pointing_xds'
-            if (
-                "dim_2" in generic_pointing_xds.sizes
-                and generic_pointing_xds.sizes["dim_2"] == 0
-            ):
-                # When all direction variables are "empty"
-                data_var_data = xr.DataArray(
-                    [[[[np.nan, np.nan]]]],
-                    dims=generic_pointing_xds.dims,
-                ).isel(n_polynomial=0, drop=True)
-            elif (
-                "dir" in generic_pointing_xds.sizes
-                and generic_pointing_xds.sizes["dir"] == 0
-            ):
-                # When some direction variables are "empty" but some are populated properly
-                if "dim_2" in generic_pointing_xds[key].sizes:
-                    data_var_data = xr.DataArray(
-                        generic_pointing_xds[key].values,
-                        dims=generic_pointing_xds[key].dims,
-                    )
-                else:
-                    shape = tuple(
-                        generic_pointing_xds.sizes[dim]
-                        for dim in ["TIME", "ANTENNA_ID"]
-                    ) + (2,)
-                    data_var_data = xr.DataArray(
-                        np.full(shape, np.nan),
-                        dims=generic_pointing_xds[key].dims,
-                    )
-            else:
-                data_var_data = generic_pointing_xds[key].data
-
-            pointing_xds[data_var_name] = xr.DataArray(
-                data_var_data, dims=data_variable_dims[key]
-            )
-
-            msv4_measure = column_description_casacore_to_msv4_measure(
-                pointing_column_descriptions[key.upper()]
-            )
-            if msv4_measure:
-                pointing_xds[data_var_name].attrs.update(msv4_measure)
-
     coords = {
-        "time": generic_pointing_xds["TIME"].values,
         "antenna_name": ant_xds_name_ids.sel(
             antenna_id=generic_pointing_xds["ANTENNA_ID"]
         ).data,
         "sky_dir_label": ["ra", "dec"],
     }
     pointing_xds = pointing_xds.assign_coords(coords)
+    pointing_xds = convert_generic_xds_to_xradio_schema(
+        generic_pointing_xds, pointing_xds, to_new_data_variables, to_new_coords
+    )
 
-    # missing attributes
-    pointing_xds["time"].attrs.update({"units": ["s"], "type": "quantity"})
-
+    # Add attributes specific to pointing_xds
     if "TRACKING" in generic_pointing_xds.data_vars:
         pointing_xds.attrs["tracking"] = generic_pointing_xds.data_vars[
             "TRACKING"
@@ -335,6 +285,10 @@ def create_pointing_xds(
     # Move target from data_vars to attributes?
     move_target_as_attr = False
     if move_target_as_attr:
+        pointing_column_descriptions = generic_pointing_xds.attrs["other"]["msv2"][
+            "ctds_attrs"
+        ]["column_descriptions"]
+
         target = generic_pointing_xds.data_vars["TARGET"]
         pointing_xds.attrs["target"] = {
             "dims": ["sky_dir_label"],
@@ -348,4 +302,5 @@ def create_pointing_xds(
     pointing_xds = interpolate_to_time(pointing_xds, interp_time, "pointing_xds")
 
     logger.debug(f"create_pointing_xds() execution time {time.time() - start:0.2f} s")
+
     return pointing_xds

xradio/vis/_vis_utils/_ms/partition_queries.py

@@ -1,5 +1,5 @@
 import itertools
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from pathlib import Path
 from typing import Dict, List, Tuple, Union
 

xradio/vis/_vis_utils/_ms/partitions.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from typing import Any, Dict, List, Tuple, Union
 
 import numpy as np

xradio/vis/_vis_utils/_ms/subtables.py

@@ -1,6 +1,6 @@
 import os
 
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 
 from pathlib import Path
 from typing import Dict, List

xradio/vis/_vis_utils/_utils/xds_helper.py

@@ -1,5 +1,5 @@
 from importlib.metadata import version
-import graphviper.utils.logger as logger, multiprocessing, psutil
+import toolviper.utils.logger as logger, multiprocessing, psutil
 from typing import Any, Dict, List, Tuple, Union
 
 import numpy as np

xradio/vis/_vis_utils/_zarr/read.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import os
 from pathlib import Path
 from typing import Dict, List, Tuple, Union

xradio/vis/_vis_utils/_zarr/write.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger, numcodecs, os, time, warnings
+import toolviper.utils.logger as logger, numcodecs, os, time, warnings
 from itertools import cycle
 from pathlib import Path
 from typing import Any, Dict, Union

xradio/vis/_vis_utils/ms.py

@@ -1,5 +1,5 @@
 import os
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from typing import List, Tuple, Union
 
 from ._utils.cds import CASAVisSet

xradio/vis/_vis_utils/zarr.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from typing import Dict, Union
 
 import zarr
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 
 from ._utils.cds import CASAVisSet
 from ._zarr.read import read_part_keys, read_partitions, read_subtables

xradio/vis/convert_msv2_to_processing_set.py

@@ -1,4 +1,4 @@
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 import numcodecs
 from typing import Dict, Union
 

xradio/vis/read_processing_set.py

@@ -1,7 +1,7 @@
 import os
 
 from ._processing_set import processing_set
-import graphviper.utils.logger as logger
+import toolviper.utils.logger as logger
 from xradio._utils.zarr.common import _open_dataset, _get_file_system_and_items
 import s3fs
 

{xradio-0.0.39.dist-info → xradio-0.0.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xradio
-Version: 0.0.39
+Version: 0.0.40
 Summary: Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>
 License: BSD 3-Clause License
@@ -44,6 +44,7 @@ Requires-Dist: astropy
 Requires-Dist: dask
 Requires-Dist: distributed
 Requires-Dist: graphviper
+Requires-Dist: toolviper
 Requires-Dist: matplotlib
 Requires-Dist: numba >=0.57.0
 Requires-Dist: numpy

{xradio-0.0.39.dist-info → xradio-0.0.40.dist-info}/RECORD

@@ -1,8 +1,8 @@
-xradio/__init__.py,sha256=DtgOh81X3fT7HXf2_JDhJqemmDff7vGANECaRl03pu8,383
+xradio/__init__.py,sha256=WHBhQWQie3YQqfIxQBL3LKiKuUcN7ZL7sPMEcdWOp5E,382
 xradio/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/_utils/common.py,sha256=GY_fjet9wLhnx9XUINTq6ONBoceyLWRXHXlrNla3j3o,3726
 xradio/_utils/list_and_array.py,sha256=_wznOiHra1pHrWNdtQPXhk-TAXJ8qb9fTGE0czQNpIo,2802
-xradio/_utils/schema.py,sha256=Y-qVcxbRk4aFM-JIECzaQTia62wA-dSoGhVQF45XomU,6462
+xradio/_utils/schema.py,sha256=tdGyvQTd-rQivtkzmH9-1f7KMIB9KeSf57EN2v7Mw_o,6855
 xradio/_utils/_casacore/tables.py,sha256=aq6E_4RRAHdTBCwMKrVil1cWhFU2O980DNH9IlRKXLw,1280
 xradio/_utils/zarr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xradio/_utils/zarr/common.py,sha256=egj3Zma0BUK0msOBDozMa-62rHrcxrjCNE5XkkZUq70,5332
@@ -16,13 +16,13 @@ xradio/image/_util/image_factory.py,sha256=6tPzs20FTm2wEshHc1xqtTV7D0TbKxGLUKAVt
 xradio/image/_util/zarr.py,sha256=lhQqVRC1GEWClG3zRbuDr2IlQBfXeDqaLUJIN-MVMxA,1652
 xradio/image/_util/_casacore/__init__.py,sha256=OlsiRE40o1jSbBI4khgQQzgfDYbAlOMKIhO4UFlbGhg,41
 xradio/image/_util/_casacore/common.py,sha256=ky999eTCWta8w-uIs-7P7rPhZRLuh9yTuQXAxPvaPm4,1579
-xradio/image/_util/_casacore/xds_from_casacore.py,sha256=Rht4A32QLAQ7uizwKfOsZ3Z819shvlUbsZfAuTIVerU,42562
+xradio/image/_util/_casacore/xds_from_casacore.py,sha256=4puiE2_1-7Y1-0yK7L8FYyDp5Ab8hEhDjLvoXiGMx9E,42561
 xradio/image/_util/_casacore/xds_to_casacore.py,sha256=P6c-yoOjuVQkm07ApA7FFKfje4aPwV-MsRFKaRaPq9I,15338
 xradio/image/_util/_fits/xds_from_fits.py,sha256=kpZ2gdbDQtoUD1DdQZymup5OVnB3e73D66LruLYESsw,28445
 xradio/image/_util/_zarr/common.py,sha256=apMX_bF4Hr3pFGjnDFpp36KgmhTYAPBZquNkjBHrsXk,307
-xradio/image/_util/_zarr/xds_from_zarr.py,sha256=QfDJC1_7FQw0ixFiBq-3CSgmQMv_1tw4sdv0zcOWeDs,3602
+xradio/image/_util/_zarr/xds_from_zarr.py,sha256=4b6KHmAcnrhBbCi-Z7e3Lm6l6wziJL1zaNIohmPAYDk,3601
 xradio/image/_util/_zarr/xds_to_zarr.py,sha256=wogXbwX8n3Sl9PHoc3_Y_LBowQsQ-94HZQFZ5NcxUZA,1624
-xradio/image/_util/_zarr/zarr_low_level.py,sha256=yl8An3eW_wOpgFdMyuYEt5YiIH6Y7UH8CH5KaXCMMq4,12787
+xradio/image/_util/_zarr/zarr_low_level.py,sha256=_skL70DhtmVjmxRJsfZaospt3rndB9l-2QoHFF1kAKE,12786
 xradio/schema/__init__.py,sha256=EzEMnOtN8G_wdjo8QBRKfq5MrYgfr_nt1pfunlI6i6Q,733
 xradio/schema/bases.py,sha256=5BiE6gAq2xmaJEyiaGbpCSoNek83ly9f0R0Rv1rx9DM,17081
 xradio/schema/check.py,sha256=Quugw5pC-c3c6C_JujSOQSfU_XVFIwymmg8wM0IZtXY,18521
@@ -31,43 +31,43 @@ xradio/schema/metamodel.py,sha256=WjtW7pAVzcjLRWifRH3sQoOiN6TV810hARpOIz1M_gw,38
 xradio/schema/typing.py,sha256=8-o6fZd99kJ4FVdgBYRTIRJ-wDqpcUNXzCTfJvl3TIw,10439
 xradio/vis/__init__.py,sha256=oOaHEnHp799cu72Zwo4WUQdrgFE2JCy-O0XVhaz3C2w,381
 xradio/vis/_processing_set.py,sha256=rvPAU5ksfODDDaJQBzBlZaHQDSDseV6UqCxN2Qa5gxs,12097
-xradio/vis/convert_msv2_to_processing_set.py,sha256=ZgnuOTXGKTlOG9fhuCN1uaTp4RPRbqUuBr0V3MBxS5A,5907
+xradio/vis/convert_msv2_to_processing_set.py,sha256=x5P9P8BZiK243iFi5kjn3i4gMgaGbozSN1sh1bgyYNI,5906
 xradio/vis/load_processing_set.py,sha256=sQmKG04grVn9jqOrhGc8K6B2-tk65NR0GBW8I8W62cI,5755
-xradio/vis/read_processing_set.py,sha256=hDbbHk4sSUH0f6HKpV_yy7ZfcWR2d9kYQE9KItyLXeY,4171
+xradio/vis/read_processing_set.py,sha256=8h1UDXFZqwObs6J6p5ef0FSA9ILW3A6I_6HMbQrbRFc,4170
 xradio/vis/schema.py,sha256=pQelyv3f6uIW12UKT_sB8KETyXpMX8klPeUOpq4dyd8,44858
 xradio/vis/_vis_utils/__init__.py,sha256=Scu6rKJ2SpO8aG7F-xdTZcYfyWx0viV8gFh8E8ur_gI,93
-xradio/vis/_vis_utils/ms.py,sha256=hkJHFDC6O4PNhqDALX7CJ-krEpF9vxu-N_ur-UXi0Zo,4311
-xradio/vis/_vis_utils/zarr.py,sha256=OYCOdUVUE-KbG0-OZKIbD0bFpOy1tt2YqiQMStVzHDs,3948
+xradio/vis/_vis_utils/ms.py,sha256=m7cYGZGbdCD3uSPe1BldgRurZ4Y-K3vJr6aePUVyGjE,4310
+xradio/vis/_vis_utils/zarr.py,sha256=d7T7P2rLzHTvoH7jh4FsiqkFq-PHsxRHUhM4mxbZI9M,3947
 xradio/vis/_vis_utils/_ms/chunks.py,sha256=JTPk3il6fk570BjWZMoOAtsbvnLmqPcBv9EPY6A2yOs,2964
-xradio/vis/_vis_utils/_ms/conversion.py,sha256=gCcOnVbbaFYyuD87shOjedfi1CTIkq3V7IX9T68A5Gg,38890
-xradio/vis/_vis_utils/_ms/create_antenna_xds.py,sha256=bNqqOwkm0hNz29ZhSNQQGg7BY9_Iq8ryqvAP4Dk7o1g,17182
-xradio/vis/_vis_utils/_ms/create_field_and_source_xds.py,sha256=3fhz0pM6KWM-YOqSCLAXaG5kVPwaW0shSQr6kLYWv5g,29776
+xradio/vis/_vis_utils/_ms/conversion.py,sha256=KTpv5CaPYVsqu3WQI-j4yZiNL3NWn6sev905tAyzq8I,38889
+xradio/vis/_vis_utils/_ms/create_antenna_xds.py,sha256=WMX1Av328Et0o56pTcva5tYSOFlu-mBxhJJHp33rb3k,17181
+xradio/vis/_vis_utils/_ms/create_field_and_source_xds.py,sha256=d_WlX_xA33rpHS8Dhqct8HmczZfteA2W7CHC1EPuZEw,30897
 xradio/vis/_vis_utils/_ms/descr.py,sha256=dYK8mhXxODIh-dfqaOm-YZb7kmoN1N2golX_RFncO94,5215
 xradio/vis/_vis_utils/_ms/msv2_msv3.py,sha256=9AKs2HWly7Ivv_Cjr11dIPGmm33_rtSBoGF9wN5ZwEQ,116
-xradio/vis/_vis_utils/_ms/msv2_to_msv4_meta.py,sha256=ztPFLbzcBSYXOMRIkSQmnXOr1JIkrfFGwbmxGmdmuRQ,1615
+xradio/vis/_vis_utils/_ms/msv2_to_msv4_meta.py,sha256=gk9gU7g2Lk7dmaiLW8qecOEt574pRtGsCHnUnHXM3D0,1614
 xradio/vis/_vis_utils/_ms/msv4_infos.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xradio/vis/_vis_utils/_ms/msv4_sub_xdss.py,sha256=CABRBI0LyOX23DRYgTBPOugBVnKw6CPBVkbKy_ku3a8,13018
+xradio/vis/_vis_utils/_ms/msv4_sub_xdss.py,sha256=DaLIqC05AZbkdc-XiahesYwfRFyLXNlWW4DoBv72d5I,10649
 xradio/vis/_vis_utils/_ms/optimised_functions.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xradio/vis/_vis_utils/_ms/partition_queries.py,sha256=ttVtkrykZekATEhyg7U-2CrIdpc-bvAgWAzMN3UMvAM,14574
-xradio/vis/_vis_utils/_ms/partitions.py,sha256=_HSXNb6DJZwax3fLjD9FVCt2S_s3Q7U0SI9g2yDRKFY,12980
-xradio/vis/_vis_utils/_ms/subtables.py,sha256=ZsqVNjXjTDz5dxQnLPzE_GOjk1AassT38ivUSrz1-d4,3944
+xradio/vis/_vis_utils/_ms/partition_queries.py,sha256=hEe3VAzGqtEPg3X4GUhvHaxyesjS6WVy5et421qSdZg,14573
+xradio/vis/_vis_utils/_ms/partitions.py,sha256=_KhRq8bSx2QxuWp9K57fLoLxcU6kvJ35e6wvJ-THbwc,12979
+xradio/vis/_vis_utils/_ms/subtables.py,sha256=6--dh6betXhlxGejzcJJd8bYdiNkl5ppzLoyorofZ6c,3943
 xradio/vis/_vis_utils/_ms/_tables/load.py,sha256=IR3fdKlq8rgH4bHmB1JTtB5gSGuITIvErJEVjUA8rWM,1799
-xradio/vis/_vis_utils/_ms/_tables/load_main_table.py,sha256=XnAQ-3Bi5YqClEM7Pqfy5ZSJUlXOsHjsYNWlBQjv_UM,14799
-xradio/vis/_vis_utils/_ms/_tables/read.py,sha256=gagdeV_50tF5AKqUYqNcWPYdo1kf83JuxNvmOee18eg,42556
-xradio/vis/_vis_utils/_ms/_tables/read_main_table.py,sha256=N74HnRJb0yRD-a38ee65ZYXAHaRZeTeZT0zuUK0taD8,26057
-xradio/vis/_vis_utils/_ms/_tables/read_subtables.py,sha256=b4qP7U6VIN2Oo6KMjGBZD_atCZ8D6LWzkpah9IA3jsk,12439
+xradio/vis/_vis_utils/_ms/_tables/load_main_table.py,sha256=_Ov4cs5t06RqfmrAHZoYwpb8K27b7iqjIkCMsJ0TR6o,14798
+xradio/vis/_vis_utils/_ms/_tables/read.py,sha256=ZrDHvUoyiAJu6P_2LIpedZgrDuWBwMi99RdMHrj6wyY,42555
+xradio/vis/_vis_utils/_ms/_tables/read_main_table.py,sha256=8AbNt-AxrhPK3EPRa7xqJXffxzIgfVsv1BDfoVJEXLU,26056
+xradio/vis/_vis_utils/_ms/_tables/read_subtables.py,sha256=JM6pGUQtjQR881u9VqakmbJjppEFq-EVKnEZ14JqnAw,12438
 xradio/vis/_vis_utils/_ms/_tables/table_query.py,sha256=q8EGFf_zIwHcHnvFJOn8hPh8zFZQ3f7BGbXvL3bHad4,555
-xradio/vis/_vis_utils/_ms/_tables/write.py,sha256=41zA8JdNVzsvfZPpAvwgI4YbOlwWUDTRpHUexGf-0zA,9541
+xradio/vis/_vis_utils/_ms/_tables/write.py,sha256=43XQ-tHhbhex0eUTRknNpPEEOnNR-w1lGCox9WZ9NHE,9540
 xradio/vis/_vis_utils/_ms/_tables/write_exp_api.py,sha256=GDEll8nMwkQGc6vosu4UddFL5_ld7WurRgF9hYFTRmU,15511
 xradio/vis/_vis_utils/_utils/cds.py,sha256=OpvKowSheIthUbcPEv2AoKmxlEt3DqJZS5C1AYh5z10,1179
 xradio/vis/_vis_utils/_utils/partition_attrs.py,sha256=JaePHts_A0EbB4K-0a_uC98RZ2EmfjB9pDSEI11oAwk,3401
 xradio/vis/_vis_utils/_utils/stokes_types.py,sha256=DMa8TmmS7BQ99Xm8c7ZjcRapMtLbrKVxrt4f0qUIOvg,561
-xradio/vis/_vis_utils/_utils/xds_helper.py,sha256=DYYCuaQqOWfS2ykuyoXAPbmX72_roSEHyK3yrV9sGC4,13219
+xradio/vis/_vis_utils/_utils/xds_helper.py,sha256=jZWR55e574j9NJ4Yf5HdHD7J7QtKdXbXStbblQ66WdE,13218
 xradio/vis/_vis_utils/_zarr/encoding.py,sha256=GENIlThV6a9CUCL6gIGlu9c6NR3OFWNos6mpxZjMwDc,536
-xradio/vis/_vis_utils/_zarr/read.py,sha256=9UKX_kKztE5jhsriBPnLhWtbptk5DRSVUEHT8V5qh8w,7597
-xradio/vis/_vis_utils/_zarr/write.py,sha256=vebYh-rAKfY3Feuv6H400s-2UuciPtfZMIlMtb23YSk,10044
-xradio-0.0.39.dist-info/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
-xradio-0.0.39.dist-info/METADATA,sha256=rK20i5YCzn_dFrIdjQEXE-1z7RhLAAcpuVfW97Z_JiY,4418
-xradio-0.0.39.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
-xradio-0.0.39.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
-xradio-0.0.39.dist-info/RECORD,,
+xradio/vis/_vis_utils/_zarr/read.py,sha256=O9DiwD2Gn8WiatQ-Q6WGGSwjsXwFktG4f81lM-mgcSg,7596
+xradio/vis/_vis_utils/_zarr/write.py,sha256=k5IfqtI44Dm4KBDiKFGhL5hN7kwNOulvVHmeP5Mi7N4,10043
+xradio-0.0.40.dist-info/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
+xradio-0.0.40.dist-info/METADATA,sha256=JSY0V_0Zij1K06oFq-4U_z8rRIZCDFsbBadezmVS-jM,4443
+xradio-0.0.40.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+xradio-0.0.40.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
+xradio-0.0.40.dist-info/RECORD,,

{xradio-0.0.39.dist-info → xradio-0.0.40.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any