xradio 0.0.43__tar.gz → 0.0.44__tar.gz

{xradio-0.0.43/src/xradio.egg-info → xradio-0.0.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xradio
-Version: 0.0.43
+Version: 0.0.44
 Summary:  Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>
 License: BSD 3-Clause License

{xradio-0.0.43 → xradio-0.0.44}/pyproject.toml

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

{xradio-0.0.43 → xradio-0.0.44}/src/xradio/image/_util/_casacore/xds_from_casacore.py

@@ -174,15 +174,13 @@ def _casa_image_to_xds_attrs(img_full_path: str, history: bool = True) -> dict:
             "type": "sky_coord",
             "equinox": ap_equinox if ap_equinox else None,
             "value": [0.0, 0.0],
-            "cdelt": [0.0, 0.0],
             "units": ["rad", "rad"],
         }
-        for c, r in zip(["crval", "cdelt"], ["value", "cdelt"]):
-            for i in range(2):
-                unit = u.Unit(_get_unit(coord_dir_dict["units"][i]))
-                q = coord_dir_dict[c][i] * unit
-                x = q.to("rad")
-                dir_dict["reference"][r][i] = x.value
+        for i in range(2):
+            unit = u.Unit(_get_unit(coord_dir_dict["units"][i]))
+            q = coord_dir_dict["crval"][i] * unit
+            x = q.to("rad")
+            dir_dict["reference"]["value"][i] = x.value
         k = "latpole"
         if k in coord_dir_dict:
             for j in (k, "longpole"):

{xradio-0.0.43 → xradio-0.0.44}/src/xradio/image/_util/_casacore/xds_to_casacore.py

@@ -24,7 +24,7 @@ def _compute_direction_dict(xds: xr.Dataset) -> dict:
     direction["projection_parameters"] = xds_dir["projection_parameters"]
     direction["units"] = np.array(xds_dir["reference"]["units"], dtype="<U16")
     direction["crval"] = np.array(xds_dir["reference"]["value"])
-    direction["cdelt"] = np.array(xds_dir["reference"]["cdelt"])
+    direction["cdelt"] = np.array((xds.l.cdelt, xds.m.cdelt))
     direction["crpix"] = _compute_sky_reference_pixel(xds)
     direction["pc"] = np.array(xds_dir["pc"])
     direction["axes"] = ["Right Ascension", "Declination"]

{xradio-0.0.43 → xradio-0.0.44}/src/xradio/image/_util/_fits/xds_from_fits.py

@@ -176,7 +176,6 @@ def _xds_direction_attrs_from_header(helpers: dict, header) -> dict:
         "equinox": ref_eqx,
         "units": ["rad", "rad"],
         "value": [0.0, 0.0],
-        "cdelt": [0.0, 0.0],
     }
     dir_axes = helpers["dir_axes"]
     for i in dir_axes:
@@ -185,7 +184,6 @@ def _xds_direction_attrs_from_header(helpers: dict, header) -> dict:
         direction["reference"]["value"][i] = x.value
         x = helpers["cdelt"][i] * u.Unit(_get_unit(helpers["cunit"][i]))
         x = x.to("rad")
-        direction["reference"]["cdelt"][i] = x.value
     direction["latpole"] = {
         "value": header["LATPOLE"] * _deg_to_rad,
         "units": "rad",

{xradio-0.0.43 → xradio-0.0.44}/src/xradio/image/_util/image_factory.py

@@ -68,7 +68,6 @@ def _add_common_attrs(
                 "equinox": "J2000",
                 "value": list(phase_center),
                 "units": ["rad", "rad"],
-                "cdelt": [-abs(cell_size[0]), abs(cell_size[1])],
             },
             "longpole": {"type": "quantity", "value": np.pi, "units": "rad"},
             "latpole": {"type": "quantity", "value": 0.0, "units": "rad"},

{xradio-0.0.43 → xradio-0.0.44}/src/xradio/measurement_set/measurement_set_xds.py

@@ -47,7 +47,7 @@ class MeasurementSetXds(xr.Dataset):
             if "xds" in attrs_name:
                 del copy_cor_xds.attrs[attrs_name]
                 xr.Dataset.to_zarr(
-                    self.attrs[attrs_name], os.path.join(store, attrs_name, **kwargs)
+                    self.attrs[attrs_name], os.path.join(store, attrs_name), **kwargs
                 )
 
         # Save copy_cor_xds as zarr file.
@@ -78,10 +78,11 @@ class MeasurementSetXds(xr.Dataset):
         >>> # Select data group 'corrected' and polarization 'XX' using a dict.
         >>> selected_ms_xds = ms_xds.sel({'data_group_name':'corrected', 'polarization':'XX')
         """
+
         if "data_group_name" in indexers_kwargs:
             data_group_name = indexers_kwargs["data_group_name"]
             del indexers_kwargs["data_group_name"]
-        if (indexers is not None) and ("data_group_name" in indexers):
+        elif (indexers is not None) and ("data_group_name" in indexers):
             data_group_name = indexers["data_group_name"]
             del indexers["data_group_name"]
         else:
@@ -99,11 +100,17 @@ class MeasurementSetXds(xr.Dataset):
 
             data_variables_to_drop = list(set(data_variables_to_drop))
 
-            return MeasurementSetXds(
+            sel_ms_xds = MeasurementSetXds(
                 super()
                 .sel(indexers, method, tolerance, drop, **indexers_kwargs)
                 .drop_vars(data_variables_to_drop)
             )
+
+            sel_ms_xds.attrs["data_groups"] = {
+                data_group_name: self.attrs["data_groups"][data_group_name]
+            }
+
+            return sel_ms_xds
         else:
             return MeasurementSetXds(
                 super().sel(indexers, method, tolerance, drop, **indexers_kwargs)

{xradio-0.0.43 → xradio-0.0.44}/src/xradio/measurement_set/processing_set.py

@@ -193,10 +193,10 @@ class ProcessingSet(dict):
 
         spw_ids = []
         freq_axis_list = []
-        frame = self.get(0).frequency.attrs["frame"]
+        frame = self.get(0).frequency.attrs["observer"]
         for ms_xds in self.values():
             assert (
-                frame == ms_xds.frequency.attrs["frame"]
+                frame == ms_xds.frequency.attrs["observer"]
             ), "Frequency reference frame not consistent in Processing Set."
             if ms_xds.frequency.attrs["spectral_window_id"] not in spw_ids:
                 spw_ids.append(ms_xds.frequency.attrs["spectral_window_id"])

{xradio-0.0.43 → xradio-0.0.44/src/xradio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xradio
-Version: 0.0.43
+Version: 0.0.44
 Summary:  Xarray Radio Astronomy Data IO
 Author-email: Jan-Willem Steeb <jsteeb@nrao.edu>
 License: BSD 3-Clause License