diff --git a/modules/deeplearning/cloud_opd_srcnn_abi.py b/modules/deeplearning/cloud_opd_srcnn_abi.py index ddfe51c6d6c9692cb25735c460ff61a14beb4690..a6cf2797801979108e99a9efc89dcdc6bed6e231 100644 --- a/modules/deeplearning/cloud_opd_srcnn_abi.py +++ b/modules/deeplearning/cloud_opd_srcnn_abi.py @@ -305,8 +305,8 @@ class SRCNN: # ----------------------------------------------------- label = input_label[:, label_idx_i, ::2, ::2] label = label.copy() - # label = normalize(label, label_param, mean_std_dct) - label = scale(label, label_param, mean_std_dct) + label = normalize(label, label_param, mean_std_dct) + # label = scale(label, label_param, mean_std_dct) label = label[:, self.y_128, self.x_128] label = np.where(np.isnan(label), 0.0, label) @@ -634,10 +634,10 @@ class SRCNN: preds = np.concatenate(self.test_preds) print(labels.shape, preds.shape) - # labels_denorm = denormalize(labels, label_param, mean_std_dct) - # preds_denorm = denormalize(preds, label_param, mean_std_dct) - labels_denorm = descale(labels, label_param, mean_std_dct) - preds_denorm = descale(preds, label_param, mean_std_dct) + labels_denorm = denormalize(labels, label_param, mean_std_dct) + preds_denorm = denormalize(preds, label_param, mean_std_dct) + # labels_denorm = descale(labels, label_param, mean_std_dct) + # preds_denorm = descale(preds, label_param, mean_std_dct) return labels_denorm, preds_denorm @@ -700,23 +700,17 @@ def run_evaluate_static(in_file, out_file, ckpt_dir): h5f = h5py.File(in_file, 'r') refl = get_grid_values_all(h5f, 'refl_0_65um_nom') - refl = refl[::2, ::2] LEN_Y, LEN_X = refl.shape print(LEN_Y, LEN_X) bt = get_grid_values_all(h5f, 'temp_11_0um_nom') - bt = bt[::2, ::2] cld_opd = get_grid_values_all(h5f, 'cld_opd_dcomp_1') - cld_opd = cld_opd[::2, ::2] # cld_opd_hres = cld_opd.copy() refl_sub_lo = get_grid_values_all(h5f, 'refl_0_65um_nom_min_sub') - refl_sub_lo = refl_sub_lo[::2, ::2] refl_sub_hi = get_grid_values_all(h5f, 'refl_0_65um_nom_max_sub') - refl_sub_hi = refl_sub_hi[::2, ::2] refl_sub_std = get_grid_values_all(h5f, 'refl_0_65um_nom_stddev_sub') - refl_sub_std = refl_sub_std[::2, ::2] nn = SRCNN()