xradio 0.0.53__py3-none-any.whl → 0.0.54__py3-none-any.whl

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/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/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.dist-info → xradio-0.0.54.dist-info}/METADATA

@@ -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.dist-info → xradio-0.0.54.dist-info}/RECORD

@@ -17,9 +17,9 @@ xradio/image/_util/image_factory.py,sha256=Mm0ZDraD0WoNpGqy98EneFr1PxgfyNZNQwquI
 xradio/image/_util/zarr.py,sha256=lhQqVRC1GEWClG3zRbuDr2IlQBfXeDqaLUJIN-MVMxA,1652
 xradio/image/_util/_casacore/__init__.py,sha256=OlsiRE40o1jSbBI4khgQQzgfDYbAlOMKIhO4UFlbGhg,41
 xradio/image/_util/_casacore/common.py,sha256=Z7Jl3AU7jVcgjNtCnvL7CCXJQAxXeEtowXBmSShuAv4,1329
-xradio/image/_util/_casacore/xds_from_casacore.py,sha256=KOtXG7fwHyTTRyHprlbQOVcu1ZnrSv47zcP8Mu4SGSc,44036
-xradio/image/_util/_casacore/xds_to_casacore.py,sha256=0tSmRHZxUcoSBWD3IMH5ymBEK2RDVPQ1-My42LF9bxw,16922
-xradio/image/_util/_fits/xds_from_fits.py,sha256=kx5CNkzPn7t2wDkEK60O2VwrrUre3P9QchvsapudDHo,29189
+xradio/image/_util/_casacore/xds_from_casacore.py,sha256=ZLgOsQ9n-2sjho5xWeYk1I59QLBH0pqNrxAhF07HxSY,43172
+xradio/image/_util/_casacore/xds_to_casacore.py,sha256=snHCcbZQZtv329KNMd-RjYXG3pfNQeJQbOWKduY1uQc,17085
+xradio/image/_util/_fits/xds_from_fits.py,sha256=n2tAIOK5GoIKzYBqfwCjZULFYSz2x74aeVkCo0vmOL4,29191
 xradio/image/_util/_zarr/common.py,sha256=ltlj3uFa-uv8lXlDtV79QnfNmfm0tyhXN5FDAjZtjzg,308
 xradio/image/_util/_zarr/xds_from_zarr.py,sha256=KMsfaSSm9kyVoztS6pUzGNxMZzQnCxkk0kDv2GxW5Kw,4451
 xradio/image/_util/_zarr/xds_to_zarr.py,sha256=nsDvDD-kuMuMF2dDlj0jTxSW4mdR-jjIsvXHi5uIERU,2373
@@ -70,8 +70,8 @@ xradio/schema/metamodel.py,sha256=WjtW7pAVzcjLRWifRH3sQoOiN6TV810hARpOIz1M_gw,38
 xradio/schema/typing.py,sha256=8-o6fZd99kJ4FVdgBYRTIRJ-wDqpcUNXzCTfJvl3TIw,10439
 xradio/sphinx/__init__.py,sha256=VGY-7Ty3q67qpnBee0-znbiJ-Iy0F93UO--IpjEdHXc,380
 xradio/sphinx/schema_table.py,sha256=uq33habbAbReqnEG6ASKSd4UOMZGUzA3qoTX45rq84U,12373
-xradio-0.0.53.dist-info/licenses/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
-xradio-0.0.53.dist-info/METADATA,sha256=kKmHQUumboRASOFp-1VamR5TW9NRXzOsLlAPJX4fNxQ,5574
-xradio-0.0.53.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-xradio-0.0.53.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
-xradio-0.0.53.dist-info/RECORD,,
+xradio-0.0.54.dist-info/licenses/LICENSE.txt,sha256=9CYIJt7riOXo9AD0eXBZviLxo_HebD-2JJI8oiWtzfg,1807
+xradio-0.0.54.dist-info/METADATA,sha256=wGZFgvOO0xPUPXAUlVlrxyrYVXsUmD6fP7hOFn9mNOk,5574
+xradio-0.0.54.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+xradio-0.0.54.dist-info/top_level.txt,sha256=dQu27fGBZJ2Yk-gW5XeD-dZ76Xa4Xcvk60Vz-dwXp7k,7
+xradio-0.0.54.dist-info/RECORD,,

{xradio-0.0.53.dist-info → xradio-0.0.54.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.1.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any