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 VIIRS EDR Active Fires reader for new format and fix fine/coarse 1D swath handling #2210

Merged
merged 3 commits into from Oct 6, 2022
Merged

Fix VIIRS EDR Active Fires reader for new format and fix fine/coarse 1D swath handling #2210

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
6e53c6d
Fix fine/coarse area checks for 1D SwathDefinitions
djhoese Sep 28, 2022
3b1c58f
Fix VIIRS EDR Active Fires reader using bad sensor and platform attri…
djhoese Sep 28, 2022
26b1988
Merge branch 'main' into bugix-viirsfires-sensor
djhoese Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions satpy/readers/viirs_edr_active_fires.py
View file
Open in desktop
Expand Up @@ -92,12 +92,12 @@ def end_time(self):
@property
def sensor_name(self):
"""Name of sensor for this file."""
return self["sensor"].lower()
return self["/attr/instrument_name"].lower()

@property
def platform_name(self):
"""Name of platform/satellite for this file."""
return self["platform_name"]
return self["/attr/satellite_name"]


class VIIRSActiveFiresTextFileHandler(BaseFileHandler):
Expand Down
3 changes: 2 additions & 1 deletion satpy/scene.py
View file
Open in desktop
Expand Up @@ -275,7 +275,8 @@ def _compare_swath_defs(compare_func: Callable, swath_defs: list[SwathDefinition
def _key_func(swath_def: SwathDefinition) -> tuple:
attrs = getattr(swath_def.lons, "attrs", {})
lon_ds_name = attrs.get("name")
return swath_def.shape[1], swath_def.shape[0], lon_ds_name
rev_shape = swath_def.shape[::-1]
return rev_shape + (lon_ds_name,)
return compare_func(swath_defs, key=_key_func)

def _gather_all_areas(self, datasets):
Expand Down
8 changes: 4 additions & 4 deletions satpy/tests/reader_tests/test_viirs_edr_active_fires.py
View file
Open in desktop
Expand Up @@ -61,8 +61,8 @@ def get_test_content(self, filename, filename_info, filename_type):
"""Mimic reader input file content."""
file_content = {}
file_content['/attr/data_id'] = "AFMOD"
file_content['satellite_name'] = "npp"
file_content['sensor'] = 'VIIRS'
file_content['/attr/satellite_name'] = "NPP"
file_content['/attr/instrument_name'] = 'VIIRS'

file_content['Fire Pixels/FP_latitude'] = DEFAULT_LATLON_FILE_DATA
file_content['Fire Pixels/FP_longitude'] = DEFAULT_LATLON_FILE_DATA
Expand All @@ -87,8 +87,8 @@ def get_test_content(self, filename, filename_info, filename_type):
"""Mimic reader input file content."""
file_content = {}
file_content['/attr/data_id'] = "AFIMG"
file_content['satellite_name'] = "npp"
file_content['sensor'] = 'VIIRS'
file_content['/attr/satellite_name'] = "NPP"
file_content['/attr/instrument_name'] = 'VIIRS'

file_content['Fire Pixels/FP_latitude'] = DEFAULT_LATLON_FILE_DATA
file_content['Fire Pixels/FP_longitude'] = DEFAULT_LATLON_FILE_DATA
Expand Down
13 changes: 10 additions & 3 deletions satpy/tests/test_scene.py
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
# satpy. If not, see <http://www.gnu.org/licenses/>.
"""Unit tests for scene.py."""

import math
import os
import random
import string
Expand Down Expand Up @@ -709,7 +710,7 @@ def test_storage_options_from_reader_kwargs_per_reader(self):

def _create_coarest_finest_data_array(shape, area_def, attrs=None):
data_arr = xr.DataArray(
da.arange(shape[0] * shape[1]).reshape(shape),
da.arange(math.prod(shape)).reshape(shape),
attrs={
'area': area_def,
})
Expand All @@ -735,8 +736,12 @@ def _create_coarsest_finest_area_def(shape, extents):

def _create_coarsest_finest_swath_def(shape, extents, name_suffix):
from pyresample import SwathDefinition
lons_arr = da.repeat(da.linspace(extents[0], extents[2], shape[1], dtype=np.float32)[None, :], shape[0], axis=0)
lats_arr = da.repeat(da.linspace(extents[1], extents[3], shape[0], dtype=np.float32)[:, None], shape[1], axis=1)
if len(shape) == 1:
lons_arr = da.linspace(extents[0], extents[2], shape[0], dtype=np.float32)
lats_arr = da.linspace(extents[1], extents[3], shape[0], dtype=np.float32)
else:
lons_arr = da.repeat(da.linspace(extents[0], extents[2], shape[1], dtype=np.float32)[None, :], shape[0], axis=0)
lats_arr = da.repeat(da.linspace(extents[1], extents[3], shape[0], dtype=np.float32)[:, None], shape[1], axis=1)
lons_data_arr = xr.DataArray(lons_arr, attrs={"name": f"longitude{name_suffix}"})
lats_data_arr = xr.DataArray(lats_arr, attrs={"name": f"latitude1{name_suffix}"})
return SwathDefinition(lons_data_arr, lats_data_arr)
Expand All @@ -754,6 +759,8 @@ class TestFinestCoarsestArea:
_create_coarsest_finest_area_def((4, 10), (-1000.0, -1500.0, 1000.0, 1500.0))),
(_create_coarsest_finest_swath_def((2, 5), (1000.0, 1500.0, -1000.0, -1500.0), "1"),
_create_coarsest_finest_swath_def((4, 10), (1000.0, 1500.0, -1000.0, -1500.0), "1")),
(_create_coarsest_finest_swath_def((5,), (1000.0, 1500.0, -1000.0, -1500.0), "1"),
_create_coarsest_finest_swath_def((10,), (1000.0, 1500.0, -1000.0, -1500.0), "1")),
]
)
def test_coarsest_finest_area_different_shape(self, coarse_area, fine_area):
Expand Down