From c7993f61b11b9379503547706b75f4e8db673965 Mon Sep 17 00:00:00 2001
From: Paolo Veglio <paolo.veglio@ssec.wisc.edu>
Date: Wed, 9 Nov 2022 22:26:06 +0000
Subject: [PATCH] added 11-4um test for simple cases
---
main.py | 2 +-
read_data.py | 2 ++
thresholds.mvcm.snpp.v0.0.1.yaml | 16 ++++++++--------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/main.py b/main.py
index 3c55283..e4eb5aa 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 087c32b..9daa89b 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 ee93cca..654002e 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]
--
GitLab