xradio 0.0.39__tar.gz → 0.0.40__tar.gz

{xradio-0.0.39/src/xradio.egg-info → xradio-0.0.40}/PKG-INFO

@@ -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 → xradio-0.0.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xradio"
-version = "0.0.39"
+version = "0.0.40"
 description = " Xarray Radio Astronomy Data IO"
 authors = [
     {name = "Jan-Willem Steeb", email="jsteeb@nrao.edu"},
@@ -14,6 +14,7 @@ dependencies = [
     'dask',
     'distributed',
     'graphviper',
+    'toolviper',
     'matplotlib',
     'numba>=0.57.0',
     'numpy',

{xradio-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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-0.0.39 → xradio-0.0.40}/src/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