Fixes for isel

dschwoerer · Feb 5, 2025 · 04d36f9 · 04d36f9
1 parent 123c79d
commit 04d36f9
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/xemc3/core/dataset.py b/xemc3/core/dataset.py
@@ -220,7 +220,7 @@ def iter_zones(self):
             yield self.data
         else:
             for i in range(len(self.data.zone)):
-                yield self.isel(zone=i)
+                yield self.isel(zone=i, drop=True)
 
     def iter_plates(self, *, symmetry=False, segments=1):
         """
@@ -503,16 +503,23 @@ def isel(
             else:
                 vi = int(v)
                 fac = v - vi
-                ds_ = (ds.isel({k: vi}) * xr.DataArray([1 - fac, fac], dims=dk)).sum(
-                    dim=dk, skipna=False
-                )
+                dsa = xr.Dataset({c: ds[c] for c in ds if dk in ds[c].dims})
+                if len(list(dsa)):
+                    ds_ = (
+                        dsa.isel({k: vi}) * xr.DataArray([1 - fac, fac], dims=dk)
+                    ).sum(dim=dk, skipna=False)
+                else:
+                    ds_ = dsa
+                for co in ds:
+                    if dk not in ds[co].dims:
+                        ds_[co] = ds[co].isel({k: vi}, missing_dims="ignore")
                 for co in ds.coords:
                     if dk in ds.coords[co].dims:
                         ds_[co] = (
                             ds[co].isel({k: vi}) * xr.DataArray([1 - fac, fac], dims=dk)
                         ).sum(dim=dk)
                     else:
-                        ds_[co] = ds[co]
+                        ds_[co] = ds[co].isel({k: vi}, missing_dims="ignore")
                 ds = ds_
         xas = {}
         for k in ds.dims: