Implementing four of the recipes from CIRA (curtis Seaman) and keepin…

…g the one we guessed Signed-off-by: Adam Dybbroe <[email protected]>
adybbroe · May 5, 2019 · 481d80d · 481d80d
1 parent f882b93
commit 481d80d
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 3 deletions.
diff --git a/satpy/etc/composites/viirs.yaml b/satpy/etc/composites/viirs.yaml
@@ -220,6 +220,53 @@ composites:
     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
+
+  fire_temperature_smhi:
+    # Iterated ("reverse engineered") to look like the CIRA type RGBs
     compositor: !!python/name:satpy.composites.GenericCompositor
     prerequisites:
     - name: M12
@@ -229,8 +276,8 @@ composites:
     - name: M10
       modifiers: [sunz_corrected]
     standard_name: fire_temperature
-
-
+    name: fire_temperature_smhi
+    
   natural_color:
     compositor: !!python/name:satpy.composites.RatioSharpenedRGB
     prerequisites:

diff --git a/satpy/etc/composites/visir.yaml b/satpy/etc/composites/visir.yaml
@@ -269,6 +269,16 @@ composites:
       - night_fog
       - solar_zenith_angle
 
+  # fire_temperature:
+  #   compositor: !!python/name:satpy.composites.GenericCompositor
+  #   prerequisites:
+  #   - 3.9
+  #   - wavelength: 2.25
+  #     modifiers: [sunz_corrected]
+  #   - wavelength: 1.6
+  #     modifiers: [sunz_corrected]
+  #   standard_name: fire_temperature
+
   precipitation_probability:
     compositor: !!python/name:satpy.composites.cloud_products.PrecipCloudsRGB
     prerequisites:

diff --git a/satpy/etc/enhancements/generic.yaml b/satpy/etc/enhancements/generic.yaml
@@ -79,8 +79,62 @@ enhancements:
     - name: gamma
       method: *gammafun
       kwargs: {gamma: 1.8}
-  fire_temperature_default:
+
+  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]}
+  fire_temperature_smhi:
+    standard_name: fire_temperature
+    name: fire_temperature_smhi
     operations:
     - name: stretch
       method: *stretchfun
@@ -91,6 +145,8 @@ enhancements:
     - name: gamma
       method: *gammafun
       kwargs: {gamma: [1.1, 1.2, 1.2]}
+
+
   airmass_default:
     standard_name: airmass
     operations:
@@ -100,6 +156,7 @@ enhancements:
         stretch: crude
         min_stretch: [-25, -40, 243]
         max_stretch: [0, 5, 208]
+
   airmass_abi:
     standard_name: airmass
     sensor: abi