Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion satpy/etc/composites/abi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ composites:
- name: C02
- name: C05

ash:
ash: &24h_microphysics
description: >
Ash RGB, for GOESR: NASA, NOAA
references:
Expand Down Expand Up @@ -946,3 +946,10 @@ composites:
- name: C05
- name: C02
standard_name: day_severe_storms

24h_microphysics_ash:
<< : *24h_microphysics
standard_name: 24h_microphysics_ash
description: >
Official WMO 24-hour microphysics ash RGB. Source:
https://wmoomm.sharepoint.com/:b:/s/wmocpdb/EexzMK-JLutNlqR77aiIr8UB2uQvHGE8WfFCq23P03obhQ?e=S9nzet
9 changes: 8 additions & 1 deletion satpy/etc/composites/ahi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ composites:
- name: B08
standard_name: airmass

ash:
ash: &24h_microphysics
compositor: !!python/name:satpy.composites.core.GenericCompositor
prerequisites:
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
Expand Down Expand Up @@ -518,3 +518,10 @@ composites:
- name: B05
- name: B03
standard_name: day_severe_storms

24h_microphysics_ash:
<< : *24h_microphysics
standard_name: 24h_microphysics_ash
description: >
Official WMO 24-hour microphysics ash RGB. Source:
https://wmoomm.sharepoint.com/:b:/s/wmocpdb/EexzMK-JLutNlqR77aiIr8UB2uQvHGE8WfFCq23P03obhQ?e=S9nzet
37 changes: 29 additions & 8 deletions satpy/etc/composites/fci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -571,15 +571,15 @@ composites:
volcanic_emissions:
compositor: !!python/name:satpy.composites.core.GenericCompositor
prerequisites:
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
prerequisites:
- wv_63
- wv_73
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
prerequisites:
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
prerequisites:
- wv_63
- wv_73
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
prerequisites:
- ir_105
- ir_87
- ir_105
- ir_87
- ir_105
standard_name: volcanic_emissions

day_severe_storms:
Expand Down Expand Up @@ -615,3 +615,24 @@ composites:
- name: nir_16
- name: vis_06
standard_name: day_severe_storms_tropical

24h_microphysics_dust: &24h_microphysics
compositor: !!python/name:satpy.composites.core.GenericCompositor
prerequisites:
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
prerequisites:
- ir_123
- ir_105
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
prerequisites:
- ir_105
- ir_87
- ir_105
standard_name: 24h_microphysics_dust

24h_microphysics_ash:
<< : *24h_microphysics
standard_name: 24h_microphysics_ash
description: >
Official WMO 24-hour microphysics ash RGB. Source:
https://wmoomm.sharepoint.com/:b:/s/wmocpdb/EexzMK-JLutNlqR77aiIr8UB2uQvHGE8WfFCq23P03obhQ?e=S9nzet
9 changes: 8 additions & 1 deletion satpy/etc/composites/seviri.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ composites:
- name: VIS006
standard_name: natural_color

fog:
fog: &24h_microphysics
compositor: !!python/name:satpy.composites.core.GenericCompositor
prerequisites:
- compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor
Expand Down Expand Up @@ -703,3 +703,10 @@ composites:
- IR_016
- VIS006
standard_name: day_severe_storms_tropical

24h_microphysics_ash:
<< : *24h_microphysics
standard_name: 24h_microphysics_ash
description: >
Official WMO 24-hour microphysics ash RGB. Source:
https://wmoomm.sharepoint.com/:b:/s/wmocpdb/EexzMK-JLutNlqR77aiIr8UB2uQvHGE8WfFCq23P03obhQ?e=S9nzet
10 changes: 10 additions & 0 deletions satpy/etc/enhancements/abi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -358,3 +358,13 @@ enhancements:
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs:
gamma: [10, 5.5, 5.5]

24h_microphysics_ash:
standard_name: 24h_microphysics_ash
operations:
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [-6.7, -6.0, 243.6]
max_stretch: [2.6, 6.3, 302.4]
14 changes: 14 additions & 0 deletions satpy/etc/enhancements/ahi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,17 @@ enhancements:
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs:
gamma: [1.0, 1.0, 1.0]

24h_microphysics_ash:
standard_name: 24h_microphysics_ash
operations:
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [-7.5, -1.6, 243.6]
max_stretch: [3.0, 4.9, 303.2]
- name: gamma
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs:
gamma: [1.0, 1.2, 1.0]
72 changes: 48 additions & 24 deletions satpy/etc/enhancements/fci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ enhancements:
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [ 0,0,0 ]
max_stretch: [ 1,1,1 ]
min_stretch: [0, 0, 0]
max_stretch: [1, 1, 1]

night_ir105:
standard_name: night_ir105
Expand Down Expand Up @@ -49,17 +49,17 @@ enhancements:
fire_temperature_fci_rad:
standard_name: fire_temperature_fci_rad
operations:
# note: the stretch parameters have been converted to wavelength units
# compared to e.g. the VIIRS recipe
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [0, 0, 0]
max_stretch: [5.1, 17.7, 22.0]
- name: gamma
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs: {gamma: [1.0, 1.0, 1.0]}
# note: the stretch parameters have been converted to wavelength units
# compared to e.g. the VIIRS recipe
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [0, 0, 0]
max_stretch: [5.1, 17.7, 22.0]
- name: gamma
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs: { gamma: [1.0, 1.0, 1.0] }

fci_flames_colorised:
standard_name: fci_flames_colorised
Expand All @@ -68,7 +68,7 @@ enhancements:
method: !!python/name:satpy.enhancements.colormap.colorize
kwargs:
palettes:
- { colors: ylorrd, min_value: 330, max_value: 430 , reverse: true}
- { colors: ylorrd, min_value: 330, max_value: 430, reverse: true }

fci_fire_temperature_sum:
standard_name: fci_fire_temperature_sum
Expand Down Expand Up @@ -119,16 +119,16 @@ enhancements:
overshooting_tops:
standard_name: overshooting_tops
operations:
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [-23.8, -29.9, 244.5]
max_stretch: [6.4, 23.6, 191.4]
- name: gamma
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs:
gamma: [1.0, 1.0, 1.0]
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [-23.8, -29.9, 244.5]
max_stretch: [6.4, 23.6, 191.4]
- name: gamma
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs:
gamma: [1.0, 1.0, 1.0]

night_microphysics:
standard_name: night_microphysics
Expand Down Expand Up @@ -157,3 +157,27 @@ enhancements:
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs:
gamma: [1.0, 1.0, 1.0]

24h_microphysics_dust:
standard_name: 24h_microphysics_dust
operations:
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [-7.1, 0.2, 260.9]
max_stretch: [2.4, 12.7, 289]
- name: gamma
method: !!python/name:satpy.enhancements.contrast.gamma
kwargs:
gamma: [1, 2.5, 1]

24h_microphysics_ash:
standard_name: 24h_microphysics_ash
operations:
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [-7.1, -3.2, 242.8]
max_stretch: [2.4, 4.4, 303.1]
10 changes: 10 additions & 0 deletions satpy/etc/enhancements/seviri.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,13 @@ enhancements:
stretch: crude
min_stretch: [0, ]
max_stretch: [255, ]

24h_microphysics_ash:
standard_name: 24h_microphysics_ash
operations:
- name: stretch
method: !!python/name:satpy.enhancements.contrast.stretch
kwargs:
stretch: crude
min_stretch: [-4, -4, 243]
max_stretch: [2, 5, 303]
Loading