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 L1B reader sensor not matching VIIRS SDR reader #2083

Merged
merged 3 commits into from
Apr 11, 2022
Merged

Fix VIIRS L1B reader sensor not matching VIIRS SDR reader #2083

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
8b18d95
Fix VIIRS L1B reader sensor not matching VIIRS SDR reader
djhoese Apr 8, 2022
1d873bd
Update viirs_l1b tests to use pytest
djhoese Apr 11, 2022
69d1315
Remove unnecessary string handling in viirs_l1b reader
djhoese Apr 11, 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
6 changes: 1 addition & 5 deletions satpy/readers/viirs_l1b.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ def platform_name(self):
@property
def sensor_name(self):
"""Get sensor name."""
res = self['/attr/instrument']
if isinstance(res, np.ndarray):
return str(res.astype(str))
else:
return res
return self['/attr/instrument'].lower()

def adjust_scaling_factors(self, factors, file_units, output_units):
"""Adjust scaling factors."""
Expand Down
76 changes: 40 additions & 36 deletions satpy/tests/reader_tests/test_viirs_l1b.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"""Module for testing the satpy.readers.viirs_l1b module."""

import os
import unittest
from datetime import datetime, timedelta
from unittest import mock

Expand Down Expand Up @@ -69,7 +68,7 @@ def get_test_content(self, filename, filename_info, filetype_info):
'/attr/time_coverage_start': dt.strftime('%Y-%m-%dT%H:%M:%S.000Z'),
'/attr/time_coverage_end': (dt + timedelta(minutes=6)).strftime('%Y-%m-%dT%H:%M:%S.000Z'),
'/attr/orbit_number': 26384,
'/attr/instrument': 'viirs',
'/attr/instrument': 'VIIRS',
'/attr/platform': 'Suomi-NPP',
}
self._fill_contents_with_default_data(file_content, file_type)
Expand Down Expand Up @@ -152,12 +151,12 @@ def _set_dataset_specific_metadata(file_content):
file_content[k + '/attr/add_offset'] = 0.1


class TestVIIRSL1BReader(unittest.TestCase):
class TestVIIRSL1BReader:
"""Test VIIRS L1B Reader."""

yaml_file = "viirs_l1b.yaml"

def setUp(self):
def setup_method(self):
"""Wrap NetCDF4 file handler with our own fake handler."""
from satpy._config import config_search_paths
from satpy.readers.viirs_l1b import VIIRSL1BFileHandler
Expand All @@ -167,7 +166,7 @@ def setUp(self):
self.fake_handler = self.p.start()
self.p.is_local = True

def tearDown(self):
def teardown_method(self):
"""Stop wrapping the NetCDF4 file handler."""
self.p.stop()

Expand All @@ -178,10 +177,10 @@ def test_init(self):
loadables = r.select_files_from_pathnames([
'VL1BM_snpp_d20161130_t012400_c20161130054822.nc',
])
self.assertEqual(len(loadables), 1)
assert len(loadables) == 1
r.create_filehandlers(loadables)
# make sure we have some files
self.assertTrue(r.file_handlers)
assert r.file_handlers

def test_load_every_m_band_bt(self):
"""Test loading all M band brightness temperatures."""
Expand All @@ -197,13 +196,14 @@ def test_load_every_m_band_bt(self):
'M14',
'M15',
'M16'])
self.assertEqual(len(datasets), 5)
assert len(datasets) == 5
for v in datasets.values():
self.assertEqual(v.attrs['calibration'], 'brightness_temperature')
self.assertEqual(v.attrs['units'], 'K')
self.assertEqual(v.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lons.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lats.attrs['rows_per_scan'], 2)
assert v.attrs['calibration'] == 'brightness_temperature'
assert v.attrs['units'] == 'K'
assert v.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lons.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lats.attrs['rows_per_scan'] == 2
assert v.attrs['sensor'] == "viirs"

def test_load_every_m_band_refl(self):
"""Test loading all M band reflectances."""
Expand All @@ -225,13 +225,14 @@ def test_load_every_m_band_refl(self):
'M09',
'M10',
'M11'])
self.assertEqual(len(datasets), 11)
assert len(datasets) == 11
for v in datasets.values():
self.assertEqual(v.attrs['calibration'], 'reflectance')
self.assertEqual(v.attrs['units'], '%')
self.assertEqual(v.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lons.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lats.attrs['rows_per_scan'], 2)
assert v.attrs['calibration'] == 'reflectance'
assert v.attrs['units'] == '%'
assert v.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lons.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lats.attrs['rows_per_scan'] == 2
assert v.attrs['sensor'] == "viirs"

def test_load_every_m_band_rad(self):
"""Test loading all M bands as radiances."""
Expand Down Expand Up @@ -259,13 +260,14 @@ def test_load_every_m_band_rad(self):
make_dataid(name='M14', calibration='radiance'),
make_dataid(name='M15', calibration='radiance'),
make_dataid(name='M16', calibration='radiance')])
self.assertEqual(len(datasets), 16)
assert len(datasets) == 16
for v in datasets.values():
self.assertEqual(v.attrs['calibration'], 'radiance')
self.assertEqual(v.attrs['units'], 'W m-2 um-1 sr-1')
self.assertEqual(v.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lons.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lats.attrs['rows_per_scan'], 2)
assert v.attrs['calibration'] == 'radiance'
assert v.attrs['units'] == 'W m-2 um-1 sr-1'
assert v.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lons.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lats.attrs['rows_per_scan'] == 2
assert v.attrs['sensor'] == "viirs"

def test_load_dnb_radiance(self):
"""Test loading the main DNB dataset."""
Expand All @@ -277,13 +279,14 @@ def test_load_dnb_radiance(self):
])
r.create_filehandlers(loadables)
datasets = r.load(['DNB'])
self.assertEqual(len(datasets), 1)
assert len(datasets) == 1
for v in datasets.values():
self.assertEqual(v.attrs['calibration'], 'radiance')
self.assertEqual(v.attrs['units'], 'W m-2 sr-1')
self.assertEqual(v.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lons.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lats.attrs['rows_per_scan'], 2)
assert v.attrs['calibration'] == 'radiance'
assert v.attrs['units'] == 'W m-2 sr-1'
assert v.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lons.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lats.attrs['rows_per_scan'] == 2
assert v.attrs['sensor'] == "viirs"

def test_load_dnb_angles(self):
"""Test loading all DNB angle datasets."""
Expand All @@ -301,9 +304,10 @@ def test_load_dnb_angles(self):
'dnb_lunar_zenith_angle',
'dnb_lunar_azimuth_angle',
])
self.assertEqual(len(datasets), 6)
assert len(datasets) == 6
for v in datasets.values():
self.assertEqual(v.attrs['units'], 'degrees')
self.assertEqual(v.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lons.attrs['rows_per_scan'], 2)
self.assertEqual(v.attrs['area'].lats.attrs['rows_per_scan'], 2)
assert v.attrs['units'] == 'degrees'
assert v.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lons.attrs['rows_per_scan'] == 2
assert v.attrs['area'].lats.attrs['rows_per_scan'] == 2
assert v.attrs['sensor'] == "viirs"