grdwindinversion 0.2.3.post12__tar.gz → 0.2.3.post13__tar.gz

{grdwindinversion-0.2.3.post12/grdwindinversion.egg-info → grdwindinversion-0.2.3.post13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: grdwindinversion
-Version: 0.2.3.post12
+Version: 0.2.3.post13
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 License: MIT
 Classifier: Development Status :: 2 - Pre-Alpha

{grdwindinversion-0.2.3.post12 → grdwindinversion-0.2.3.post13}/grdwindinversion/config_prod.yaml

@@ -26,3 +26,8 @@ RCM:
     apply_flattening: True
     recalibration: False
     ancillary: "ecmwf"
+
+inc_step: 0.1
+wspd_step: 0.1
+phi_step: 1.0
+resolution: "high"

{grdwindinversion-0.2.3.post12 → grdwindinversion-0.2.3.post13}/grdwindinversion/config_prod_recal.yaml

@@ -5,6 +5,10 @@ S1A:
     apply_flattening: True
     recalibration: True
     ancillary: "ecmwf"
+    inc_step: 0.1
+    wspd_step: 0.1
+    phi_step: 1.0
+    resolution: "high"
 S1B:
     GMF_VV_NAME: "gmf_cmod5n"
     GMF_VH_NAME: "gmf_s1_v2"
@@ -12,6 +16,10 @@ S1B:
     apply_flattening: True
     recalibration: True
     ancillary: "ecmwf"
+    inc_step: 0.1
+    wspd_step: 0.1
+    phi_step: 1.0
+    resolution: "high"
 RS2:
     GMF_VV_NAME: "gmf_cmod5n"
     GMF_VH_NAME: "gmf_rs2_v2"
@@ -19,6 +27,10 @@ RS2:
     apply_flattening: False
     recalibration: True
     ancillary: "ecmwf"
+    inc_step: 0.1
+    wspd_step: 0.1
+    phi_step: 1.0
+    resolution: "high"
 RCM:
     GMF_VV_NAME: "gmf_cmod5n"
     GMF_VH_NAME: "gmf_rcm_noaa"
@@ -26,3 +38,7 @@ RCM:
     apply_flattening: True
     recalibration: True
     ancillary: "ecmwf"
+    inc_step: 0.1
+    wspd_step: 0.1
+    phi_step: 1.0
+    resolution: "high"

{grdwindinversion-0.2.3.post12 → grdwindinversion-0.2.3.post13}/grdwindinversion/inversion.py

@@ -487,7 +487,7 @@ def makeL2asOwi(xr_dataset, dual_pol, copol, crosspol):
     return xr_dataset, encoding
 
 
-def preprocess(filename, outdir, config_path, config_luts_path, overwrite=False, resolution='1000m'):
+def preprocess(filename, outdir, config_path, overwrite=False, resolution='1000m'):
     """
     Main function to generate L2 product.
 
@@ -499,8 +499,6 @@ def preprocess(filename, outdir, config_path, config_luts_path, overwrite=False,
         output folder
     config_path : str
         configuration file path
-    config_luts_path : str
-        configuration LUTs file path
     overwrite : bool, optional
         overwrite existing file
     resolution : str, optional
@@ -515,16 +513,6 @@ def preprocess(filename, outdir, config_path, config_luts_path, overwrite=False,
     sensor, sensor_longname, fct_meta, fct_dataset = getSensorMetaDataset(
         filename)
 
-    if os.path.exists(config_luts_path):
-        with open(config_luts_path, 'r') as file:
-            config_luts = yaml.load(
-                file,
-                Loader=yaml.FullLoader
-            )
-    else:
-        raise FileNotFoundError(
-            'config_luts_path do not exists, got %s ' % config_luts_path)
-
     if os.path.exists(config_path):
         with open(config_path, 'r') as file:
             config_base = yaml.load(
@@ -747,10 +735,10 @@ def preprocess(filename, outdir, config_path, config_luts_path, overwrite=False,
         xr_dataset["path_aux_cal_old"] = os.path.basename(os.path.dirname(
             os.path.dirname(xsar_dataset.datatree['recalibration'].attrs['path_aux_cal_old'])))
 
-    return xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf, model_vv, model_vh, sigma0_ocean_cross, dsig_cross, sensor_longname, out_file, config, config_luts
+    return xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf, model_vv, model_vh, sigma0_ocean_cross, dsig_cross, sensor_longname, out_file, config
 
 
-def makeL2(filename, outdir, config_path, config_luts_path, overwrite=False, generateCSV=True, resolution='1000m'):
+def makeL2(filename, outdir, config_path, overwrite=False, generateCSV=True, resolution='1000m'):
     """
     Main function to generate L2 product.
 
@@ -762,8 +750,6 @@ def makeL2(filename, outdir, config_path, config_luts_path, overwrite=False, gen
         output folder
     config_path : str
         configuration file path
-    config_luts_path : str
-        configuration LUTs file path
     overwrite : bool, optional
         overwrite existing file
     generateCSV : bool, optional
@@ -779,17 +765,17 @@ def makeL2(filename, outdir, config_path, config_luts_path, overwrite=False, gen
         final dataset
     """
 
-    xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf, model_vv, model_vh, sigma0_ocean_cross, dsig_cross, sensor_longname, out_file, config, config_luts = preprocess(
-        filename, outdir, config_path, config_luts_path, overwrite, resolution)
+    xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf, model_vv, model_vh, sigma0_ocean_cross, dsig_cross, sensor_longname, out_file, config = preprocess(
+        filename, outdir, config_path, overwrite, resolution)
 
     kwargs = {
-        "inc_step_lr": config_luts.pop("inc_step_lr", None),
-        "wpsd_step_lr": config_luts.pop("wspd_step_lr", None),
-        "phi_step_lr": config_luts.pop("phi_step_lr", None),
-        "inc_step": config_luts.pop("inc_step", None),
-        "wpsd_step": config_luts.pop("wspd_step", None),
-        "phi_step": config_luts.pop("phi_step", None),
-        "resolution": config_luts.pop("resolution", None),
+        "inc_step_lr": config.pop("inc_step_lr", None),
+        "wpsd_step_lr": config.pop("wspd_step_lr", None),
+        "phi_step_lr": config.pop("phi_step_lr", None),
+        "inc_step": config.pop("inc_step", None),
+        "wpsd_step": config.pop("wspd_step", None),
+        "phi_step": config.pop("phi_step", None),
+        "resolution": config.pop("resolution", None),
     }
 
     # need to load gmfs before

{grdwindinversion-0.2.3.post12 → grdwindinversion-0.2.3.post13}/grdwindinversion/main.py

@@ -13,9 +13,6 @@ def processor_starting_point():
     parser.add_argument('--input_file', help='input file path', required=True)
     parser.add_argument('--config_file',
                         help='config file path [if not provided will take config file based on input file]', required=True)
-    parser.add_argument('--config_file_luts',
-                        help='config file (luts) path', required=True)
-
     parser.add_argument('--resolution', required=False, default='1000m',
                         help='set resolution ["full" | "1000m" | "xXxm"]')
 
@@ -45,14 +42,14 @@ def processor_starting_point():
     #     raise Exception('this processor only handle acquisitions with VV or VV+VH polarization for now.')
 
     config_file = args.config_file
-    config_file_luts = args.config_file_luts
     out_folder = args.outputdir
     resolution = args.resolution
     if resolution == "full":
         resolution = None
 
-    out_file, outputds = makeL2(input_file, out_folder, config_file, config_file_luts,
+    out_file, outputds = makeL2(input_file, out_folder, config_file,
                                 overwrite=args.overwrite, resolution=resolution, generateCSV=args.no_generate_csv)
+
     logging.info('out_file: %s', out_file)
     logging.info('current memory usage: %s ', get_memory_usage(var='current'))
     logging.info('done in %1.3f min', (time.time() - t0) / 60.)

{grdwindinversion-0.2.3.post12 → grdwindinversion-0.2.3.post13/grdwindinversion.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: grdwindinversion
-Version: 0.2.3.post12
+Version: 0.2.3.post13
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 License: MIT
 Classifier: Development Status :: 2 - Pre-Alpha

{grdwindinversion-0.2.3.post12 → grdwindinversion-0.2.3.post13}/grdwindinversion.egg-info/SOURCES.txt

@@ -33,7 +33,6 @@ docs/examples/wind-inversion-from-grd.ipynb
 grdwindinversion/.gitignore
 grdwindinversion/.travis.yml
 grdwindinversion/__init__.py
-grdwindinversion/config_luts.yaml
 grdwindinversion/config_prod.yaml
 grdwindinversion/config_prod_recal.yaml
 grdwindinversion/data_config.yaml

grdwindinversion-0.2.3.post12/grdwindinversion/config_luts.yaml

@@ -1,4 +0,0 @@
-inc_step: 0.1
-wspd_step: 0.1
-phi_step: 1.0
-resolution: "high"