diff --git a/mvcm/main.py b/mvcm/main.py index 999f97de87556f558437c29057972cae3a132475..f4b5c134d0f31e0054781fee19661b7614f0d0d6 100644 --- a/mvcm/main.py +++ b/mvcm/main.py @@ -3,7 +3,7 @@ try: from ruamel import yaml as yml except ImportError: - import ruamel_yaml as yml + import ruamel.yaml as yml import argparse import functools @@ -12,7 +12,7 @@ import time import numpy as np import xarray as xr -from pkg_resources import get_distribution +from pkg_resources import get_distribution # type: ignore import mvcm.read_data as rd import mvcm.scene as scn @@ -127,7 +127,7 @@ def main( sst_file: str = _sst_file, eco_file: str = _eco_file, out_file: str = "temp_out.nc", - verbose: bool = False, + verbose: int = 0, ) -> None: """MVCM main function. @@ -268,11 +268,11 @@ def main( ) # Initialize the confidence arrays for the various test groups - cmin_G1 = np.ones(viirs_data.M11.shape) - cmin_G2 = np.ones(viirs_data.M11.shape) - cmin_G3 = np.ones(viirs_data.M11.shape) - cmin_G4 = np.ones(viirs_data.M11.shape) - cmin_G5 = np.ones(viirs_data.M11.shape) + cmin_g1 = np.ones(viirs_data.M11.shape) + cmin_g2 = np.ones(viirs_data.M11.shape) + cmin_g3 = np.ones(viirs_data.M11.shape) + cmin_g4 = np.ones(viirs_data.M11.shape) + cmin_g5 = np.ones(viirs_data.M11.shape) # cmin_temp = np.ones(viirs_data.M11.shape) if use_hires is True: @@ -281,53 +281,53 @@ def main( m15_name = "M15" # Group 1 - cmin_G1, bits["01"] = MyScene.test_11um(m15_name, cmin_G1, bits["01"]) + cmin_g1, bits["01"] = MyScene.test_11um(m15_name, cmin_g1, bits["01"]) # this test needs to be implemented properly # cmin_G1, bits["02"] = MyScene.surface_temperature_test( - # "", viirs_data, cmin_G1, bits["02"] + # "", viirs_data, cmin_g1, bits["02"] # ) - cmin_G1, bits["03"] = MyScene.sst_test("M15", "M16", cmin_G1, bits["03"]) + cmin_g1, bits["03"] = MyScene.sst_test("M15", "M16", cmin_g1, bits["03"]) # Group 2 - cmin_G2, bits["04"] = MyScene.bt_diff_86_11um("M14-M15", cmin_G2, bits["04"]) - cmin_G2, bits["05"] = MyScene.test_11_12um_diff("M15-M16", cmin_G2, bits["05"]) - cmin_G2, bits["06"] = MyScene.variability_11um_test( - m15_name, cmin_G2, bits["06"] + cmin_g2, bits["04"] = MyScene.bt_diff_86_11um("M14-M15", cmin_g2, bits["04"]) + cmin_g2, bits["05"] = MyScene.test_11_12um_diff("M15-M16", cmin_g2, bits["05"]) + cmin_g2, bits["06"] = MyScene.variability_11um_test( + m15_name, cmin_g2, bits["06"] ) - cmin_G2, bits["07"] = MyScene.bt_difference_11_4um_test_ocean( - "M15-M12", cmin_G2, bits["07"] + cmin_g2, bits["07"] = MyScene.bt_difference_11_4um_test_ocean( + "M15-M12", cmin_g2, bits["07"] ) - cmin_G2, bits["08"] = MyScene.bt_difference_11_4um_test_land( - "M15-M16", "M15-M12", cmin_G2, bits["08"] + cmin_g2, bits["08"] = MyScene.bt_difference_11_4um_test_land( + "M15-M16", "M15-M12", cmin_g2, bits["08"] ) - cmin_G2, bits["09"] = MyScene.oceanic_stratus_11_4um_test( - "M15-M12", cmin_G2, bits["09"] + cmin_g2, bits["09"] = MyScene.oceanic_stratus_11_4um_test( + "M15-M12", cmin_g2, bits["09"] ) # Group 3 - cmin_G3, bits["10"] = MyScene.nir_reflectance_test("M07", cmin_G3, bits["10"]) + cmin_g3, bits["10"] = MyScene.nir_reflectance_test("M07", cmin_g3, bits["10"]) # I need to make sure that this test is performing as intended. # Right now it doesn't seem to have an impact in any way whatsoever - cmin_G3, bits["11"] = MyScene.vis_nir_ratio_test( - "M07-M05ratio", cmin_G3, bits["11"] + cmin_g3, bits["11"] = MyScene.vis_nir_ratio_test( + "M07-M05ratio", cmin_g3, bits["11"] ) - cmin_G3, bits["12"] = MyScene.test_16_21um_reflectance( - "M10", cmin_G3, bits["12"] + cmin_g3, bits["12"] = MyScene.test_16_21um_reflectance( + "M10", cmin_g3, bits["12"] ) # this test seems to be almost working, but not 100% there yet - cmin_G3, bits["13"] = MyScene.visible_reflectance_test( - "M128", cmin_G3, bits["13"] + cmin_g3, bits["13"] = MyScene.visible_reflectance_test( + "M128", cmin_g3, bits["13"] ) - cmin_G3, bits["11"] = MyScene.gemi_test("GEMI", cmin_G3, bits["11"]) + cmin_g3, bits["11"] = MyScene.gemi_test("GEMI", cmin_g3, bits["11"]) # Group 4 - cmin_G4, bits["15"] = MyScene.test_1_38um_high_clouds( - "M09", cmin_G4, bits["15"] + cmin_g4, bits["15"] = MyScene.test_1_38um_high_clouds( + "M09", cmin_g4, bits["15"] ) # Group 5 - cmin_G5, bits["16"] = MyScene.thin_cirrus_4_12um_BTD_test( - "M13-M16", cmin_G5, bits["16"] + cmin_g5, bits["16"] = MyScene.thin_cirrus_4_12um_BTD_test( + "M13-M16", cmin_g5, bits["16"] ) bit = {} @@ -338,11 +338,11 @@ def main( # # if utils.group_count(bit) != 0: """ cmin_3d[i, :, :] = np.fmin(cmin_temp, - np.power(cmin_G1 * cmin_G2 * cmin_G3 * cmin_G4 * cmin_G5, + np.power(cmin_g1 * cmin_g2 * cmin_g3 * cmin_g4 * cmin_g5, 1/utils.group_count(bit))) """ cmin = np.power( - cmin_G1 * cmin_G2 * cmin_G3 * cmin_G4 * cmin_G5, 1 / utils.group_count(bit) + cmin_g1 * cmin_g2 * cmin_g3 * cmin_g4 * cmin_g5, 1 / utils.group_count(bit) ) cmin_3d[i, :, :] = cmin