diff --git a/modules/icing/util.py b/modules/icing/util.py index 57bf3588eb366e3b25fe511b0529d02ac1ef6eac..cff6493d6b8b55d77bbf52d614655a9ad7e29103 100644 --- a/modules/icing/util.py +++ b/modules/icing/util.py @@ -341,19 +341,19 @@ def run_icing_predict_fcn(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output_d def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output_dir=homedir, day_model_path=model_path_day, night_model_path=model_path_night, prob_thresh=0.5, satellite='GOES16', domain='CONUS', day_night='AUTO', - l1b_andor_l2='BOTH', use_flight_altitude=True, res_fac=1, model_type='CNN', - extent=[-105, -70, 15, 50], - pirep_file='/Users/tomrink/data/pirep/pireps_202109200000_202109232359.csv', - icing_dict=None, - obs_lons=None, obs_lats=None, obs_times=None, obs_alt=None, obs_intensity=None, - flight_level=None): + 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, + obs_lons=None, obs_lats=None, obs_times=None, obs_alt=None, obs_intensity=None): if model_type == 'CNN': model_module = icing_cnn elif model_type == 'FCN': model_module = icing_fcn + alt_lo, alt_hi = 0.0, 15000.0 if use_flight_altitude is True: - flight_levels = [0, 1, 2, 3, 4] + flight_levels = flight_levels + alt_lo = flt_level_ranges[flight_levels[0]][0] + alt_hi = flt_level_ranges[flight_levels[-1]][1] else: flight_levels = [0] @@ -362,10 +362,6 @@ def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output if icing_dict is not None: ice_dict = icing_dict - alt_lo, alt_hi = 0.0, 15000.0 - if flight_level is not None: - alt_lo, alt_hi = flt_level_ranges[flight_level] - day_train_params, _, _ = get_training_parameters(day_night='DAY', l1b_andor_l2=l1b_andor_l2) nght_train_params, _, _ = get_training_parameters(day_night='NIGHT', l1b_andor_l2=l1b_andor_l2)