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

Add VIIRS Fire Temperature rgb #728

Merged
merged 11 commits into from
May 7, 2019
Merged

Add VIIRS Fire Temperature rgb #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c10e2ea
Merge pull request #8 from pytroll/master
adybbroe Apr 11, 2019
722df5c
Merge pull request #9 from pytroll/master
adybbroe Apr 18, 2019
3e88e89
Add fire temperature RGB
adybbroe Apr 18, 2019
bae0796
Tune stretch interval so that RGB imagery fits the CIRA examples
adybbroe Apr 23, 2019
f882b93
Add a bit of gamma stretching to the RGB layers
adybbroe Apr 24, 2019
481d80d
Implementing four of the recipes from CIRA (curtis Seaman) and keepin…
adybbroe May 5, 2019
4d6e88e
Try explain how RGB recipes are made using composite and enhancement …
adybbroe May 6, 2019
e5a29ec
Remove SMHI/test version of the fire temperature RGB
adybbroe May 6, 2019
ddf9352
Add system tests
mraspaud May 7, 2019
c3fb04f
Cleanup yaml files
mraspaud May 7, 2019
f310d60
Revert "Try explain how RGB recipes are made using composite and enha…
adybbroe May 6, 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
44 changes: 44 additions & 0 deletions satpy/etc/composites/viirs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,50 @@ composites:
standard_name: false_color
high_resolution_band: blue

fire_temperature:
# CIRA: Original VIIRS
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
- name: M12
calibration: radiance
- name: M11
calibration: radiance
- name: M10
calibration: radiance
standard_name: fire_temperature
name: fire_temperature
fire_temperature_awips:
# CIRA: EUMETSAT
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
- name: M12
- name: M11
- name: M10
standard_name: fire_temperature
name: fire_temperature_awips

fire_temperature_eumetsat:
# CIRA: AWIPS
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
- name: M12
- name: M11
- name: M10
standard_name: fire_temperature
name: fire_temperature_eumetsat
fire_temperature_39refl:
# CIRA: All bands in Reflectance units (%)
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
- name: M12
modifiers: [nir_reflectance_lowres]
- name: M11
modifiers: [sunz_corrected]
- name: M10
modifiers: [sunz_corrected]
standard_name: fire_temperature
name: fire_temperature_39refl

natural_color:
compositor: !!python/name:satpy.composites.RatioSharpenedRGB
prerequisites:
Expand Down
6 changes: 3 additions & 3 deletions satpy/etc/composites/visir.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ composites:
- 1.6
- 0.6
standard_name: convection

snow:
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
Expand All @@ -155,7 +155,7 @@ composites:
- wavelength: 3.9
modifiers: [nir_reflectance]
standard_name: snow

day_microphysics:
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
Expand All @@ -165,7 +165,7 @@ composites:
modifiers: [nir_reflectance]
- 10.8
standard_name: day_microphysics

dust:
compositor: !!python/name:satpy.composites.GenericCompositor
prerequisites:
Expand Down
55 changes: 55 additions & 0 deletions satpy/etc/enhancements/generic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,60 @@ enhancements:
- name: gamma
method: *gammafun
kwargs: {gamma: 1.8}

fire_temperature:
standard_name: fire_temperature
name: fire_temperature
operations:
- name: stretch
method: *stretchfun
kwargs:
stretch: crude
min_stretch: [0, 0, 0]
max_stretch: [3.5, 35., 85.]
- name: gamma
method: *gammafun
kwargs: {gamma: [1.0, 1.0, 1.0]}
fire_temperature_awips:
standard_name: fire_temperature
name: fire_temperature_awips
operations:
- name: stretch
method: *stretchfun
kwargs:
stretch: crude
min_stretch: [273.0, 0, 0]
max_stretch: [333.0, 100., 75.]
- name: gamma
method: *gammafun
kwargs: {gamma: [0.4, 1.0, 1.0]}
fire_temperature_eumetsat:
standard_name: fire_temperature
name: fire_temperature_eumetsat
operations:
- name: stretch
method: *stretchfun
kwargs:
stretch: crude
min_stretch: [273.0, 0, 0]
max_stretch: [350.0, 60., 60.]
- name: gamma
method: *gammafun
kwargs: {gamma: [1.0, 1.0, 1.0]}
fire_temperature_39refl:
standard_name: fire_temperature
name: fire_temperature_39refl
operations:
- name: stretch
method: *stretchfun
kwargs:
stretch: crude
min_stretch: [0, 0, 0]
max_stretch: [50., 100., 75.]
- name: gamma
method: *gammafun
kwargs: {gamma: [1.0, 1.0, 1.0]}

airmass_default:
standard_name: airmass
operations:
Expand All @@ -88,6 +142,7 @@ enhancements:
stretch: crude
min_stretch: [-25, -40, 243]
max_stretch: [0, 5, 208]

airmass_abi:
standard_name: airmass
sensor: abi
Expand Down
4 changes: 4 additions & 0 deletions satpy/tests/features/feature-real-load-process-write.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,3 +205,7 @@ Feature: Loading real data in many formats with the same command
| viirs_sdr | ash | eurol |
| viirs_sdr | natural_sun_lowres | eurol |
| viirs_sdr | snow_age | eurol |
| viirs_sdr | fire_temperature | eurol |
| viirs_sdr | fire_temperature_awips | eurol |
| viirs_sdr | fire_temperature_eumetsat | eurol |
| viirs_sdr | fire_temperature_39refl | eurol |