diff --git a/modules/icing/util.py b/modules/icing/util.py index 13e7911947e5f02b435f60e8696d4949f6702875..fe26f4cef1a7a7b200bf9017ad082d9100bffe49 100644 --- a/modules/icing/util.py +++ b/modules/icing/util.py @@ -1077,7 +1077,7 @@ def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output prob_thresh=0.5, satellite='GOES16', domain='CONUS', day_night='AUTO', l1b_andor_l2='BOTH', use_flight_altitude=True, flight_levels=[0, 1, 2, 3, 4], res_fac=1, model_type='CNN', extent=[-105, -70, 15, 50], pirep_file=None, icing_dict=None, - data_extent=None, + data_extent=None, use_max_cth_level=False, obs_lons=None, obs_lats=None, obs_times=None, obs_alt=None, obs_intensity=None): if model_type == 'CNN': import deeplearning.icing_cnn as icing_cnn @@ -1197,12 +1197,14 @@ def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output day_grd_dct = {name: None for name in day_train_params} for ds_name in day_train_params: day_grd_dct[ds_name] = np.stack(day_data_dct[ds_name]) - day_grd_dct['cth_high_avg'] = day_cth_max + if use_max_cth_level: + day_grd_dct['cth_high_avg'] = day_cth_max preds_day_dct, probs_day_dct = \ model_module.run_evaluate_static_2(day_model, day_grd_dct, num_day_tiles, prob_thresh=prob_thresh, use_flight_altitude=use_flight_altitude, - flight_levels=flight_levels) + flight_levels=flight_levels, + use_max_cth_level=use_max_cth_level) day_idxs = np.array(day_idxs) for flvl in flight_levels: @@ -1222,11 +1224,14 @@ def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output nght_grd_dct = {name: None for name in nght_train_params} for ds_name in nght_train_params: nght_grd_dct[ds_name] = np.stack(nght_data_dct[ds_name]) - nght_grd_dct['cth_high_avg'] = nght_cth_max + if use_max_cth_level: + nght_grd_dct['cth_high_avg'] = nght_cth_max preds_nght_dct, probs_nght_dct = \ model_module.run_evaluate_static_2(night_model, nght_grd_dct, num_nght_tiles, prob_thresh=prob_thresh, - use_flight_altitude=use_flight_altitude, flight_levels=flight_levels) + use_flight_altitude=use_flight_altitude, + flight_levels=flight_levels, + use_max_cth_level=use_max_cth_level) nght_idxs = np.array(nght_idxs) for flvl in flight_levels: nght_preds = preds_nght_dct[flvl]