diff --git a/main.py b/main.py index 3c55283ae71d89686a7eb4e294b29cd54239456b..e4eb5aa5a9e026b61200bb4160befd7d07b0e5da 100644 --- a/main.py +++ b/main.py @@ -205,7 +205,7 @@ def main(*, data_path=_datapath, mod02=_fname_mod02, mod03=_fname_mod03, 'Polar_Day_Desert', 'Polar_Day_Desert_Coast', 'Polar_Day_Snow', 'Polar_Night_Snow', 'Polar_Ocean_Day', 'Polar_Ocean_Night', 'Day_Snow', 'Night_Snow']: SceneType = CloudTests(viirs_data, scene_name, thresholds) - cmin_G2 = SceneType.single_threshold_test('11-4um_BTD_Oceanic_Stratus_Test', 'M15-M13', cmin_G2) + cmin_G2 = SceneType.single_threshold_test('11-4um_Oceanic_Stratus_Test', 'M15-M13', cmin_G2) # --------------------- # # ### Group 3 tests ### # diff --git a/read_data.py b/read_data.py index 087c32b4dda9ea021e3fd4cc6c9f13ce7bf7d804..9daa89b9812fa8c092be563b4a66be9e13ac67cb 100644 --- a/read_data.py +++ b/read_data.py @@ -141,6 +141,8 @@ def get_data(file_names, sunglint_angle): viirs_data.M15.values - viirs_data.M14.values) viirs_data['M15-M16'] = (('number_of_lines', 'number_of_pixels'), viirs_data.M15.values - viirs_data.M16.values) + viirs_data['M15-M13'] = (('number_of_lines', 'number_of_pixels'), + viirs_data.M15.values - viirs_data.M13.values) scene_flags = scn.find_scene(viirs_data, sunglint_angle) scene = scn.scene_id(scene_flags) diff --git a/thresholds.mvcm.snpp.v0.0.1.yaml b/thresholds.mvcm.snpp.v0.0.1.yaml index ee93ccae941841317b02c76feab517c74766008e..654002ee9cec7a601c2b864c31e557370dea123a 100644 --- a/thresholds.mvcm.snpp.v0.0.1.yaml +++ b/thresholds.mvcm.snpp.v0.0.1.yaml @@ -9,7 +9,7 @@ Land_Day: cmult: 0.3 adj: 1.25 dl_ref3_tpw : -10.00 - test11_4lo : [-16.0, -14.0, -12.0, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [-16.0, -14.0, -12.0, 1.0, 1.0] CO2_High_Clouds_Test: [222.0, 224.0, 226.0, 1.0, 1.0] Water_Vapor_High_Clouds_Test: [215.0, 220.0, 225.0, 1.0, 1.0] vis_refl_test : [0.207, 0.169, 0.132, 1.0, 1.0] # used to be dlref1 @@ -51,7 +51,7 @@ Land_Day_Coast: cmult: 0.3 adj: 1.25 dl_ref3_tpw_t2 : -10.00 - test11_4lo : [-16.0, -14.0, -12.0, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [-16.0, -14.0, -12.0, 1.0, 1.0] CO2_High_Clouds_Test: [222.0, 224.0, 226.0, 1.0, 1.0] Water_Vapor_High_Clouds_Test: [215.0, 220.0, 225.0, 1.0, 1.0] dlref1_t2 : [0.207, 0.169, 0.132, 1.0, 1.0] @@ -103,7 +103,7 @@ Ocean_Day: coeffs: [3.0, 1.0] cmult: 0.3 adj: 1.25 - test11_4lo : [-11.0, -9.0, -7.0, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [-11.0, -9.0, -7.0, 1.0, 1.0] 11um_Test: [267.0, 270.0, 273.0, 1.0, 1.0] CO2_High_Clouds_Test: [222.0, 224.0, 226.0, 1.0, 1.0] Water_Vapor_High_Clouds_Test: [215.0, 220.0, 225.0, 1.0, 1.0] @@ -144,7 +144,7 @@ Ocean_Night: cmult: 0.3 adj: 1.0 no_intadj : 0.0 - no11_4lo : [1.25, 1.00, 0.25, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [1.25, 1.00, 0.25, 1.0, 1.0] 11um_Test: [267.0, 270.0, 273.0, 2.0, 1.0] CO2_High_Clouds_Test: [222.0, 224.0, 226.0, 1.0, 1.0] Water_Vapor_High_Clouds_Test: [215.0, 220.0, 225.0, 1.0, 1.0] @@ -166,7 +166,7 @@ Polar_Day_Land: cmult: 0.3 adj: 0.3 pdl_ref3_tpw : -10.00 - test11_4lo : [-16.0, -14.0, -12.0, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [-16.0, -14.0, -12.0, 1.0, 1.0] pdlh20 : [215.0, 220.0, 225.0, 1.0, 1.0] pdlref1 : [0.207, 0.169, 0.132, 1.0, 1.0] 1.38um_High_Cloud_Test: [0.0375, 0.0250, 0.0125, 1.0, 1.0] @@ -196,7 +196,7 @@ Polar_Day_Coast: cmult: [] # I NEED TO WORK ON THIS adj: [] # I NEED TO WORK ON THIS pdl_ref3_tpw_t2 : -10.00 - test11_4lo : [-16.0, -14.0, -12.0, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [-16.0, -14.0, -12.0, 1.0, 1.0] Water_Vapor_High_Clouds_Test: [215.0, 220.0, 225.0, 1.0, 1.0] pdlref1_t2 : [0.207, 0.169, 0.132, 1.0, 1.0] 1.38um_High_Cloud_Test: [0.0375, 0.0250, 0.0125, 1.0, 1.0] @@ -303,7 +303,7 @@ Polar_Ocean_Day: bias: 0.96 midpt_coeff: 0.0200 locut_coeff: 0.0100 - pdo11_4lo : [-11.0, -9.0, -7.0, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [-11.0, -9.0, -7.0, 1.0, 1.0] 11um_Test: [267.0, 270.0, 273.0, 1.0, 1.0] Water_Vapor_High_Clouds_Test: [215.0, 220.0, 225.0, 1.0, 1.0] pdovrathi : [1.001, 1.154, 1.205, 1.0, 1.0] @@ -325,7 +325,7 @@ Polar_Ocean_Night: adj: 1.0 pnobt1 : 280.0 pno_intadj : 0.0 - pno11_4lo : [1.25, 1.00, 0.25, 1.0, 1.0] + 11-4um_Oceanic_Stratus_Test: [1.25, 1.00, 0.25, 1.0, 1.0] pno_11_4_pfm : 1.0 11um_Test: [267.0, 270.0, 273.0, 1.0, 1.0] Water_Vapor_High_Clouds_Test: [215.0, 220.0, 225.0, 1.0, 1.0]