Add the ocean color product to olci

pytroll · May 15, 2018 · 86123ac · 86123ac
1 parent 8a4d74f
commit 86123ac
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/satpy/etc/composites/olci.yaml b/satpy/etc/composites/olci.yaml
@@ -135,3 +135,14 @@ composites:
     - name: 'Oa03'
       modifiers: [effective_solar_pathlength_corrected]
     standard_name: true_color
+
+  ocean_color:
+    compositor: !!python/name:satpy.composites.GenericCompositor
+    prerequisites:
+    - name: 'Oa08'
+      modifiers: [effective_solar_pathlength_corrected, rayleigh_corrected]
+    - name: 'Oa06'
+      modifiers: [effective_solar_pathlength_corrected, rayleigh_corrected]
+    - name: 'Oa03'
+      modifiers: [effective_solar_pathlength_corrected, rayleigh_corrected]
+    standard_name: ocean_color
diff --git a/satpy/etc/enhancements/generic.yaml b/satpy/etc/enhancements/generic.yaml
@@ -24,6 +24,14 @@ enhancements:
     - name: gamma
       method: &gammafun !!python/name:satpy.enhancements.gamma ''
       kwargs: {gamma: 1.6}
+  ocean_color_default:
+    standard_name: ocean_color
+    operations:
+    - name: cira_stretch
+      method: !!python/name:satpy.enhancements.cira_stretch
+    - name: gamma
+      method: *gammafun
+      kwargs: {gamma: 2.6}
   night_overview_default:
     standard_name: night_overview
     operations:

diff --git a/satpy/etc/readers/nc_olci_l1b.yaml b/satpy/etc/readers/nc_olci_l1b.yaml
@@ -8,17 +8,17 @@ reader:
 file_types:
     esa_l1b:
         file_reader: !!python/name:satpy.readers.nc_olci.NCOLCI1B
-        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/{dataset_name}_radiance.nc']
+        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{platform_mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/{dataset_name}_radiance.nc']
         requires: [esa_cal]
     esa_angles:
         file_reader: !!python/name:satpy.readers.nc_olci.NCOLCIAngles
-        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/tie_geometries.nc']
+        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{platform_mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/tie_geometries.nc']
     esa_geo:
         file_reader: !!python/name:satpy.readers.nc_olci.NCOLCIGeo
-        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/geo_coordinates.nc']
+        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{platform_mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/geo_coordinates.nc']
     esa_cal:
         file_reader: !!python/name:satpy.readers.nc_olci.NCOLCICal
-        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/instrument_data.nc']
+        file_patterns: ['{mission_id:3s}_OL_1_{datatype_id:_<6s}_{start_time:%Y%m%dT%H%M%S}_{end_time:%Y%m%dT%H%M%S}_{creation_time:%Y%m%dT%H%M%S}_{duration:4d}_{cycle:3d}_{relative_orbit:3d}_{frame:4d}_{centre:3s}_{platform_mode:1s}_{timeliness:2s}_{collection:3s}.SEN3/instrument_data.nc']
 datasets:
   longitude:
     name: longitude