diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 86699d55747974a33c263bf488a0e6bd1734e4bf..b27cfc5adb8024abee593c783f9cbb3b81c16de5 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -38,10 +38,10 @@ ds_types = ['f4' for i in range(23)] + ['i4' for i in range(3)] a_clvr_file = '/home/rink/data/clavrx/clavrx_OR_ABI-L1b-RadC-M3C01_G16_s20190020002186.level2.nc' -icing_files = [f for f in glob.glob('/data/Personal/rink/icing2_ml/icing_2*.h5')] +icing_files = [f for f in glob.glob('/data/Personal/rink/icing2_ml/icing_l1b_2*.h5')] icing_l1b_files = [] -no_icing_files = [f for f in glob.glob('/data/Personal/rink/icing2_ml/no_icing_2*.h5')] +no_icing_files = [f for f in glob.glob('/data/Personal/rink/icing2_ml/no_icing_l1b_2*.h5')] no_icing_l1b_files = [] train_params_day = ['cld_height_acha', 'cld_geo_thick', 'supercooled_cloud_fraction', 'cld_temp_acha', 'cld_press_acha', @@ -1156,8 +1156,7 @@ def run_mean_std(check_cloudy=False, no_icing_to_icing_ratio=5): 'cld_opd_dcomp', 'cld_opd_dcomp_1', 'cld_opd_dcomp_2', 'cld_opd_dcomp_3', 'cld_cwp_dcomp', 'iwc_dcomp', 'lwc_dcomp', 'cld_emiss_acha', 'conv_cloud_fraction'] - mean_dct = {} - std_dct = {} + mean_std_dct = {} ice_flist = [f for f in glob.glob('/home/rink/data/icing/icing_2*.h5')] no_ice_flist = [f for f in glob.glob('/home/rink/data/icing/no_icing_2*.h5')] @@ -1213,13 +1212,12 @@ def run_mean_std(check_cloudy=False, no_icing_to_icing_ratio=5): print(dname,': (', mean, mean_i, mean_ni, ') (', std, std_i, std_ni, ')') - mean_dct[dname] = mean - std_dct[dname] = std + mean_std_dct[dname] = (mean, std) [h5f.close() for h5f in ice_h5f_lst] [h5f.close() for h5f in no_ice_h5f_lst] - return mean_dct, std_dct + return mean_std_dct def split_data(num_obs, perc=0.2, skip=1, shuffle=True):