From 75823dc8878cf6be1b6dd6ebc77e16b6962cf634 Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Fri, 30 Jul 2021 12:39:35 -0500
Subject: [PATCH] more work on manual/hard coded metadata, stupid files...

---
 modules/icing/pirep_goes.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 8076038c..507e0bb5 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -31,6 +31,7 @@ l1b_ds_list = ['temp_10_4um_nom', 'temp_11_0um_nom', 'temp_12_0um_nom', 'temp_13
                'refl_0_47um_nom', 'refl_0_65um_nom', 'refl_0_86um_nom', 'refl_1_38um_nom', 'refl_1_60um_nom']
 l1b_ds_types = ['f4' for ds in l1b_ds_list]
 l1b_ds_fill = [-32767 for i in range(10)] + [-32768 for i in range(5)]
+l1b_ds_range = ['acutal_range' for ds in l1b_ds_list]
 
 ds_list = ['cld_height_acha', 'cld_geo_thick', 'cld_press_acha', 'sensor_zenith_angle', 'supercooled_prob_acha',
            'supercooled_cloud_fraction', 'cld_temp_acha', 'cld_opd_acha', 'solar_zenith_angle',
@@ -39,6 +40,7 @@ ds_list = ['cld_height_acha', 'cld_geo_thick', 'cld_press_acha', 'sensor_zenith_
            'lwc_dcomp', 'cld_emiss_acha', 'conv_cloud_fraction', 'cloud_type', 'cloud_phase', 'cloud_mask']
 ds_types = ['f4' for i in range(23)] + ['i1' for i in range(3)]
 ds_fill = [-32768 for i in range(23)] + [-128 for i in range(3)]
+ds_range = ['actual_range' for i in range(23)] + [None for i in range(3)]
 
 # An example file for accessing and copying metadata
 a_clvr_file = '/home/rink/data/clavrx/clavrx_OR_ABI-L1b-RadC-M3C01_G16_s20190020002186.level2.nc'
@@ -116,21 +118,21 @@ def get_grid_values(h5f, grid_name, j_c, i_c, half_width, scale_factor_name='sca
     if scale_factor_name is not None:
         attr = attrs.get(scale_factor_name)
         if attr is None:
-            raise GenericException('Attribute: '+scale_factor_name+' not found for variable: '+grid_name)
+            raise GenericException('Attribute: '+scale_factor_name+' not found for dataset: '+grid_name)
         scale_factor = attr[0]
         grd_vals = grd_vals * scale_factor
 
     if add_offset_name is not None:
         attr = attrs.get(add_offset_name)
         if attr is None:
-            raise GenericException('Attribute: '+add_offset_name+' not found for variable: '+grid_name)
+            raise GenericException('Attribute: '+add_offset_name+' not found for dataset: '+grid_name)
         add_offset = attr[0]
         grd_vals = grd_vals + add_offset
 
     if range_name is not None:
         attr = attrs.get(range_name)
         if attr is None:
-            raise GenericException('Attribute: '+range_name+' not found for variable: '+grid_name)
+            raise GenericException('Attribute: '+range_name+' not found for dataset: '+grid_name)
         low = attr[0]
         high = attr[1]
         grd_vals = np.where(grd_vals < low, np.nan, grd_vals)
@@ -138,7 +140,7 @@ def get_grid_values(h5f, grid_name, j_c, i_c, half_width, scale_factor_name='sca
     elif fill_value_name is not None:
         attr = attrs.get(fill_value_name)
         if attr is None:
-            raise GenericException('Attribute: '+fill_value_name+' not found for variable: '+grid_name)
+            raise GenericException('Attribute: '+fill_value_name+' not found for dataset: '+grid_name)
         fill_value = attr[0]
         grd_vals = np.where(grd_vals == fill_value, np.nan, grd_vals)
 
@@ -275,14 +277,14 @@ def run(pirep_dct, outfile=None, outfile_l1b=None, dt_str_start=None, dt_str_end
 
             cnt_a = 0
             for didx, ds_name in enumerate(ds_list):
-                gvals = get_grid_values(h5f, ds_name, ll_a[0], cc_a[0], 20, fill_value_name=None, range_name=None, fill_value=ds_fill[didx])
+                gvals = get_grid_values(h5f, ds_name, ll_a[0], cc_a[0], 20, fill_value_name=None, range_name=ds_range[didx], fill_value=ds_fill[didx])
                 if gvals is not None:
                     ds_grd_dct[ds_name].append(gvals)
                     cnt_a += 1
 
             cnt_b = 0
             for didx, ds_name in enumerate(l1b_ds_list):
-                gvals = get_grid_values(h5f, ds_name, ll_a[0], cc_a[0], 20, fill_value_name=None, range_name=None, fill_value=l1b_ds_fill[didx])
+                gvals = get_grid_values(h5f, ds_name, ll_a[0], cc_a[0], 20, fill_value_name=None, range_name=l1b_ds_range[didx], fill_value=l1b_ds_fill[didx])
                 if gvals is not None:
                     l1b_grd_dct[ds_name].append(gvals)
                     cnt_b += 1
-- 
GitLab