Introduce radiance_factor calibration level and standard name

satpy/dataset/dataid.py

@@ -251,6 +251,7 @@ def __hash__(self):
                           "calibration": {
                               "enum": [
                                   "reflectance",
+                                  "radiance_factor",
                                   "brightness_temperature",
                                   "radiance",
                                   "radiance_wavenumber",

satpy/etc/readers/abi_l1b.yaml

@@ -104,9 +104,14 @@ datasets:
       radiance:
         standard_name: toa_outgoing_radiance_per_unit_wavelength
         units: W m-2 um-1 sr-1
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -120,9 +125,14 @@ datasets:
       radiance:
         standard_name: toa_outgoing_radiance_per_unit_wavelength
         units: W m-2 um-1 sr-1
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -136,9 +146,14 @@ datasets:
       radiance:
         standard_name: toa_outgoing_radiance_per_unit_wavelength
         units: W m-2 um-1 sr-1
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -152,9 +167,14 @@ datasets:
       radiance:
         standard_name: toa_outgoing_radiance_per_unit_wavelength
         units: W m-2 um-1 sr-1
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -168,9 +188,14 @@ datasets:
       radiance:
         standard_name: toa_outgoing_radiance_per_unit_wavelength
         units: W m-2 um-1 sr-1
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -184,9 +209,14 @@ datasets:
       radiance:
         standard_name: toa_outgoing_radiance_per_unit_wavelength
         units: W m-2 um-1 sr-1
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"

satpy/etc/readers/abi_l1b_scmi.yaml

@@ -120,9 +120,14 @@ datasets:
     wavelength: [0.450, 0.470, 0.490]
     resolution: 1000
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
     file_type: c01
 
   C02:
@@ -131,9 +136,14 @@ datasets:
     wavelength: [0.590, 0.640, 0.690]
     resolution: 500
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
     file_type: c02
 
   C03:
@@ -142,9 +152,14 @@ datasets:
     wavelength: [0.8455, 0.865, 0.8845]
     resolution: 1000
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
     file_type: c03
 
   C04:
@@ -153,9 +168,14 @@ datasets:
     wavelength: [1.3705, 1.378, 1.3855]
     resolution: 2000
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
     file_type: c04
 
   C05:
@@ -164,9 +184,14 @@ datasets:
     wavelength: [1.580, 1.610, 1.640]
     resolution: 1000
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
     file_type: c05
 
   C06:
@@ -175,9 +200,14 @@ datasets:
     wavelength: [2.225, 2.250, 2.275]
     resolution: 2000
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
     file_type: c06
 
   C07:

satpy/etc/readers/abi_l2_nc.yaml

@@ -19,42 +19,42 @@ datasets:
   CMIP_C01:                          # Cloud Moisture Image Products Channel 1
     name: C01
     wavelength: [0.450, 0.470, 0.490]
-    calibration: reflectance
+    calibration: radiance_factor
     file_key: CMI
     file_type: [abi_l2_cmip_c01, abi_l2_mcmip]
 
   CMIP_C02:                           # Cloud Moisture Image Products Channel 2
     name: C02
     wavelength: [0.590, 0.640, 0.690]
-    calibration: reflectance
+    calibration: radiance_factor
     file_key: CMI
     file_type: [abi_l2_cmip_c02, abi_l2_mcmip]
 
   CMIP_C03:                          # Cloud Moisture Image Products Channel 3
     name: C03
     wavelength: [0.8455, 0.865, 0.8845]
-    calibration: reflectance
+    calibration: radiance_factor
     file_key: CMI
     file_type: [abi_l2_cmip_c03, abi_l2_mcmip]
 
   CMIP_C04:                          # Cloud Moisture Image Products Channel 4
     name: C04
     wavelength: [1.3705, 1.378, 1.3855]
-    calibration: reflectance
+    calibration: radiance_factor
     file_key: CMI
     file_type: [abi_l2_cmip_c04, abi_l2_mcmip]
 
   CMIP_C05:                          # Cloud Moisture Image Products Channel 5
     name: C05
     wavelength: [1.580, 1.610, 1.640]
-    calibration: reflectance
+    calibration: radiance_factor
     file_key: CMI
     file_type: [abi_l2_cmip_c05, abi_l2_mcmip]
 
   CMIP_C06:                          # Cloud Moisture Image Products Channel 6
     name: C06
     wavelength: [2.225, 2.250, 2.275]
-    calibration: reflectance
+    calibration: radiance_factor
     file_key: CMI
     file_type: [abi_l2_cmip_c06, abi_l2_mcmip]
 

satpy/etc/readers/agri_fy4a_l1.yaml

@@ -38,9 +38,14 @@ datasets:
         2000: {file_type: agri_l1_2000m}
         4000: {file_type: agri_l1_4000m}
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -56,9 +61,14 @@ datasets:
         2000: {file_type: agri_l1_2000m}
         4000: {file_type: agri_l1_4000m}
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -73,9 +83,14 @@ datasets:
         2000: {file_type: agri_l1_2000m}
         4000: {file_type: agri_l1_4000m}
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -89,9 +104,14 @@ datasets:
         2000: {file_type: agri_l1_2000m}
         4000: {file_type: agri_l1_4000m}
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -105,9 +125,14 @@ datasets:
         2000: {file_type: agri_l1_2000m}
         4000: {file_type: agri_l1_4000m}
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"
@@ -121,9 +146,14 @@ datasets:
         2000: {file_type: agri_l1_2000m}
         4000: {file_type: agri_l1_4000m}
     calibration:
+      # 8< v1.0
       reflectance:
         standard_name: toa_bidirectional_reflectance
         units: "%"
+      # >8 v1.0
+      radiance_factor:
+        standard_name: product_of_cosine_solar_zenith_angle_and_toa_bidirectional_reflectance
+        units: "%"
       counts:
         standard_name: counts
         units: "1"