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

Update VIIRS EDR Active Fires #733

Merged
merged 19 commits into from
May 9, 2019
Merged

Update VIIRS EDR Active Fires #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1de4110
VIIRS Fires Fix
rdaruwala Apr 25, 2019
f91d52b
Add T4 as a param
rdaruwala Apr 25, 2019
6eeecfb
Fix test
rdaruwala Apr 25, 2019
9023584
Update tests
rdaruwala Apr 25, 2019
85af34d
Fix file parse err
rdaruwala Apr 25, 2019
53e5765
Fix len assert err
rdaruwala Apr 25, 2019
1586b6c
Fix file type errs
rdaruwala Apr 25, 2019
d9a43d9
Fix rename error
rdaruwala Apr 25, 2019
b10369f
Remove prints
rdaruwala Apr 25, 2019
6d2552a
Fix spacing errors
rdaruwala Apr 26, 2019
34a05cb
Remove unsupported type
rdaruwala Apr 26, 2019
451df51
Reader modifications
rdaruwala May 2, 2019
6f3bd22
Separate text readers
rdaruwala May 2, 2019
e0e5a9e
Add platform elaborations and add checks to tests
rdaruwala May 2, 2019
69505ef
Fix stickler
rdaruwala May 2, 2019
ed6af44
Code optimization
rdaruwala May 2, 2019
e32799a
Testing test fix
rdaruwala May 3, 2019
3457048
Add mock to viirs_edr_active_fires tests
rdaruwala May 3, 2019
9c72cbd
Fix mock 2.7 error
rdaruwala May 3, 2019
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
49 changes: 36 additions & 13 deletions satpy/etc/readers/viirs_edr_active_fires.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,67 @@ reader:
sensors: [viirs]

file_types:
fires_netcdf_img:
file_reader: !!python/name:satpy.readers.viirs_edr_active_fires.VIIRSActiveFiresFileHandler
variable_prefix: ""
file_patterns:
- 'AFIMG_{satellite_name}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.nc'
fires_netcdf:
file_reader: !!python/name:satpy.readers.viirs_edr_active_fires.VIIRSActiveFiresFileHandler
variable_prefix: "Fire Pixels/"
file_patterns:
- 'AFEDR_npp_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.nc'
- 'AFEDR_{satellite_name}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.nc'
- 'AFMOD_{satellite_name}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.nc'
fires_text_img:
file_reader: !!python/name:satpy.readers.viirs_edr_active_fires.VIIRSActiveFiresTextFileHandler
file_patterns:
- 'AFIMG_{satellite_name}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.txt'
fires_text:
file_reader: !!python/name:satpy.readers.viirs_edr_active_fires.VIIRSActiveFiresTextFileHandler
file_patterns:
- 'AFEDR_npp_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.txt'
- 'AFMOD_{satellite_name}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.txt'
- 'AFEDR_{satellite_name}_d{start_time:%Y%m%d_t%H%M%S%f}_e{end_time:%H%M%S%f}_b{orbit:5d}_c{creation_time}_{source}.txt'

datasets:
detection_confidence:
name: detection_confidence
standard_name: fire_confidence
confidence_cat:
name: confidence_cat
file_type: [fires_netcdf_img, fires_text_img]
file_key: "{variable_prefix}FP_confidence"
coordinates: [longitude, latitude]
units: '[7,8,9]->[lo,med,hi]'
confidence_pct:
name: confidence_pct
file_type: [fires_netcdf, fires_text]
file_key: "Fire Pixels/FP_confidence"
file_key: "{variable_prefix}FP_confidence"
coordinates: [longitude, latitude]
units: '%'
longitude:
name: longitude
standard_name: longitude
file_type: [fires_netcdf, fires_text]
file_key: "Fire Pixels/FP_longitude"
file_type: [fires_netcdf_img, fires_netcdf, fires_text_img, fires_text]
file_key: "{variable_prefix}FP_longitude"
units: 'degrees'
latitude:
name: latitude
standard_name: latitude
file_type: [fires_netcdf, fires_text]
file_key: "Fire Pixels/FP_latitude"
file_type: [fires_netcdf_img, fires_netcdf, fires_text_img, fires_text]
file_key: "{variable_prefix}FP_latitude"
units: 'degrees'
power:
name: power
file_type: [fires_netcdf, fires_text]
file_key: "Fire Pixels/FP_power"
file_type: [fires_netcdf_img, fires_netcdf, fires_text_img, fires_text]
file_key: "{variable_prefix:s}FP_power"
coordinates: [longitude, latitude]
units: 'MW'
T13:
name: T13
file_type: [fires_netcdf, fires_text]
file_key: "Fire Pixels/FP_T13"
file_key: "{variable_prefix}FP_T13"
coordinates: [longitude, latitude]
units: 'K'
T4:
name: T4
file_type: [fires_netcdf_img, fires_text_img]
file_key: "{variable_prefix}FP_T4"
coordinates: [longitude, latitude]
units: 'K'
39 changes: 28 additions & 11 deletions satpy/readers/viirs_edr_active_fires.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ class VIIRSActiveFiresFileHandler(NetCDF4FileHandler):
"""NetCDF4 reader for VIIRS Active Fires
"""

def __init__(self, filename, filename_info, filetype_info,
auto_maskandscale=False, xarray_kwargs=None):
super(VIIRSActiveFiresFileHandler, self).__init__(
filename, filename_info, filetype_info)
self.prefix = filetype_info.get('variable_prefix')

def get_dataset(self, dsid, dsinfo):
"""Get dataset function

Expand All @@ -43,11 +49,15 @@ def get_dataset(self, dsid, dsinfo):
Dask DataArray: Data

"""
data = self[dsinfo.get('file_key', dsid.name)]

key = dsinfo.get('file_key', dsid.name).format(variable_prefix=self.prefix)
data = self[key]
data.attrs.update(dsinfo)

data.attrs["platform_name"] = self['/attr/satellite_name']
data.attrs["sensor"] = self['/attr/instrument_name']
platform_key = {"NPP": "Suomi-NPP", "J01": "NOAA-20", "J02": "NOAA-21"}

data.attrs["platform_name"] = platform_key.get(self.filename_info['satellite_name'].upper(), "unknown")
data.attrs["sensor"] = "VIIRS"

return data

Expand Down Expand Up @@ -79,21 +89,28 @@ def __init__(self, filename, filename_info, filetype_info):
filename_info: Filename information
filetype_info: Filetype information
"""

if filetype_info.get('file_type') == 'fires_text_img':
self.file_content = dd.read_csv(filename, skiprows=15, header=None,
names=["latitude", "longitude",
"T4", "Along-scan", "Along-track", "confidence_cat",
"power"])
else:
self.file_content = dd.read_csv(filename, skiprows=15, header=None,
names=["latitude", "longitude",
"T13", "Along-scan", "Along-track", "confidence_pct",
"power"])

super(VIIRSActiveFiresTextFileHandler, self).__init__(filename, filename_info, filetype_info)

if not os.path.isfile(filename):
return
platform_key = {"NPP": "Suomi-NPP", "J01": "NOAA-20", "J02": "NOAA-21"}

self.file_content = dd.read_csv(filename, skiprows=15, header=None,
names=["latitude", "longitude",
"T13", "Along-scan", "Along-track", "detection_confidence",
"power"])
self.platform_name = platform_key.get(self.filename_info['satellite_name'].upper(), "unknown")

def get_dataset(self, dsid, dsinfo):
ds = self[dsid.name].to_dask_array(lengths=True)
data_array = xr.DataArray(ds, dims=("y",), attrs={"platform_name": "unknown", "sensor": "viirs"})
data_array = xr.DataArray(ds, dims=("y",), attrs={"platform_name": self.platform_name, "sensor": "VIIRS"})
data_array.attrs.update(dsinfo)

return data_array

@property
Expand Down
Loading