xradio 0.0.59__tar.gz → 0.0.60__tar.gz

{xradio-0.0.59/src/xradio.egg-info → xradio-0.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xradio
-Version: 0.0.59
+Version: 0.0.60
 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-0.0.59 → xradio-0.0.60}/pyproject.toml

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

{xradio-0.0.59 → xradio-0.0.60}/src/xradio/measurement_set/_utils/_msv2/conversion.py

@@ -1004,6 +1004,7 @@ def convert_and_write_partition(
     phase_cal_interpolate: bool = False,
     sys_cal_interpolate: bool = False,
     compressor: numcodecs.abc.Codec = numcodecs.Zstd(level=2),
+    add_reshaping_indices: bool = False,
     storage_backend="zarr",
     parallel_mode: str = "none",
     overwrite: bool = False,
@@ -1040,6 +1041,8 @@ def convert_and_write_partition(
         _description_, by default None
     compressor : numcodecs.abc.Codec, optional
         _description_, by default numcodecs.Zstd(level=2)
+    add_reshaping_indices : bool, optional
+        _description_, by default False
     storage_backend : str, optional
         _description_, by default "zarr"
     parallel_mode : _type_, optional
@@ -1368,6 +1371,12 @@ def convert_and_write_partition(
             else:
                 xds.attrs["type"] = "visibility"
 
+        # Add tidxs and bidxs for testing
+        if add_reshaping_indices:
+            xds["tidxs"] = tidxs
+            xds["bidxs"] = bidxs
+            xds["row_id"] = tb_tool.rownumbers()  # tb_tool.getcol("row_id")
+
         start = time.time()
         ms_v4_name = pathlib.Path(in_file).name.replace(".ms", "") + "_" + str(ms_v4_id)
         ms_xdt.ds = xds

{xradio-0.0.59 → xradio-0.0.60}/src/xradio/measurement_set/convert_msv2_to_processing_set.py

@@ -62,6 +62,7 @@ def convert_msv2_to_processing_set(
     sys_cal_interpolate: bool = False,
     use_table_iter: bool = False,
     compressor: numcodecs.abc.Codec = numcodecs.Zstd(level=2),
+    add_reshaping_indices: bool = False,
     storage_backend: str = "zarr",
     parallel_mode: str = "none",
     overwrite: bool = False,
@@ -98,6 +99,8 @@ def convert_msv2_to_processing_set(
         Whether to use the table iterator to read the main table of the MS v2. This should be set to True when reading datasets with large number of rows and few partitions, by default False.
     compressor : numcodecs.abc.Codec, optional
         The Blosc compressor to use when saving the converted data to disk using Zarr, by default numcodecs.Zstd(level=2).
+    add_reshaping_indices : bool, optional
+        Whether to add the tidxs, bidxs and row_id variables to each partition of the main dataset. These can be used to reshape the data back to the original ordering in the MS v2. This is mainly intended for testing and debugging, by default False.
     storage_backend : {"zarr", "netcdf"}, optional
         The on-disk format to use. "netcdf" is not yet implemented.
     parallel_mode : {"none", "partition", "time"}, optional
@@ -178,6 +181,7 @@ def convert_msv2_to_processing_set(
                     ephemeris_interpolate=ephemeris_interpolate,
                     phase_cal_interpolate=phase_cal_interpolate,
                     sys_cal_interpolate=sys_cal_interpolate,
+                    add_reshaping_indices=add_reshaping_indices,
                     compressor=compressor,
                     parallel_mode=parallel_mode,
                     overwrite=overwrite,
@@ -198,6 +202,7 @@ def convert_msv2_to_processing_set(
                 ephemeris_interpolate=ephemeris_interpolate,
                 phase_cal_interpolate=phase_cal_interpolate,
                 sys_cal_interpolate=sys_cal_interpolate,
+                add_reshaping_indices=add_reshaping_indices,
                 compressor=compressor,
                 parallel_mode=parallel_mode,
                 overwrite=overwrite,

{xradio-0.0.59 → xradio-0.0.60}/src/xradio/measurement_set/measurement_set_xdt.py

@@ -203,11 +203,14 @@ class MeasurementSetXdt:
         else:
             line_name = []
 
+        if "spectral_window_intent" not in self._xdt.frequency.attrs:
+            spw_intent = "UNSPECIFIED"
+        else:
+            spw_intent = self._xdt.frequency.attrs["spectral_window_intent"]
+
         partition_info = {
             "spectral_window_name": self._xdt.frequency.attrs["spectral_window_name"],
-            "spectral_window_intent": self._xdt.frequency.attrs[
-                "spectral_window_intent"
-            ],
+            "spectral_window_intent": spw_intent,
             "field_name": to_list(np.unique(field_and_source_xds.field_name.values)),
             "polarization_setup": to_list(self._xdt.polarization.values),
             "scan_name": to_list(np.unique(self._xdt.scan_name.values)),

{xradio-0.0.59 → xradio-0.0.60}/src/xradio/measurement_set/schema.py

@@ -789,7 +789,7 @@ class FlagArray:
             tuple[Time, BaselineId, Frequency, Polarization],
             tuple[Time, AntennaName, Frequency, Polarization],  # SD
         ],
-        bool,
+        Union[bool, numpy.uint8, numpy.uint16, numpy.uint32, numpy.uint64],
     ]
     time: Coordof[TimeCoordArray]
     baseline_id: Optional[Coordof[BaselineArray]]  # Only IF

{xradio-0.0.59 → xradio-0.0.60/src/xradio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xradio
-Version: 0.0.59
+Version: 0.0.60
 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