From f5b13eea70c3aa97c8359e83412ed8031f7ff511 Mon Sep 17 00:00:00 2001 From: Martin Raspaud Date: Mon, 8 Dec 2025 12:06:36 +0100 Subject: [PATCH 1/3] Add dust for fci --- satpy/etc/composites/fci.yaml | 30 +++++++++++----- satpy/etc/enhancements/fci.yaml | 62 ++++++++++++++++++++------------- 2 files changed, 60 insertions(+), 32 deletions(-) diff --git a/satpy/etc/composites/fci.yaml b/satpy/etc/composites/fci.yaml index 3d840afbfb..7d54d9b03c 100644 --- a/satpy/etc/composites/fci.yaml +++ b/satpy/etc/composites/fci.yaml @@ -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: @@ -615,3 +615,17 @@ composites: - name: nir_16 - name: vis_06 standard_name: day_severe_storms_tropical + + 24h_microphysics_dust: + 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 diff --git a/satpy/etc/enhancements/fci.yaml b/satpy/etc/enhancements/fci.yaml index ca2f09bdda..70feb9cb03 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 @@ -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 @@ -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 @@ -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 @@ -157,3 +157,17 @@ 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] From ccf067e9dfdaaf13caa0db066e28d2b4d1685b76 Mon Sep 17 00:00:00 2001 From: Gerrit Holl Date: Mon, 12 Jan 2026 16:39:03 +0100 Subject: [PATCH 2/3] Add 24h microphysics ash for FCI, ABI, AHI Add the 24h microphysics ash RGB for FCI, ABI, and AHI. --- satpy/etc/composites/abi.yaml | 9 ++++++++- satpy/etc/composites/ahi.yaml | 9 ++++++++- satpy/etc/composites/fci.yaml | 9 ++++++++- satpy/etc/composites/seviri.yaml | 9 ++++++++- satpy/etc/enhancements/abi.yaml | 10 ++++++++++ satpy/etc/enhancements/ahi.yaml | 9 +++++++++ satpy/etc/enhancements/fci.yaml | 10 ++++++++++ satpy/etc/enhancements/seviri.yaml | 10 ++++++++++ 8 files changed, 71 insertions(+), 4 deletions(-) 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 7d54d9b03c..6058ce6894 100644 --- a/satpy/etc/composites/fci.yaml +++ b/satpy/etc/composites/fci.yaml @@ -616,7 +616,7 @@ composites: - name: vis_06 standard_name: day_severe_storms_tropical - 24h_microphysics_dust: + 24h_microphysics_dust: &24h_microphysics compositor: !!python/name:satpy.composites.core.GenericCompositor prerequisites: - compositor: !!python/name:satpy.composites.arithmetic.DifferenceCompositor @@ -629,3 +629,10 @@ composites: - 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 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..f40609102e 100644 --- a/satpy/etc/enhancements/ahi.yaml +++ b/satpy/etc/enhancements/ahi.yaml @@ -39,3 +39,12 @@ enhancements: method: !!python/name:satpy.enhancements.contrast.gamma kwargs: gamma: [1.0, 1.0, 1.0] + + 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] diff --git a/satpy/etc/enhancements/fci.yaml b/satpy/etc/enhancements/fci.yaml index 70feb9cb03..e376ba85d2 100644 --- a/satpy/etc/enhancements/fci.yaml +++ b/satpy/etc/enhancements/fci.yaml @@ -171,3 +171,13 @@ enhancements: 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] 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] From 5d81c45ad56fd33f98587571ce68e9ce5305ae6f Mon Sep 17 00:00:00 2001 From: Gerrit Holl Date: Wed, 14 Jan 2026 12:54:54 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Add=20missing=20=CE=B3=20for=20AHI=2024h=20?= =?UTF-8?q?microphysics=20ash=20RGB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- satpy/etc/enhancements/ahi.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/satpy/etc/enhancements/ahi.yaml b/satpy/etc/enhancements/ahi.yaml index f40609102e..fcc7fbb119 100644 --- a/satpy/etc/enhancements/ahi.yaml +++ b/satpy/etc/enhancements/ahi.yaml @@ -40,6 +40,7 @@ enhancements: kwargs: gamma: [1.0, 1.0, 1.0] + 24h_microphysics_ash: standard_name: 24h_microphysics_ash operations: - name: stretch @@ -48,3 +49,7 @@ enhancements: 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]