diff --git a/modules/icing/util.py b/modules/icing/util.py index ca68cba6014fc4eb3bbe811dbf8eaebb8bb6f7ad..daa876aded7d484f44286da2b7d3f11184401efc 100644 --- a/modules/icing/util.py +++ b/modules/icing/util.py @@ -907,12 +907,15 @@ def run_icing_predict(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output_dir=h 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]) + 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(nght_grd_dct, num_tiles, model_path, - day_night=mode, l1b_or_l2=l1b_andor_l2, - prob_thresh=prob_thresh, - use_flight_altitude=use_flight_altitude, - flight_levels=flight_levels) + 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_max_cth_level=use_max_cth_level) for flvl in flight_levels: nght_preds = preds_nght_dct[flvl] nght_probs = probs_nght_dct[flvl]