xradio 1.1.0__tar.gz → 1.1.12a0__tar.gz

{xradio-1.1.0/src/xradio.egg-info → xradio-1.1.12a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xradio
-Version: 1.1.0
+Version: 1.1.12a0
 Summary:  Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>, Federico Montesino Pouzols <pouzols@eso.edu>, Dave Mehringer <dmehring@nrao.edu>, Peter Wortmann <peter.wortmann@skao.int>
 License: BSD 3-Clause License

{xradio-1.1.0 → xradio-1.1.12a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xradio"
-version = "v1.1.0"
+version = "v1.1.12-alpha"
 description = " Xarray Radio Astronomy Data IO"
 authors = [
     {name = "Jan-Willem Steeb", email="jsteeb@nrao.edu"},

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/_utils/zarr/common.py

@@ -1,6 +1,7 @@
 import xarray as xr
 import os
 
+
 # from xradio.vis._vis_utils._ms.msv2_to_msv4_meta import (
 #     column_description_casacore_to_msv4_measure,
 # )

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/image/_util/_casacore/xds_from_casacore.py

@@ -381,12 +381,14 @@ def _casa_image_to_xds_coords(
     attrs["sphr_dims"] = sphr_dims
     coords = {}
     coord_attrs = {}
-    coords["time"], coord_attrs["time"] = _get_time_values_attrs(coord_dict)
-    coords["frequency"], coord_attrs["frequency"] = _get_freq_values_attrs(csys, shape)
-    velocity_vals, coord_attrs["velocity"] = _get_velocity_values_attrs(
+    (coords["time"], coord_attrs["time"]) = _get_time_values_attrs(coord_dict)
+    (coords["frequency"], coord_attrs["frequency"]) = _get_freq_values_attrs(
+        csys, shape
+    )
+    (velocity_vals, coord_attrs["velocity"]) = _get_velocity_values_attrs(
         coord_dict, coords["frequency"]
     )
-    coords["polarization"], coord_attrs["polarization"] = _get_pol_values_attrs(
+    (coords["polarization"], coord_attrs["polarization"]) = _get_pol_values_attrs(
         coord_dict
     )
     coords["velocity"] = (["frequency"], velocity_vals)
@@ -683,7 +685,6 @@ def _get_persistent_block(
     block = _read_image_chunk(infile, shapes, starts)
     block = np.expand_dims(block, new_axes)
     block = block.transpose(transpose_list)
-    block = da.from_array(block, chunks=block.shape)
     block = xr.DataArray(block, dims=dimorder)
     return block
 

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/image/_util/_zarr/common.py

@@ -1,5 +1,6 @@
 import numpy as np
 
+
 _np_types = {
     "complex128": np.complex128,
     "complex64": np.complex64,

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/image/_util/casacore.py

@@ -202,6 +202,7 @@ def _xds_to_multiple_casa_images(xds: xr.Dataset, image_store_name: str) -> None
                             ]
 
                         if "flag" in xds.attrs["data_groups"][data_group]:
+                            print("******* found flag")
                             mask_sky_name = xds.attrs["data_groups"][data_group]["flag"]
                             image_to_write_xds["MASK_0"] = xds[mask_sky_name]
                             image_to_write_xds["SKY"].attrs["flag"] = "MASK_0"

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/image/_util/image_factory.py

@@ -337,16 +337,7 @@ def detect_store_type(store):
                 raise ValueError("Unknown directory structure." + str(store))
         else:
             logger.error("Path does not exist.")
-            raise ValueError(
-                "Path does not exist. The current path: "
-                + str(os.system("pwd"))
-                + " .The current casa directory: "
-                + str(os.system("ls 3c286_Band6_5chans_lsrk_robust_0.5_niter_99_casa"))
-                + ". The current fits directory: "
-                + str(os.system("ls 3c286_Band6_5chans_lsrk_robust_0.5_niter_99_fits"))
-                + " The given store "
-                + str(store)
-            )
+            raise ValueError("Path does not exist." + str(store))
     else:
         store_type = "zarr"
 

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/measurement_set/_utils/_msv2/_tables/read.py

@@ -93,12 +93,9 @@ def convert_mjd_time(rawtimes: np.ndarray) -> np.ndarray:
     np.ndarray
         times converted to pandas reference and datetime type
     """
-
-    print("^^^^^^^", rawtimes, MJD_DIF_UNIX, SECS_IN_DAY)
     times_reref = pd.to_datetime(
         (rawtimes - MJD_DIF_UNIX) * SECS_IN_DAY, unit="s"
     ).values
-    print("^^^^^^^", times_reref)
 
     return times_reref
 
@@ -163,7 +160,7 @@ def make_taql_where_between_min_max(
     if min_max_range is None:
         taql = None
     else:
-        min_val, max_val = min_max_range
+        (min_val, max_val) = min_max_range
         taql = f"where {colname} >= {min_val} AND {colname} <= {max_val}"
 
     return taql
@@ -229,7 +226,7 @@ def find_projected_min_max_array(
     """Does the min/max checks and search for find_projected_min_max_table()"""
 
     sorted_array = np.sort(array)
-    range_min, range_max = min_max
+    (range_min, range_max) = min_max
     if len(sorted_array) < 2:
         tol = np.finfo(sorted_array.dtype).eps * 4
     else:
@@ -894,8 +891,7 @@ def raw_col_data_to_coords_vars(
 
     if col in timecols:
         if col == "MJD":
-            # data = convert_mjd_time(data).astype("float64") / 1e9
-            data = convert_mjd_time(data).astype("datetime64[ns]").view("int64") / 1e9
+            data = convert_mjd_time(data).astype("float64") / 1e9
         else:
             try:
                 data = convert_casacore_time(data, False)

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/measurement_set/_utils/_msv2/create_field_and_source_xds.py

@@ -285,7 +285,6 @@ def extract_ephemeris_info(
     # 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.
-
     time_ephemeris_dim = ["time_ephemeris"]
     to_new_data_variables = {
         # mandatory: SOURCE_RADIAL_VELOCITY

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/measurement_set/_utils/_utils/interpolate.py

@@ -41,10 +41,6 @@ def interpolate_to_time(
             method = "linear"
         else:
             method = "nearest"
-
-        # print("xds before interp:",xds.NORTH_POLE_ANGULAR_DISTANCE.values, xds[time_name].values)
-        # print("interp_time data:",interp_time,interp_time.data)
-        # print("method:",method)
         xds = xds.interp(
             {time_name: interp_time.data}, method=method, assume_sorted=True
         )
@@ -60,6 +56,5 @@ def interpolate_to_time(
             f"{message_prefix}: interpolating the time coordinate "
             f"from {points_before} to {points_after} points"
         )
-        # print("xds after interp:",xds.NORTH_POLE_ANGULAR_DISTANCE.values, xds[time_name].values)
 
     return xds

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/measurement_set/_utils/_utils/partition_attrs.py

@@ -2,6 +2,7 @@ from typing import Dict, TypedDict, Union
 
 import xarray as xr
 
+
 PartitionIds = TypedDict(
     "PartitionIds",
     {

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/schema/common.py

@@ -9,6 +9,7 @@ from xradio.schema.bases import (
 from xradio.schema.typing import Attr, Coord, Coordof, Data, Dataof, Name
 import numpy
 
+
 # Dimensions
 Time = Literal["time"]
 """ Observation time dimension """

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/testing/measurement_set/msv2_io.py

@@ -19,6 +19,7 @@ from casacore.tables import default_ms, default_ms_subtable
 from casacore.tables.tableutil import makedminfo, maketabdesc
 from casacore.tables.msutil import complete_ms_desc, makearrcoldesc, required_ms_desc
 
+
 # 2 observations, 2 fields, 2 states
 # 2 SPWs, 4 polarizations
 default_ms_descr = {

{xradio-1.1.0 → xradio-1.1.12a0/src/xradio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xradio
-Version: 1.1.0
+Version: 1.1.12a0
 Summary:  Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>, Federico Montesino Pouzols <pouzols@eso.edu>, Dave Mehringer <dmehring@nrao.edu>, Peter Wortmann <peter.wortmann@skao.int>
 License: BSD 3-Clause License

{xradio-1.1.0 → xradio-1.1.12a0}/src/xradio/measurement_set/_utils/_msv2/msv4_sub_xdss.py

@@ -27,6 +27,7 @@ from xradio.measurement_set._utils._msv2._tables.read import (
     table_has_column,
 )
 
+
 standard_time_coord_attrs = make_time_measure_attrs(time_format="unix")
 
 
@@ -80,7 +81,6 @@ def rename_and_interpolate_to_time(
     )
 
     # rename the time_* axis to time.
-
     time_coord = {"time": (time_initial_name, interp_time.data)}
     renamed_time_xds = interpolated_xds.assign_coords(time_coord)
     renamed_time_xds.coords["time"].attrs.update(standard_time_coord_attrs)