diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 52f320f2b4c5b3054a43672443ebccc9434e6af4..08e84c2b9a0a32b9743b0613da06b45fcf6178e2 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -1677,7 +1677,7 @@ def tile_extract(icing_files, no_icing_files, trnfile='/home/rink/tiles_train.h5 if do_split: trn_idxs, vld_idxs, tst_idxs = split_data(icing_times) # Below for no test data, just train and valid - trn_idxs = np.concatenate([trn_idxs, tst_idxs]) + # trn_idxs = np.concatenate([trn_idxs, tst_idxs]) else: trn_idxs = np.arange(icing_intensity.shape[0]) tst_idxs = None @@ -1764,26 +1764,26 @@ def tile_extract(icing_files, no_icing_files, trnfile='/home/rink/tiles_train.h5 if do_split: # --- Comment out this block for no test data, just valid and train - # tst_data_dct = {} - # for ds_name in params: - # tst_data_dct[ds_name] = data_dct[ds_name][tst_idxs,] - # tst_icing_intensity = icing_intensity[tst_idxs,] - # tst_icing_times = icing_times[tst_idxs,] - # tst_icing_lons = icing_lons[tst_idxs,] - # tst_icing_lats = icing_lats[tst_idxs,] - # tst_icing_alt = icing_alt[tst_idxs,] - # - # # do sort - # ds_indexes = np.argsort(tst_icing_times) - # for ds_name in params: - # tst_data_dct[ds_name] = tst_data_dct[ds_name][ds_indexes] - # tst_icing_intensity = tst_icing_intensity[ds_indexes] - # tst_icing_times = tst_icing_times[ds_indexes] - # tst_icing_lons = tst_icing_lons[ds_indexes] - # tst_icing_lats = tst_icing_lats[ds_indexes] - # tst_icing_alt = tst_icing_alt[ds_indexes] - # - # write_file(tstfile, params, param_types, tst_data_dct, tst_icing_intensity, tst_icing_times, tst_icing_lons, tst_icing_lats, tst_icing_alt) + tst_data_dct = {} + for ds_name in params: + tst_data_dct[ds_name] = data_dct[ds_name][tst_idxs,] + tst_icing_intensity = icing_intensity[tst_idxs,] + tst_icing_times = icing_times[tst_idxs,] + tst_icing_lons = icing_lons[tst_idxs,] + tst_icing_lats = icing_lats[tst_idxs,] + tst_icing_alt = icing_alt[tst_idxs,] + + # do sort + ds_indexes = np.argsort(tst_icing_times) + for ds_name in params: + tst_data_dct[ds_name] = tst_data_dct[ds_name][ds_indexes] + tst_icing_intensity = tst_icing_intensity[ds_indexes] + tst_icing_times = tst_icing_times[ds_indexes] + tst_icing_lons = tst_icing_lons[ds_indexes] + tst_icing_lats = tst_icing_lats[ds_indexes] + tst_icing_alt = tst_icing_alt[ds_indexes] + + write_file(tstfile, params, param_types, tst_data_dct, tst_icing_intensity, tst_icing_times, tst_icing_lons, tst_icing_lats, tst_icing_alt) # ------------------------------------------------------------------- vld_data_dct = {}