Skip to content

Commit

Permalink
Merge pull request #1915 from ameraner/fix-correct_radiance_units_in_…
Browse files Browse the repository at this point in the history
…SEVIRI_FCI_readers

Fix radiance units in SEVIRI L1.5 nat/nc and FCI L1c nc readers
  • Loading branch information
mraspaud committed Dec 3, 2021
2 parents 4950ccd + b8e0b37 commit 3de4ff6
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 114 deletions.
100 changes: 49 additions & 51 deletions satpy/etc/readers/fci_l1c_nc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ reader:
sensors: [ fci ]

# Source: MTG FCI L1 Product User Guide [FCIL1PUG]
# ftp://ftp.eumetsat.int/pub/OPS/out/test-data/Test-data-for-External-Users/MTG/MTG_FCI_L1C_Enhanced_and_Non-Nominal_Test_Data/PDF_MTG_FCI_L1_PUG.pdf
# and Example Products for Pytroll Workshop Package Description,
# EUM/MTG/DOC/19/1079228
# https://www.eumetsat.int/media/45923
file_types:
fci_l1c_fdhsi:
file_reader: !!python/name:satpy.readers.fci_l1c_nc.FCIL1cNCFileHandler
Expand All @@ -30,12 +28,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

vis_05:
Expand All @@ -47,12 +45,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

vis_06:
Expand All @@ -64,12 +62,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

vis_08:
Expand All @@ -81,12 +79,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

vis_09:
Expand All @@ -98,12 +96,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

nir_13:
Expand All @@ -115,12 +113,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

nir_16:
Expand All @@ -132,12 +130,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

nir_22:
Expand All @@ -149,12 +147,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
reflectance:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

ir_38:
Expand All @@ -166,12 +164,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

wv_63:
Expand All @@ -183,12 +181,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

wv_73:
Expand All @@ -200,12 +198,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

ir_87:
Expand All @@ -217,12 +215,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

ir_97:
Expand All @@ -234,12 +232,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

ir_105:
Expand All @@ -251,12 +249,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

ir_123:
Expand All @@ -268,12 +266,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

ir_133:
Expand All @@ -285,12 +283,12 @@ datasets:
counts:
standard_name: counts
units: "count"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
brightness_temperature:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
file_type: fci_l1c_fdhsi

vis_04_pixel_quality:
Expand Down
48 changes: 24 additions & 24 deletions satpy/etc/readers/seviri_l1b_native.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ datasets:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -47,8 +47,8 @@ datasets:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -63,8 +63,8 @@ datasets:
standard_name: toa_brightness_temperature
units: K
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -79,8 +79,8 @@ datasets:
standard_name: toa_brightness_temperature
units: K
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -95,8 +95,8 @@ datasets:
standard_name: toa_brightness_temperature
units: K
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -111,8 +111,8 @@ datasets:
standard_name: toa_brightness_temperature
units: K
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -127,8 +127,8 @@ datasets:
standard_name: toa_brightness_temperature
units: K
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -143,8 +143,8 @@ datasets:
standard_name: toa_brightness_temperature
units: K
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -159,8 +159,8 @@ datasets:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -175,8 +175,8 @@ datasets:
standard_name: toa_bidirectional_reflectance
units: "%"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -191,8 +191,8 @@ datasets:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand All @@ -207,8 +207,8 @@ datasets:
standard_name: toa_brightness_temperature
units: "K"
radiance:
standard_name: toa_outgoing_radiance_per_unit_wavelength
units: W m-2 um-1 sr-1
standard_name: toa_outgoing_radiance_per_unit_wavenumber
units: mW m-2 sr-1 (cm-1)-1
counts:
standard_name: counts
units: count
Expand Down

0 comments on commit 3de4ff6

Please sign in to comment.