From edab8f40fcbd6c593aed165a1fcfa506879dc60a Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Tue, 12 Dec 2023 14:59:19 -0600
Subject: [PATCH] snapshot...
---
modules/icing/util.py | 45 ++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/modules/icing/util.py b/modules/icing/util.py
index d2672551..5688c4a3 100644
--- a/modules/icing/util.py
+++ b/modules/icing/util.py
@@ -1099,6 +1099,8 @@ def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output
alt_hi = flt_level_ranges[flight_levels[-1]][1]
else:
flight_levels = [0]
+ if use_max_cth_level:
+ flight_levels = [-1]
if pirep_file is not None:
ice_dict, no_ice_dict, neg_ice_dict = setup(pirep_file)
@@ -1189,21 +1191,24 @@ def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output
if (day_night == 'AUTO' or day_night == 'DAY') and num_day_tiles > 0:
- day_data_dct = {name: [] for name in day_train_params}
- for name in day_train_params:
- for k in day_idxs:
- day_data_dct[name].append(data_dct[name][k])
+ # day_data_dct = {name: [] for name in day_train_params}
+ # for name in day_train_params:
+ # for k in day_idxs:
+ # day_data_dct[name].append(data_dct[name][k])
+ # 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_idxs = np.array(day_idxs)
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])
+ for name in day_train_params:
+ day_grd_dct[name] = data_dct[name][day_idxs,]
+
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,
- use_max_cth_level=use_max_cth_level)
+ flight_levels=flight_levels)
day_idxs = np.array(day_idxs)
for flvl in flight_levels:
@@ -1216,21 +1221,25 @@ def run_icing_predict_image(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output
if (day_night == 'AUTO' or day_night == 'NIGHT') and num_nght_tiles > 0:
- nght_data_dct = {name: [] for name in nght_train_params}
- for name in nght_train_params:
- for k in nght_idxs:
- nght_data_dct[name].append(data_dct[name][k])
+ # nght_data_dct = {name: [] for name in nght_train_params}
+ # for name in nght_train_params:
+ # for k in nght_idxs:
+ # nght_data_dct[name].append(data_dct[name][k])
+ # 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_idxs = np.array(nght_idxs)
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])
+ for name in nght_train_params:
+ nght_grd_dct[name] = data_dct[name][nght_idxs,]
+
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_max_cth_level=use_max_cth_level)
+ flight_levels=flight_levels)
nght_idxs = np.array(nght_idxs)
for flvl in flight_levels:
nght_preds = preds_nght_dct[flvl]
--
GitLab