xradio 0.0.53__tar.gz → 0.0.54__tar.gz

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

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

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

{xradio-0.0.53 → xradio-0.0.54}/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"]
 

{xradio-0.0.53 → xradio-0.0.54}/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.54}/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.54/src/xradio.egg-info}/PKG-INFO

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