diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py index 8cbd9c8ea7c4d53ceb3801ce0bfd845c8d7eecc9..c7fbe65f43a51535bb4f143ee0e382aa13e800b5 100644 --- a/modules/icing/pirep_goes.py +++ b/modules/icing/pirep_goes.py @@ -798,24 +798,28 @@ def apply_qc_icing_pireps(icing_alt, cld_top_hgt, cld_phase, cld_opd, cld_mask, 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 + # Test1 keep = np.where(keep, cld_top_hgt[i,] > icing_alt[i], False) + # Test2 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) - + # Test3 keep = np.where(keep, (cld_opd[i,] >= opd_thick_threshold) & (cld_phase[i,] == 4) & (cld_top_hgt[i,] > icing_alt[i]), False) + # Test4 keep = np.where(keep, np.invert((cld_phase[i,] == 4) & (cld_opd[i,] < opd_thin_threshold) & (cld_top_hgt[i,] > icing_alt[i])), False) + # Test5, Should this go before Test2? (Would it flip some keepers from #2) keep = np.where(keep, np.invert(bt_11um[i,] > 270.0), False) + # Test6 keep = np.where(keep, np.invert(bt_11um[i,] < 228.0), False) mask.append(keep) @@ -867,7 +871,6 @@ def apply_qc_no_icing_pireps(icing_alt, cld_top_hgt, cld_phase, cld_opd, cld_mas # 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)