diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 0160478b5059a28c6944c6e0c493bb5f4b3d7989..780b1499a5f9ff45f3cea103b36e70627440d7f4 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -1052,8 +1052,6 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_opd cld_mask = cld_mask.reshape((num_obs, -1)) cld_top_hgt = cld_top_hgt.reshape((num_obs, -1)) cld_geo_dz = cld_geo_dz.reshape((num_obs, -1)) - cld_phase = cld_phase.reshape((num_obs, -1)) - cld_opd = cld_opd.reshape((num_obs, -1)) bt_11um = bt_11um.reshape((num_obs, -1)) mask = [] @@ -1075,7 +1073,6 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_opd keep_1 = np.invert(np.isnan(cld_top_hgt[i,])) keep_2 = np.invert(np.isnan(bt_11um[i,])) keep_3 = np.invert(np.isnan(cld_geo_dz[i,])) - # keep_3 = np.invert(np.isnan(cld_opd[i,])) keep = keep_0 & keep_1 & keep_2 & keep_3 num_keep = np.sum(keep) if num_keep == 0: @@ -1083,10 +1080,10 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_opd # Test 1 keep = np.where(keep, (cld_top_hgt[i,] + closeness) > icing_alt[i], False) - if (np.sum(keep) / num_keep) < 0.80: - continue - num_keep = np.sum(keep) - keep = np.where(keep, (cld_top_hgt[i,] - cld_geo_dz[i,]) < icing_alt[i], False) + # if (np.sum(keep) / num_keep) < 0.80: + # continue + # num_keep = np.sum(keep) + keep = np.where(keep, (cld_top_hgt[i,] - cld_geo_dz[i,] - closeness) < icing_alt[i], False) # # Test2 # keep = np.where(keep, @@ -1124,8 +1121,6 @@ def apply_qc_no_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_ cld_mask = cld_mask.reshape((num_obs, -1)) cld_top_hgt = cld_top_hgt.reshape((num_obs, -1)) cld_geo_dz = cld_geo_dz.reshape((num_obs, -1)) - cld_phase = cld_phase.reshape((num_obs, -1)) - cld_opd = cld_opd.reshape((num_obs, -1)) bt_11um = bt_11um.reshape((num_obs, -1)) mask = [] @@ -1147,18 +1142,16 @@ def apply_qc_no_icing_pireps(icing_alt, cld_top_hgt, cld_geo_dz, cld_phase, cld_ keep_1 = np.invert(np.isnan(cld_top_hgt[i,])) keep_2 = np.invert(np.isnan(bt_11um[i,])) keep_3 = np.invert(np.isnan(cld_geo_dz[i,])) - # keep_3 = np.invert(np.isnan(cld_opd[i,])) keep = keep_0 & keep_1 & keep_2 & keep_3 num_keep = np.sum(keep) if num_keep == 0: continue - # Exp keep = np.where(keep, (cld_top_hgt[i,] + closeness) > icing_alt[i], False) - if (np.sum(keep) / num_keep) < 0.80: - continue - num_keep = np.sum(keep) - keep = np.where(keep, (cld_top_hgt[i,] - cld_geo_dz[i,]) < icing_alt[i], False) + # if (np.sum(keep) / num_keep) < 0.80: + # continue + # num_keep = np.sum(keep) + keep = np.where(keep, (cld_top_hgt[i,] - cld_geo_dz[i,] - closeness) < icing_alt[i], False) # keep = np.where(keep, np.logical_and(bt_11um[i,] > 228.0, bt_11um[i,] < 273.0), False)