diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 8220d8a41983a4968f0673fd738b2472ca28e10b..79ef83288643df53a7a7bf9fad028937fd137d96 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -792,29 +792,29 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_phase, cld_opd, cld_mask, continue keep_0 = np.logical_or(cld_mask[i,] == 2, cld_mask[i,] == 3) # cloudy - # 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_opd[i,])) - # keep = keep_0 & keep_1 & keep_2 & keep_3 - keep = keep_0 + 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_opd[i,])) + keep = keep_0 & keep_1 & keep_2 & keep_3 + # keep = keep_0 num_keep = np.sum(keep) if num_keep == 0: continue - # keep = np.where(keep, cld_top_hgt[i,] > icing_alt[i], False) - # - # keep = np.where(keep, - # np.invert((cld_phase[i,] == 4) & - # np.logical_and(cld_top_hgt[i,]+closeness > icing_alt[i], cld_top_hgt[i,]-closeness < icing_alt[i])), - # False) - # - # keep = np.where(keep, (cld_opd[i,] >= opd_thick_threshold) & (cld_phase[i,] == 4) & (cld_top_hgt[i,] > icing_alt[i]), False) - # - # keep = np.where(keep, np.invert((cld_phase[i,] == 4) & (cld_opd[i,] < 0.1) & (cld_top_hgt[i,] > icing_alt[i])), False) - # - # keep = np.where(keep, np.invert(bt_11um[i,] > 270.0), False) - # - # keep = np.where(keep, np.invert(bt_11um[i,] < 228.0), False) + keep = np.where(keep, cld_top_hgt[i,] > icing_alt[i], False) + + keep = np.where(keep, + np.invert((cld_phase[i,] == 4) & + np.logical_and(cld_top_hgt[i,]+closeness > icing_alt[i], cld_top_hgt[i,]-closeness < icing_alt[i])), + False) + + keep = np.where(keep, (cld_opd[i,] >= opd_thick_threshold) & (cld_phase[i,] == 4) & (cld_top_hgt[i,] > icing_alt[i]), False) + + keep = np.where(keep, np.invert((cld_phase[i,] == 4) & (cld_opd[i,] < 0.1) & (cld_top_hgt[i,] > icing_alt[i])), False) + + keep = np.where(keep, np.invert(bt_11um[i,] > 270.0), False) + + keep = np.where(keep, np.invert(bt_11um[i,] < 228.0), False) mask.append(keep) idxs.append(i)