xradio 0.0.53__tar.gz → 0.0.55__tar.gz

{xradio-0.0.53/src/xradio.egg-info → xradio-0.0.55}/PKG-INFO

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

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

{xradio-0.0.53 → xradio-0.0.55}/src/xradio/image/_util/_casacore/xds_from_casacore.py

@@ -54,30 +54,6 @@ def _add_lin_attrs(xds, coord_dict, dir_axes):
     return xds
 
 
-def _add_freq_attrs(xds, coord_dict):
-    freq_coord = xds["frequency"]
-    meta = {}
-    for k in coord_dict:
-        if k.startswith("spectral"):
-            sd = coord_dict[k]
-            meta["rest_frequency"] = make_quantity(sd["restfreq"], "Hz")
-            meta["type"] = "frequency"
-            # meta["units"] = sd["unit"]
-            # meta["frame"] = sd["system"]
-            meta["wave_unit"] = sd["waveUnit"]
-            # meta["crval"] = sd["wcs"]["crval"]
-            # meta["cdelt"] = sd["wcs"]["cdelt"]
-            meta["reference_value"] = make_frequency_reference_dict(
-                value=sd["wcs"]["crval"],
-                units=sd["unit"],
-                observer=sd["system"],
-            )
-    if not meta:
-        # this is the default frequency information CASA creates
-        meta = _default_freq_info()
-    freq_coord.attrs = meta
-
-
 def _add_mask(
     xds: xr.Dataset, name: str, ary: Union[np.ndarray, da.array], dimorder: list
 ) -> xr.Dataset:
@@ -553,7 +529,7 @@ def _get_freq_values_attrs(
                 # attrs["type"] = "frequency"
                 # attrs["units"] = sd["unit"]
                 # attrs["frame"] = sd["system"]
-                attrs["wave_unit"] = sd["waveUnit"]
+                attrs["wave_unit"] = [sd["waveUnit"]]
                 # attrs["crval"] = sd["wcs"]["crval"]
                 # attrs["cdelt"] = sd["wcs"]["cdelt"]
 
@@ -623,36 +599,6 @@ def _get_mask_names(infile: str) -> list:
     return mymasks
 
 
-def _get_beam(imageinfo: dict, nchan: int, npol: int) -> Union[np.ndarray, None]:
-    """Returns None if the image has no beam(s)"""
-    x = ["perplanebeams", "restoringbeam"]
-    r = None
-    for z in x:
-        if z in imageinfo:
-            r = z
-            break
-    if r is None:
-        return None
-    beam = imageinfo[r]
-    beam_array = np.zeros([1, nchan, npol, 3])
-    if r == "perplanebeams":
-        for c in range(nchan):
-            for p in range(npol):
-                k = nchan * p + c
-                b = _casacore_q_to_xradio_q(beam["*" + str(k)])
-                beam_dict = _convert_beam_to_rad(b)
-                beam_array[0][c][p][0] = beam_dict["major"]["data"]
-                beam_array[0][c][p][1] = beam_dict["minor"]["data"]
-                beam_array[0][c][p][2] = beam_dict["pa"]["data"]
-    elif r == "restoringbeam":
-        b = _casacore_q_to_xradio_q(beam)
-        beam_dict = _convert_beam_to_rad(b)
-        beam_array[0, :, :, 0] = beam_dict["major"]["data"]
-        beam_array[0, :, :, 1] = beam_dict["minor"]["data"]
-        beam_array[0, :, :, 2] = beam_dict["pa"]["data"]
-    return beam_array
-
-
 def _get_persistent_block(
     infile: str,
     shapes: tuple,
@@ -858,25 +804,46 @@ def _get_velocity_values_attrs(
     )
 
 
-def _multibeam_array(
-    xds: xr.Dataset, img_full_path: str, as_dask_array: bool
+def _get_beam(
+    img_full_path: str, nchan: int, npol: int, as_dask_array: bool
 ) -> Union[xr.DataArray, None]:
     # the image may have multiple beams
     with _open_image_ro(img_full_path) as casa_image:
         imageinfo = casa_image.info()["imageinfo"]
-    mb = _get_beam(
-        imageinfo, nchan=xds.sizes["frequency"], npol=xds.sizes["polarization"]
-    )
-    if mb is not None:
-        if as_dask_array:
-            mb = da.array(mb)
-        xdb = xr.DataArray(mb, dims=["time", "frequency", "polarization", "beam_param"])
-        xdb = xdb.rename("BEAM")
-        xdb = xdb.assign_coords(beam_param=["major", "minor", "pa"])
-        xdb.attrs["units"] = "rad"
-        return xdb
-    else:
+    x = ["perplanebeams", "restoringbeam"]
+    r = None
+    for z in x:
+        if z in imageinfo:
+            r = z
+            break
+    if r is None:
         return None
+    beam = imageinfo[r]
+    beam_array = np.zeros([1, nchan, npol, 3])
+    if r == "perplanebeams":
+        for c in range(nchan):
+            for p in range(npol):
+                k = nchan * p + c
+                b = _casacore_q_to_xradio_q(beam["*" + str(k)])
+                beam_dict = _convert_beam_to_rad(b)
+                beam_array[0][c][p][0] = beam_dict["major"]["data"]
+                beam_array[0][c][p][1] = beam_dict["minor"]["data"]
+                beam_array[0][c][p][2] = beam_dict["pa"]["data"]
+    elif r == "restoringbeam":
+        b = _casacore_q_to_xradio_q(beam)
+        beam_dict = _convert_beam_to_rad(b)
+        beam_array[0, :, :, 0] = beam_dict["major"]["data"]
+        beam_array[0, :, :, 1] = beam_dict["minor"]["data"]
+        beam_array[0, :, :, 2] = beam_dict["pa"]["data"]
+    if as_dask_array:
+        beam_array = da.array(beam_array)
+    xdb = xr.DataArray(
+        beam_array, dims=["time", "frequency", "polarization", "beam_param"]
+    )
+    xdb = xdb.rename("BEAM")
+    xdb = xdb.assign_coords(beam_param=["major", "minor", "pa"])
+    xdb.attrs["units"] = "rad"
+    return xdb
 
 
 ###########################################################################

{xradio-0.0.53 → xradio-0.0.55}/src/xradio/image/_util/_casacore/xds_to_casacore.py

@@ -88,9 +88,11 @@ def _compute_spectral_dict(xds: xr.Dataset) -> dict:
     spec["unit"] = u if isinstance(u, str) else u[0]
     spec["velType"] = _doppler_types.index(xds.velocity.attrs["doppler_type"])
     u = xds.velocity.attrs["units"]
-    spec["velUnit"] = u if isinstance(u, str) else u[0]
     spec["version"] = 2
-    spec["waveUnit"] = xds.frequency.attrs["wave_unit"]
+    # vel unit is a list[str] in the xds but needs to be a str in the casa image
+    spec["velUnit"] = xds.velocity.attrs["units"][0]
+    # wave unit is a list[str] in the xds but needs to be a str in the casa image
+    spec["waveUnit"] = xds.frequency.attrs["wave_unit"][0]
     wcs = {}
     wcs["ctype"] = "FREQ"
     wcs["pc"] = 1.0

{xradio-0.0.53 → xradio-0.0.55}/src/xradio/image/_util/_fits/xds_from_fits.py

@@ -83,7 +83,7 @@ def _add_freq_attrs(xds: xr.Dataset, helpers: dict) -> xr.Dataset:
         meta["rest_frequency"] = make_quantity(helpers["restfreq"], "Hz")
         meta["rest_frequencies"] = [meta["rest_frequency"]]
         meta["type"] = "frequency"
-        meta["wave_unit"] = "mm"
+        meta["wave_unit"] = ["mm"]
         freq_axis = helpers["freq_axis"]
         meta["reference_value"] = make_frequency_reference_dict(
             helpers["crval"][freq_axis], ["Hz"], helpers["specsys"]

{xradio-0.0.53 → xradio-0.0.55}/src/xradio/image/_util/casacore.py

@@ -21,7 +21,7 @@ from ._casacore.xds_from_casacore import (
     _get_persistent_block,
     _get_starts_shapes_slices,
     _get_transpose_list,
-    _multibeam_array,
+    _get_beam,
     _read_image_array,
 )
 from ._casacore.xds_to_casacore import (
@@ -42,6 +42,8 @@ def _load_casa_image_block(infile: str, block_des: dict, do_sky_coords) -> xr.Da
         cshape = casa_image.shape()
     ret = _casa_image_to_xds_coords(image_full_path, False, do_sky_coords)
     xds = ret["xds"].isel(block_des)
+    nchan = ret["xds"].dims["frequency"]
+    npol = ret["xds"].dims["polarization"]
     starts, shapes, slices = _get_starts_shapes_slices(block_des, coords, cshape)
     dimorder = _get_xds_dim_order(ret["sphr_dims"])
     transpose_list, new_axes = _get_transpose_list(coords)
@@ -60,13 +62,14 @@ def _load_casa_image_block(infile: str, block_des: dict, do_sky_coords) -> xr.Da
         # data vars are all caps by convention
         xds = _add_mask(xds, m.upper(), block, dimorder)
     xds.attrs = _casa_image_to_xds_attrs(image_full_path)
-    mb = _multibeam_array(xds, image_full_path, False)
-    if mb is not None:
-        selectors = {}
-        for k in ("time", "frequency", "polarization"):
-            if k in block_des:
-                selectors[k] = block_des[k]
-        xds["BEAM"] = mb.isel(selectors)
+    beam = _get_beam(image_full_path, nchan, npol, False)
+    if beam is not None:
+        selectors = {
+            k: block_des[k]
+            for k in ("time", "frequency", "polarization")
+            if k in block_des
+        }
+        xds["BEAM"] = beam.isel(selectors)
     return xds
 
 
@@ -97,9 +100,11 @@ def _read_casa_image(
             # data var names are all caps by convention
             xds = _add_mask(xds, m.upper(), ary, dimorder)
     xds.attrs = _casa_image_to_xds_attrs(img_full_path)
-    mb = _multibeam_array(xds, img_full_path, True)
-    if mb is not None:
-        xds["BEAM"] = mb
+    beam = _get_beam(
+        img_full_path, xds.dims["frequency"], xds.dims["polarization"], True
+    )
+    if beam is not None:
+        xds["BEAM"] = beam
     # xds = _add_coord_attrs(xds, ret["icoords"], ret["dir_axes"])
     xds = _dask_arrayize_dv(xds)
     return xds

{xradio-0.0.53 → xradio-0.0.55}/src/xradio/image/image.py

@@ -159,7 +159,7 @@ def load_image(infile: str, block_des: dict = {}, do_sky_coords=True) -> xr.Data
         do_casa = False
     if do_casa:
         # comment next line when done debugging
-        # return _load_casa_image_block(infile, bd, do_sky_coords)
+        # return _load_casa_image_block(infile, selection, do_sky_coords)
         try:
             return _load_casa_image_block(infile, selection, do_sky_coords)
         except Exception as e:

{xradio-0.0.53 → xradio-0.0.55/src/xradio.egg-info}/PKG-INFO

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