snapshot...

modules/icing/pirep_goes.py

@@ -16,7 +16,7 @@ import datetime
 from datetime import timezone
 import glob
 from skyfield import api, almanac
-from deeplearning.icing_cnn import run_evaluate_static, run_evaluate_static_new
+from deeplearning.icing_cnn import run_evaluate_static_avg, run_evaluate_static
 
 goes_date_format = '%Y%j%H'
 goes16_directory = '/arcdata/goes/grb/goes16'  # /year/date/abi/L1b/RadC
@@ -2005,7 +2005,7 @@ def run_make_images(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', ckpt_dir_s_pat
             keep_lons = None
             keep_lats = None
 
-        ice_lons, ice_lats, preds_2d = run_evaluate_static(data_dct, ll, cc, ckpt_dir_s_path=ckpt_dir_s_path,
+        ice_lons, ice_lats, preds_2d = run_evaluate_static_avg(data_dct, ll, cc, ckpt_dir_s_path=ckpt_dir_s_path,
                                                            flight_level=flight_level, prob_thresh=prob_thresh,
                                                            satellite=satellite, domain=domain,
                                                            use_flight_altitude=use_flight_altitude)
@@ -2013,10 +2013,10 @@ def run_make_images(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', ckpt_dir_s_pat
         make_icing_image(h5f, None, ice_lons, ice_lats, clvrx_str_time, satellite, domain,
                          ice_lons_vld=keep_lons, ice_lats_vld=keep_lats, extent=extent)
 
-        # preds_2d_dct, probs_2d_dct = run_evaluate_static_new(data_dct, num_lines, num_elems, day_night=day_night,
-        #                                                      ckpt_dir_s_path=ckpt_dir_s_path, prob_thresh=prob_thresh,
-        #                                                      flight_levels=[0],
-        #                                                      use_flight_altitude=use_flight_altitude)
+        # preds_2d_dct, probs_2d_dct = run_evaluate_static(data_dct, num_lines, num_elems, day_night=day_night,
+        #                                                  ckpt_dir_s_path=ckpt_dir_s_path, prob_thresh=prob_thresh,
+        #                                                  flight_levels=[0],
+        #                                                  use_flight_altitude=use_flight_altitude)
         #
         # make_icing_image(None, probs_2d_dct[0], None, None, clvrx_str_time, satellite, domain,
         #                  ice_lons_vld=keep_lons, ice_lats_vld=keep_lats, extent=extent)
@@ -2058,10 +2058,10 @@ def run_icing_predict(clvrx_dir='/Users/tomrink/data/clavrx/RadC/', output_dir=h
             nav = get_navigation(satellite, domain)
             lons_2d, lats_2d, x_rad, y_rad = get_lon_lat_2d_mesh(nav, ll, cc)
 
-        preds_2d_dct, probs_2d_dct = run_evaluate_static_new(data_dct, num_lines, num_elems, day_night=day_night,
-                                                             ckpt_dir_s_path=model_path, prob_thresh=prob_thresh,
-                                                             use_flight_altitude=use_flight_altitude,
-                                                             flight_levels=[0])
+        preds_2d_dct, probs_2d_dct = run_evaluate_static(data_dct, num_lines, num_elems, day_night=day_night,
+                                                         ckpt_dir_s_path=model_path, prob_thresh=prob_thresh,
+                                                         use_flight_altitude=use_flight_altitude,
+                                                         flight_levels=[0])
         flt_lvls = list(preds_2d_dct.keys())
         for flvl in flt_lvls:
             probs = probs_2d_dct[flvl]