Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Pylint complaints for GLD360-reader. #2992

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix Pylint complaints for GLD360-reader. #2992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11d8d3e
Fix Pylint complaints.
sjoro Nov 21, 2024
ae59e53
Refactor get_dataset in gld360_ualf2-filehandler.
sjoro Nov 21, 2024
7230cfb
Refactor get_dataset in gld360_ualf2-filehandler.
sjoro Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 32 additions & 21 deletions satpy/readers/gld360_ualf2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,23 +91,33 @@ class VaisalaGld360Ualf2FileHandler(BaseFileHandler):

def __init__(self, filename, filename_info, filetype_info):
"""Initialize FileHandler."""
super(VaisalaGld360Ualf2FileHandler, self).__init__(filename, filename_info, filetype_info)

self.data = dd.read_csv(filename,
sep="\t",
header=None,
names=UALF2_COLUMN_NAMES,
dtype=UALF2_DTYPES,
converters={"nanosecond": self.pad_nanoseconds}
)

combined_time = (self.data["year"] + " " +
self.data["month"] + " " +
self.data["day"] + " " +
self.data["hour"] + " " +
self.data["minute"] + " " +
self.data["second"] + " " +
self.data["nanosecond"])
super(VaisalaGld360Ualf2FileHandler, self).__init__(
filename, filename_info, filetype_info
)

self.data = dd.read_csv(
filename,
sep="\t",
names=UALF2_COLUMN_NAMES,
dtype=UALF2_DTYPES,
converters={"nanosecond": self.pad_nanoseconds},
)

combined_time = (
self.data["year"]
+ " "
+ self.data["month"]
+ " "
+ self.data["day"]
+ " "
+ self.data["hour"]
+ " "
+ self.data["minute"]
+ " "
+ self.data["second"]
+ " "
+ self.data["nanosecond"]
)

self.data["time"] = dd.to_datetime(combined_time, format="%Y %m %d %H %M %S %f")
self.data = self.data.drop_duplicates()
Expand All @@ -126,10 +136,11 @@ def end_time(self):
def get_dataset(self, dataset_id, dataset_info):
"""Return the dataset."""
# create xarray and place along y dimension
data_array = xr.DataArray(self.data[dataset_id["name"]].to_dask_array(lengths=True), dims=["y"])
# assign dataset infos to xarray attrs
data_array.attrs.update(dataset_info)
return data_array
dask_structure = self.data[dataset_id["name"]]
dask_array = dask_structure.to_dask_array(lengths=dask_structure.compute().shape)
xarr = xr.DataArray(dask_array, dims=["y"])
xarr.attrs.update(dataset_info)
return xarr

@staticmethod
def pad_nanoseconds(nanoseconds):
Expand Down
58 changes: 33 additions & 25 deletions satpy/tests/reader_tests/test_gld360_ualf2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
def fake_file(tmp_path):
"""Create UALF2 file for the tests."""
fname = tmp_path / "2021.01.04.08.00.txt"
with open(fname, "w") as fid:
with open(fname, "w", encoding="utf-8") as fid:
fid.write(
u"2\t3\t2021\t1\t4\t8\t0\t1\t51\t-20.8001\t-158.3439\t0\t0\t10\t0\t0\t1\t3\t3\t9.47\t1.91\t1.59\t"
"0.19\t11.4\t8.8\t0.0\t1\t1\t0\t1\n"
"2\t3\t2021\t1\t4\t8\t0\t1\t864782486\t0.4381\t-0.8500\t0\t0\t-20\t0\t1\t0\t4\t5\t24.99\t1.95\t1.53\t"
"1.53\t14.0\t12.9\t-0.0\t0\t1\t0\t1\n"
"2\t3\t2021\t1\t4\t8\t0\t1\t864782486\t0.4381\t-0.8500\t0\t0\t-20\t0\t1\t0\t4\t5\t24.99\t1.95\t1.53\t"
"1.53\t14.0\t12.9\t-0.0\t0\t1\t0\t1\n"
"2\t3\t2021\t1\t4\t8\t0\t1\t897014133\t66.8166\t42.4914\t0\t0\t15\t0\t0\t1\t5\t7\t103.87\t4.33\t1.46\t"
"0.48\t22.0\t12.3\t0.0\t1\t1\t0\t1"
"2\t3\t2021\t1\t4\t8\t0\t1\t51\t-20.8001\t-158.3439\t0\t0\t10\t0\t0\t1\t3\t3\t9.47\t"
"1.91\t1.59\t0.19\t11.4\t8.8\t0.0\t1\t1\t0\t1\n"
"2\t3\t2021\t1\t4\t8\t0\t1\t864782486\t0.4381\t-0.8500\t0\t0\t-20\t0\t1\t0\t4\t5\t"
"24.99\t1.95\t1.53\t1.53\t14.0\t12.9\t-0.0\t0\t1\t0\t1\n"
"2\t3\t2021\t1\t4\t8\t0\t1\t864782486\t0.4381\t-0.8500\t0\t0\t-20\t0\t1\t0\t4\t5\t"
"24.99\t1.95\t1.53\t1.53\t14.0\t12.9\t-0.0\t0\t1\t0\t1\n"
"2\t3\t2021\t1\t4\t8\t0\t1\t897014133\t66.8166\t42.4914\t0\t0\t15\t0\t0\t1\t5\t7\t"
"103.87\t4.33\t1.46\t0.48\t22.0\t12.3\t0.0\t1\t1\t0\t1"
)

return fname
Expand All @@ -60,7 +60,7 @@ def fake_filehandler(fake_file):


def test_ualf2_record_type(fake_filehandler):
"""Test ualf record type."""
"""Test UALF2 record type."""
expected = np.array([2, 2, 2])
dataset_id = make_dataid(name="ualf_record_type")
dataset_info = {}
Expand All @@ -79,8 +79,14 @@ def test_network_type(fake_filehandler):

def test_time(fake_filehandler):
"""Test time."""
expected = np.array(["2021-01-04T08:00:01.000000051", "2021-01-04T08:00:01.864782486",
"2021-01-04T08:00:01.897014133"], dtype="datetime64[ns]")
expected = np.array(
[
"2021-01-04T08:00:01.000000051",
"2021-01-04T08:00:01.864782486",
"2021-01-04T08:00:01.897014133",
],
dtype="datetime64[ns]",
)
dataset_id = make_dataid(name="time")
dataset_info = {}
actual = fake_filehandler.get_dataset(dataset_id, dataset_info).values
Expand Down Expand Up @@ -215,7 +221,7 @@ def test_chi_squared_value_location_optimization(fake_filehandler):

def test_wave_form_rise_time(fake_filehandler):
"""Test wave form rise time."""
expected = np.array([11.4, 14., 22.])
expected = np.array([11.4, 14.0, 22.0])
dataset_id = make_dataid(name="wave_form_rise_time")
dataset_info = {}
actual = fake_filehandler.get_dataset(dataset_id, dataset_info).values
Expand Down Expand Up @@ -298,29 +304,31 @@ def test_column_names_length():


@pytest.fixture
def fake_scn(fake_file):
def fake_scene(fake_file):
"""Create fake file for tests."""
from satpy import Scene

scn = Scene(reader="gld360_ualf2", filenames=[fake_file])
return scn


def test_scene_attributes(fake_scn):
def test_scene_attributes(fake_scene):
"""Test for correct start and end times."""
np.testing.assert_equal(fake_scn.start_time, TEST_START_TIME)
np.testing.assert_equal(fake_scn.end_time, TEST_END_TIME)
np.testing.assert_equal(fake_scene.start_time, TEST_START_TIME)
np.testing.assert_equal(fake_scene.end_time, TEST_END_TIME)


def test_scene_load(fake_scn):
def test_scene_load(fake_scene):
"""Test data loading through Scene-object."""
fake_scn.load(["time", "latitude", "longitude"])
assert "time" in fake_scn
assert "latitude" in fake_scn
assert "longitude" in fake_scn
fake_scene.load(["time", "latitude", "longitude"])
assert "time" in fake_scene
assert "latitude" in fake_scene
assert "longitude" in fake_scene


def test_area_(fake_scn):
def test_area_(fake_scene):
"""Test correct area instance type."""
from pyresample.geometry import SwathDefinition
fake_scn.load(["time"])
assert isinstance(fake_scn["time"].attrs["area"], SwathDefinition)

fake_scene.load(["time"])
assert isinstance(fake_scene["time"].attrs["area"], SwathDefinition)
Loading