diff --git a/satpy/readers/li_base_nc.py b/satpy/readers/li_base_nc.py index cefbcc7e55..a65129c904 100644 --- a/satpy/readers/li_base_nc.py +++ b/satpy/readers/li_base_nc.py @@ -742,7 +742,6 @@ def get_dataset(self, dataset_id, ds_info=None): # Retrieve default infos if missing: if ds_info is None: ds_info = self.get_dataset_infos(dataset_id["name"]) - # check for potential error: if ds_info is None: raise KeyError(f"No dataset registered for {dataset_id}") diff --git a/satpy/readers/li_l2_nc.py b/satpy/readers/li_l2_nc.py index 587039fa46..e69b6ffe5b 100644 --- a/satpy/readers/li_l2_nc.py +++ b/satpy/readers/li_l2_nc.py @@ -111,6 +111,10 @@ def get_dataset(self, dataset_id, ds_info=None): var_with_swath_coord = self.is_var_with_swath_coord(dataset_id) if var_with_swath_coord and self.with_area_def: data_array = self.get_array_on_fci_grid(data_array) + else : + if data_array is not None: + if not isinstance(data_array.data, da.Array): + data_array.data = da.from_array(data_array.data) return data_array def get_area_def(self, dsid): @@ -161,6 +165,7 @@ def get_array_on_fci_grid(self, data_array: xr.DataArray): data_2d = da.where(data_2d > 0, data_2d, np.nan) xarr = xr.DataArray(da.asarray(data_2d, CHUNK_SIZE), dims=("y", "x")) + xarr.attrs = attrs return xarr diff --git a/satpy/tests/reader_tests/test_li_l2_nc.py b/satpy/tests/reader_tests/test_li_l2_nc.py index 36cc930683..13981a37f4 100644 --- a/satpy/tests/reader_tests/test_li_l2_nc.py +++ b/satpy/tests/reader_tests/test_li_l2_nc.py @@ -19,6 +19,7 @@ import os from unittest import mock +import dask.array as da import numpy as np import pytest import xarray as xr @@ -128,6 +129,7 @@ def _test_dataset_variable(self, var_params, sname=""): res = self.get_variable_dataset(dataset_info, dname, handler) assert res.shape == shape assert res.dims[0] == "y" + assert isinstance(res.data,da.Array) # Should retrieve content with fullname key: full_name = self.create_fullname_key(desc, var_path, dname, sname=sname) # Note: 'content' is not recognized as a valid member of the class below