diff --git a/satpy/etc/composites/abi.yaml b/satpy/etc/composites/abi.yaml index 59b4fe28f0..ea9dd37f62 100644 --- a/satpy/etc/composites/abi.yaml +++ b/satpy/etc/composites/abi.yaml @@ -389,7 +389,7 @@ composites: - name: C02 - name: C05 - ash: + ash: &24h_microphysics description: > Ash RGB, for GOESR: NASA, NOAA references: @@ -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 diff --git a/satpy/etc/composites/ahi.yaml b/satpy/etc/composites/ahi.yaml index af8e96b4d3..263bb617bb 100644 --- a/satpy/etc/composites/ahi.yaml +++ b/satpy/etc/composites/ahi.yaml @@ -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 @@ -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 diff --git a/satpy/etc/composites/fci.yaml b/satpy/etc/composites/fci.yaml index f73df3e557..c576e82659 100644 --- a/satpy/etc/composites/fci.yaml +++ b/satpy/etc/composites/fci.yaml @@ -604,15 +604,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: @@ -649,6 +649,27 @@ composites: - 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 + _vis_06_crude: compositor: !!python/name:satpy.composites.core.SingleBandCompositor description: Special version of vis_06 for use in vis_with_ir_cloud_overlay diff --git a/satpy/etc/composites/seviri.yaml b/satpy/etc/composites/seviri.yaml index 4a5b59ee68..6247182a64 100644 --- a/satpy/etc/composites/seviri.yaml +++ b/satpy/etc/composites/seviri.yaml @@ -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 @@ -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 diff --git a/satpy/etc/enhancements/abi.yaml b/satpy/etc/enhancements/abi.yaml index 9920f842a3..a5258fd579 100644 --- a/satpy/etc/enhancements/abi.yaml +++ b/satpy/etc/enhancements/abi.yaml @@ -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] diff --git a/satpy/etc/enhancements/ahi.yaml b/satpy/etc/enhancements/ahi.yaml index 5496be3cd8..fcc7fbb119 100644 --- a/satpy/etc/enhancements/ahi.yaml +++ b/satpy/etc/enhancements/ahi.yaml @@ -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] diff --git a/satpy/etc/enhancements/fci.yaml b/satpy/etc/enhancements/fci.yaml index d776f4d427..ca79e703b1 100644 --- a/satpy/etc/enhancements/fci.yaml +++ b/satpy/etc/enhancements/fci.yaml @@ -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 @@ -68,17 +68,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 @@ -87,7 +87,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 @@ -138,16 +138,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 @@ -177,6 +177,30 @@ enhancements: 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] + day_cloud_phase_chmi: standard_name: day_cloud_phase_chmi operations: diff --git a/satpy/etc/enhancements/seviri.yaml b/satpy/etc/enhancements/seviri.yaml index 291bb52b72..38fe4c23e5 100644 --- a/satpy/etc/enhancements/seviri.yaml +++ b/satpy/etc/enhancements/seviri.yaml @@ -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]