grdwindinversion 1.0.0__tar.gz → 1.0.2__tar.gz

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/.github/workflows/ci.yml

@@ -79,12 +79,6 @@ jobs:
                   echo "auxiliary_dir: ./test_data/auxiliary" >> ~/.xsar/config.yml
                   echo "path_dataframe_aux: ./test_data/auxiliary/active_aux.csv" >> ~/.xsar/config.yml
 
-              # Set up grdwindinversion configuration
-            - name: Setup grdwindinversion configuration
-              run: |
-                  mkdir -p ~/.grdwindinversion
-                  cp tests/data_config_ci.yaml ~/.grdwindinversion/data_config.yaml
-
               # Run the tests
             - name: Run tests
               run: |

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: grdwindinversion
-Version: 1.0.0
+Version: 1.0.2
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 Author-email: Antoine Grouazel <antoine.grouazel@ifremer.fr>
 License: MIT

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/docs/configuration.rst

@@ -8,41 +8,10 @@ Configuration Files Implementation Guide
 Overview
 --------
 
-The ``grdwindinversion`` configuration system uses two types of YAML files:
+The ``grdwindinversion`` configuration system uses a **single YAML configuration file** that contains both data source paths and processing parameters.
 
-1. **data_config.yaml**: Paths to data sources (ancillary, , LUTs, masks)
-2. **config_*.yaml**: Processing parameters specific to each satellite
-
-Configuration System Architecture
-----------------------------------
-
-Loading Hierarchy
-~~~~~~~~~~~~~~~~~
-
-The ``data_config.yaml`` file is loaded with the following priority:
-
-.. code-block:: text
-
-    1. ~/.grdwindinversion/data_config.yaml  (user local configuration)
-    2. ./local_data_config.yaml              (project local configuration)
-    3. <package>/data_config.yaml            (package default configuration)
-
-Accessing Configuration
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: python
-
-    from grdwindinversion.load_config import getConf
-
-    # Get the global configuration dictionary
-    config = getConf()
-
-    # Access data paths
-    ecmwf_path = config["ecmwf_0100_1h"]
-    nc_luts_path = config["nc_luts_path"]
-
-data_config.yaml Structure
----------------------------
+Configuration File Structure
+-----------------------------
 
 1. Meteorological Data Paths (ancillary)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/docs/examples/streaks-display.ipynb

@@ -213,14 +213,14 @@
     "    fig = plt.figure(figsize=(10, 9))\n",
     "    ax = plt.axes(projection=ccrs.PlateCarree())\n",
     "\n",
-    "    # Calculer les composantes u et v \u00e0 partir des angles streaks_dir\n",
+    "    # Compute u,v from streaks \n",
     "    u, v, u_norm, v_norm = get_uv_from_dir(streaks_dir)\n",
     "\n",
     "    # Display streaks direction\n",
     "    #ax.quiver(longitude, latitude, u_norm, v_norm, edgecolors='k',  norm=norm, pivot= 'mid', scale_units='xy', scale=4., zorder=10, width=0.1/25,transform = ccrs.PlateCarree(), color = 'red', label = 'owiWindStreaks')\n",
     "    ax.quiver(longitude, latitude, u_norm, v_norm, edgecolors='k',  norm=norm, pivot= 'mid', scale_units='xy', scale=8., zorder=10, width=0.1/25,transform = ccrs.PlateCarree(), color = 'red', label = 'owiWindStreaks')\n",
     "\n",
-    "    #\u00a0Display ancillary wind direction\n",
+    "    # Display ancillary wind direction\n",
     "    #ax.quiver(lons, lats, u_norm_ancillary, v_norm_ancillary, edgecolors='k',  norm=norm, pivot= 'mid', scale_units='xy', scale=4., zorder=10, width=0.1/25,transform = ccrs.PlateCarree(), color='blue', label = \"owiAncillaryWindDirection\")\n",
     "    ax.quiver(lons, lats, u_norm_ancillary, v_norm_ancillary, edgecolors='k',  norm=norm, pivot= 'mid', scale_units='xy', scale=8., zorder=10, width=0.1/25,transform = ccrs.PlateCarree(), color='blue', label = \"owiAncillaryWindDirection\")\n",
     "\n",
@@ -234,8 +234,6 @@
     "    lat_min, lat_max = np.nanmin(lats) - .2, np.nanmax(lats) + .7\n",
     "    ax.set_extent([lon_min, lon_max, lat_min, lat_max], crs=ccrs.PlateCarree())\n",
     "\n",
-    "\n",
-    "    # Configurer les axes\n",
     "    ax.set_xlabel('Longitude')\n",
     "    ax.set_ylabel('Latitude')\n",
     "    ax.set_aspect('equal', adjustable='box')\n",
@@ -300,9 +298,9 @@
    "source": []
   }
  ],
- "metadata": {
+"metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -321,4 +319,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/docs/examples/wind-inversion-from-grd.ipynb

@@ -109,9 +109,9 @@
    ]
   }
  ],
- "metadata": {
+"metadata": {
   "kernelspec": {
-   "display_name": "env_xsar",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/docs/modules.rst

@@ -15,14 +15,6 @@ Wind Inversion
     :members: inverse, makeL2, makeL2asOwi, getSensorMetaDataset, getOutputName, inverse_dsig_wspd, addMasks_toMeta, mergeLandMasks, processLandMask, getAncillary, preprocess, process_gradients, transform_winddir
     :show-inheritance:
 
-Configuration Management
-------------------------
-
-.. automodule:: grdwindinversion.load_config
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 Gradient Features
 -----------------
 

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/docs/usage.rst

@@ -13,11 +13,11 @@ To use grdwindinversion in a project::
 Configuration Setup
 -------------------
 
-To define the path where the ECMWF files used for wind inversion (or any supported ancillary wind)::
+To define paths for ECMWF files and other data sources, create or copy a configuration file::
 
-    cp ./grdwindinversion/data_config.yaml ./grdwindinversion/local_data_config.yaml
-    # Then edit the file
-    vi ./grdwindinversion/local_data_config.yaml
+    cp ./grdwindinversion/config_prod_v3.yaml ./my_config.yaml
+    # Then edit the file to match your local paths
+    vi ./my_config.yaml
 
 See :doc:`configuration` for detailed configuration options.
 

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/__init__.py

@@ -1,13 +1,11 @@
 from importlib.metadata import version
 from grdwindinversion.inversion import inverse, makeL2, makeL2asOwi, getSensorMetaDataset
-from grdwindinversion.load_config import getConf
 
 __all__ = [
     "inverse",
     "makeL2",
     "makeL2asOwi",
     "getSensorMetaDataset",
-    "getConf",
     "inversion",
 ]
 

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/config_prod_recal.yaml

@@ -1,3 +1,29 @@
+unit_test_s1_product: "./sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/252/S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SAFE"
+unit_test_rcm_product: "./l1/rcm/rcm-1/sclnd/2023/273/RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD"
+unit_test_rs2_product: "./L1/VV_VH/2022/247/RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF"
+
+masks:
+    land:
+        - name: "gshhsH"
+          path: "/home/loc-datawork-cersat-public/cache/project/sarwing/masks/gshhg-shp-2.3.7/GSHHS_shp/h/GSHHS_h_L1.shp"
+
+ancillary_sources:
+    ecmwf:
+        - name: "ecmwf_0100_1h"
+          path: "/home/loc-datawork-cersat-public/provider/ecmwf/forecast/hourly/0100deg/netcdf_light/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc"
+
+        - name: "ecmwf_0125_1h"
+          path: "/home/loc-datawork-cersat-intranet/project/ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc"
+
+    era5:
+        - name: "era5_0250_1h"
+          path: "/home/ref-ecmwf/ERA5/%Y/%m/era_5-copernicus__%Y%m%d.nc"
+
+sarwing_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/"
+nc_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/nc_luts"
+lut_cmod7_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmod7_official/cmod7_and_python_script"
+lut_ms1ahw_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmodms1ahw"
+
 no_subdir: True
 winddir_convention: "meteorological"
 add_gradientsfeatures: False

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/config_prod_recal_streaks_nrcsmod.yaml

@@ -1,3 +1,29 @@
+unit_test_s1_product: "./sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/252/S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SAFE"
+unit_test_rcm_product: "./l1/rcm/rcm-1/sclnd/2023/273/RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD"
+unit_test_rs2_product: "./L1/VV_VH/2022/247/RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF"
+
+masks:
+    land:
+        - name: "gshhsH"
+          path: "/home/loc-datawork-cersat-public/cache/project/sarwing/masks/gshhg-shp-2.3.7/GSHHS_shp/h/GSHHS_h_L1.shp"
+
+ancillary_sources:
+    ecmwf:
+        - name: "ecmwf_0100_1h"
+          path: "/home/loc-datawork-cersat-public/provider/ecmwf/forecast/hourly/0100deg/netcdf_light/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc"
+
+        - name: "ecmwf_0125_1h"
+          path: "/home/loc-datawork-cersat-intranet/project/ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc"
+
+    era5:
+        - name: "era5_0250_1h"
+          path: "/home/ref-ecmwf/ERA5/%Y/%m/era_5-copernicus__%Y%m%d.nc"
+
+sarwing_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/"
+nc_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/nc_luts"
+lut_cmod7_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmod7_official/cmod7_and_python_script"
+lut_ms1ahw_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmodms1ahw"
+
 no_subdir: True
 winddir_convention: "meteorological"
 add_gradientsfeatures: True

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/config_prod_streaks.yaml

@@ -1,3 +1,29 @@
+unit_test_s1_product: "./sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/252/S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SAFE"
+unit_test_rcm_product: "./l1/rcm/rcm-1/sclnd/2023/273/RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD"
+unit_test_rs2_product: "./L1/VV_VH/2022/247/RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF"
+
+masks:
+    land:
+        - name: "gshhsH"
+          path: "/home/loc-datawork-cersat-public/cache/project/sarwing/masks/gshhg-shp-2.3.7/GSHHS_shp/h/GSHHS_h_L1.shp"
+
+ancillary_sources:
+    ecmwf:
+        - name: "ecmwf_0100_1h"
+          path: "/home/loc-datawork-cersat-public/provider/ecmwf/forecast/hourly/0100deg/netcdf_light/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc"
+
+        - name: "ecmwf_0125_1h"
+          path: "/home/loc-datawork-cersat-intranet/project/ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc"
+
+    era5:
+        - name: "era5_0250_1h"
+          path: "/home/ref-ecmwf/ERA5/%Y/%m/era_5-copernicus__%Y%m%d.nc"
+
+sarwing_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/"
+nc_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/nc_luts"
+lut_cmod7_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmod7_official/cmod7_and_python_script"
+lut_ms1ahw_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmodms1ahw"
+
 no_subdir: True
 winddir_convention: "meteorological"
 add_gradientsfeatures: True
@@ -110,4 +136,4 @@ RCM:
     inc_step: 0.1
     wspd_step: 0.1
     phi_step: 1.0
-    resolution: "high"
+    resolution: "high"

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/config_prod_streaks_nrcsmod.yaml

@@ -1,3 +1,29 @@
+unit_test_s1_product: "./sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/252/S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SAFE"
+unit_test_rcm_product: "./l1/rcm/rcm-1/sclnd/2023/273/RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD"
+unit_test_rs2_product: "./L1/VV_VH/2022/247/RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF"
+
+masks:
+    land:
+        - name: "gshhsH"
+          path: "/home/loc-datawork-cersat-public/cache/project/sarwing/masks/gshhg-shp-2.3.7/GSHHS_shp/h/GSHHS_h_L1.shp"
+
+ancillary_sources:
+    ecmwf:
+        - name: "ecmwf_0100_1h"
+          path: "/home/loc-datawork-cersat-public/provider/ecmwf/forecast/hourly/0100deg/netcdf_light/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc"
+
+        - name: "ecmwf_0125_1h"
+          path: "/home/loc-datawork-cersat-intranet/project/ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc"
+
+    era5:
+        - name: "era5_0250_1h"
+          path: "/home/ref-ecmwf/ERA5/%Y/%m/era_5-copernicus__%Y%m%d.nc"
+
+sarwing_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/"
+nc_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/nc_luts"
+lut_cmod7_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmod7_official/cmod7_and_python_script"
+lut_ms1ahw_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmodms1ahw"
+
 no_subdir: True
 winddir_convention: "meteorological"
 add_gradientsfeatures: True

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/config_prod_v3.yaml

@@ -1,3 +1,29 @@
+unit_test_s1_product: "./sentinel-1a/L1/IW/S1A_IW_GRDH_1S/2021/252/S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F.SAFE"
+unit_test_rcm_product: "./l1/rcm/rcm-1/sclnd/2023/273/RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD"
+unit_test_rs2_product: "./L1/VV_VH/2022/247/RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF"
+
+masks:
+    land:
+        - name: "gshhsH"
+          path: "/home/loc-datawork-cersat-public/cache/project/sarwing/masks/gshhg-shp-2.3.7/GSHHS_shp/h/GSHHS_h_L1.shp"
+
+ancillary_sources:
+    ecmwf:
+        - name: "ecmwf_0100_1h"
+          path: "/home/loc-datawork-cersat-public/provider/ecmwf/forecast/hourly/0100deg/netcdf_light/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc"
+
+        - name: "ecmwf_0125_1h"
+          path: "/home/loc-datawork-cersat-intranet/project/ecmwf/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc"
+
+    era5:
+        - name: "era5_0250_1h"
+          path: "/home/ref-ecmwf/ERA5/%Y/%m/era_5-copernicus__%Y%m%d.nc"
+
+sarwing_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/"
+nc_luts_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/nc_luts"
+lut_cmod7_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmod7_official/cmod7_and_python_script"
+lut_ms1ahw_path: "/home/loc-datawork-cersat-public/cache/project/sarwing/GMFS/v1.6/GMF_cmodms1ahw"
+
 no_subdir: True
 winddir_convention: "meteorological"
 add_gradientsfeatures: False

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/inversion.py

@@ -15,10 +15,9 @@ from scipy.ndimage import binary_dilation
 import re
 import os
 import logging
-import string
+
 
 from grdwindinversion.utils import check_incidence_range, get_pol_ratio_name, timing, convert_polarization_name
-from grdwindinversion.load_config import getConf
 os.environ["OMP_NUM_THREADS"] = "1"
 os.environ["OPENBLAS_NUM_THREADS"] = "1"
 os.environ["MKL_NUM_THREADS"] = "1"
@@ -170,7 +169,7 @@ def getOutputName(
     return out_file
 
 
-def addMasks_toMeta(meta: xsar.BaseMeta) -> dict:
+def addMasks_toMeta(meta: xsar.BaseMeta, conf: dict) -> dict:
     """
     Add high-resolution masks (land, ice, lakes, etc.) from shapefiles to meta object.
 
@@ -192,6 +191,8 @@ def addMasks_toMeta(meta: xsar.BaseMeta) -> dict:
     ----------
     meta : xsar.BaseMeta
         Metadata object to add mask features to. Must have a set_mask_feature method.
+    conf : dict
+        Configuration dictionary containing masks definition
 
     Returns
     -------
@@ -210,7 +211,6 @@ def addMasks_toMeta(meta: xsar.BaseMeta) -> dict:
         raise AttributeError(
             f"Meta object of type {type(meta).__name__} must have a 'set_mask_feature' method")
 
-    conf = getConf()
     masks_by_category = {}
 
     # Check for 'masks' key
@@ -395,7 +395,7 @@ def processLandMask(xr_dataset, dilation_iterations=3, merged_masks=None):
         xr_dataset.land_mask.attrs["history"] = new_history
 
 
-def getAncillary(meta, ancillary_name="ecmwf"):
+def getAncillary(meta, ancillary_name, conf):
     """
     Map ancillary wind from "ecmwf" or "era5" or other sources.
     This function is used to check if the model files are available and to map the model to the SAR data.
@@ -406,6 +406,8 @@ def getAncillary(meta, ancillary_name="ecmwf"):
     meta: obj `xsar.BaseMeta` (one of the supported SAR mission)
     ancillary_name: str
         Name of the ancillary source (ecmwf or era5)
+    conf: dict
+        Configuration dictionary containing ancillary_sources
 
     Returns
     -------
@@ -414,8 +416,7 @@ def getAncillary(meta, ancillary_name="ecmwf"):
         - map_model (dict): mapping of model variables to SAR data
         - metadata (dict): ancillary metadata with 'source' and 'source_path' keys
     """
-    logging.debug("conf: %s", getConf())
-    conf = getConf()
+    logging.debug("conf: %s", conf)
     if 'ancillary_sources' not in conf:
         raise ValueError("Configuration must contain 'ancillary_sources'")
 
@@ -465,7 +466,7 @@ def getAncillary(meta, ancillary_name="ecmwf"):
             # Log selection
             if len(ancillary_sources) > 1:
                 logging.info(
-                    f"Multiple {ancillary_name} models configured. Using {selected_name} (priority order)")
+                    f"Multiple {ancillary_name} models configured. Using {selected_name} (with respect to priority order)")
             else:
                 logging.info(
                     f"Only one {ancillary_name} model configured: using {selected_name}")
@@ -1002,6 +1003,11 @@ def preprocess(
     if os.path.exists(config_path):
         with open(config_path, "r") as file:
             config_base = yaml.load(file, Loader=yaml.FullLoader)
+
+        # Validate configuration structure
+        from grdwindinversion.utils import test_config
+        test_config(config_base)
+
         try:
             # check if sensor is in the config
             config = config_base[sensor]
@@ -1015,7 +1021,7 @@ def preprocess(
     meta = fct_meta(filename)
 
     # Add masks to meta if configured (land, ice, lakes, etc.)
-    masks_by_category = addMasks_toMeta(meta)
+    masks_by_category = addMasks_toMeta(meta, config_base)
 
     # si une des deux n'est pas VV VH HH HV on ne fait rien
     if not all([pol in ["VV", "VH", "HH", "HV"] for pol in meta.pols.split(" ")]):
@@ -1086,7 +1092,8 @@ def preprocess(
         raise FileExistsError("outfile %s already exists" % out_file)
 
     ancillary_name = config["ancillary"]
-    map_model, ancillary_metadata = getAncillary(meta, ancillary_name)
+    map_model, ancillary_metadata = getAncillary(
+        meta, ancillary_name, config_base)
     if map_model is None:
         raise Exception(
             f"the weather model is not set `map_model` is None -> you probably don't have access to {ancillary_name} archive"
@@ -1212,10 +1219,10 @@ def preprocess(
     nc_luts = [x for x in [model_co, model_cross] if x.startswith("nc_lut")]
 
     if len(nc_luts) > 0:
-        windspeed.register_nc_luts(getConf()["nc_luts_path"])
+        windspeed.register_nc_luts(config_base["nc_luts_path"])
 
     if model_co == "gmf_cmod7":
-        windspeed.register_cmod7(getConf()["lut_cmod7_path"])
+        windspeed.register_cmod7(config_base["lut_cmod7_path"])
     #  Step 2 - clean and prepare dataset
 
     # variables to not keep in the L2
@@ -1275,8 +1282,7 @@ def preprocess(
     xr_dataset.offboresight.attrs["standard_name"] = "offboresight"
 
     # merge land masks
-    conf = getConf()
-    land_mask_strategy = conf.get("LAND_MASK_STRATEGY", "merge")
+    land_mask_strategy = config_base.get("LAND_MASK_STRATEGY", "merge")
     logging.info(f"land_mask_strategy = {land_mask_strategy}")
 
     # Store masks_by_category in config for later cleanup
@@ -1292,11 +1298,10 @@ def preprocess(
     processLandMask(xr_dataset, dilation_iterations=3,
                     merged_masks=merged_land_masks)
 
-    logging.debug("mask is a copy of land_mask")
-
     # Create main mask from land_mask
     # For now, mask uses the same values as land_mask
     # Can be extended later to include ice (value 3) and other categories
+    logging.debug("mask is a copy of land_mask")
     xr_dataset["mask"] = xr.DataArray(xr_dataset.land_mask)
     xr_dataset.mask.attrs = {}
     xr_dataset.mask.attrs["long_name"] = "Mask of data"
@@ -1709,8 +1714,9 @@ def makeL2(
         config["return_status"] = 99
 
     if dsig_cr_step == "nrcs":
-        logging.info(
-            "dsig_cr_step is nrcs : polarization are mixed at cost function step")
+        if dual_pol:
+            logging.info(
+                "dsig_cr_step is nrcs : polarization are mixed at cost function step")
         wind_co, wind_dual, windspeed_cr = inverse(
             dual_pol,
             inc=xr_dataset["incidence"],
@@ -1723,13 +1729,17 @@ def makeL2(
             **kwargs,
         )
     elif dsig_cr_step == "wspd":
-        logging.info(
-            "dsig_cr_step is wspd : polarization are mixed at winds speed step")
+        if dual_pol:
+            logging.info(
+                "dsig_cr_step is wspd : polarization are mixed at winds speed step")
 
-        if apply_flattening:
-            nesz_cross = xr_dataset["nesz_cross_flattened"]
+        if dual_pol:
+            if apply_flattening:
+                nesz_cross = xr_dataset["nesz_cross_flattened"]
+            else:
+                nesz_cross = xr_dataset.nesz.sel(pol=crosspol)
         else:
-            nesz_cross = xr_dataset.nesz.sel(pol=crosspol)
+            nesz_cross = None
 
         wind_co, wind_dual, windspeed_cr, alpha = inverse_dsig_wspd(
             dual_pol,
@@ -1743,10 +1753,12 @@ def makeL2(
             model_cross=model_cross,
             **kwargs
         )
-        xr_dataset["alpha"] = xr.DataArray(
-            data=alpha, dims=xr_dataset["incidence"].dims, coords=xr_dataset["incidence"].coords)
-        xr_dataset["alpha"].attrs["apply_flattening"] = str(apply_flattening)
-        xr_dataset["alpha"].attrs["comments"] = "alpha used to ponderate copol and crosspol. this ponderation is done will combining wind speeds."
+        if dual_pol and alpha is not None:
+            xr_dataset["alpha"] = xr.DataArray(
+                data=alpha, dims=xr_dataset["incidence"].dims, coords=xr_dataset["incidence"].coords)
+            xr_dataset["alpha"].attrs["apply_flattening"] = str(
+                apply_flattening)
+            xr_dataset["alpha"].attrs["comments"] = "alpha used to ponderate copol and crosspol. this ponderation is done will combining wind speeds."
 
     else:
         raise ValueError(

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/main.py

@@ -20,7 +20,6 @@ def processor_starting_point():
 
     from grdwindinversion.inversion import makeL2
     from grdwindinversion.utils_memory import get_memory_usage
-    from grdwindinversion.load_config import config_path
     import grdwindinversion
 
     parser = argparse.ArgumentParser(
@@ -68,8 +67,6 @@ def processor_starting_point():
         )
     t0 = time.time()
 
-    logging.info("config path: %s", config_path)
-
     input_file = args.input_file.rstrip("/")
     logging.info("input file: %s", input_file)
 

{grdwindinversion-1.0.0 → grdwindinversion-1.0.2}/grdwindinversion/utils.py

@@ -110,7 +110,7 @@ def get_pol_ratio_name(model_co):
             import re
 
             def check_format(s):
-                pattern = r"^([a-zA-Z0-9]+)_R(high|low)_hh_([a-zA-Z0-9_]+)$"
+                pattern = r"^([a-zA-Z0-9_]+)_R(high|low)_hh_([a-zA-Z0-9_]+)$"
                 match = re.match(pattern, s)
                 if match:
                     vvgmf, res, polrationame = match.groups()
@@ -154,3 +154,108 @@ def timing(logger=logger.debug):
         return wrapper
 
     return decorator
+
+
+def test_config(config):
+    """
+    Validate configuration structure.
+
+    Checks that the configuration contains all required fields:
+    - ancillary_sources (with ecmwf or era5)
+    - nc_luts_path (required)
+    - lut_cmod7_path (optional - required only if using gmf_cmod7)
+    - lut_ms1ahw_path (optional - required only if using gmf_cmodms1ahw)
+    - masks (optional)
+
+    Note: If you use predefined LUTs (gmf_cmod7, gmf_cmodms1ahw, etc.),
+    they must be loaded with the corresponding path keywords:
+    - gmf_cmod7 requires lut_cmod7_path
+    - gmf_cmodms1ahw requires lut_ms1ahw_path
+
+    Parameters
+    ----------
+    config : dict
+        Configuration dictionary to validate
+
+    Raises
+    ------
+    ValueError
+        If configuration is missing required fields or has invalid structure
+    """
+    # Check ancillary_sources
+    if 'ancillary_sources' not in config:
+        raise ValueError("Configuration must contain 'ancillary_sources'")
+
+    if not isinstance(config['ancillary_sources'], dict):
+        raise ValueError("'ancillary_sources' must be a dictionary")
+
+    if not config['ancillary_sources']:
+        raise ValueError("'ancillary_sources' must not be empty")
+
+    # Check that at least ecmwf or era5 is configured
+    has_ecmwf = 'ecmwf' in config['ancillary_sources']
+    has_era5 = 'era5' in config['ancillary_sources']
+    if not (has_ecmwf or has_era5):
+        raise ValueError(
+            "'ancillary_sources' must contain at least 'ecmwf' or 'era5'")
+
+    # Validate ancillary sources structure
+    for ancillary_type, sources in config['ancillary_sources'].items():
+        if not isinstance(sources, list):
+            raise ValueError(
+                f"'ancillary_sources.{ancillary_type}' must be a list")
+        if not sources:
+            raise ValueError(
+                f"'ancillary_sources.{ancillary_type}' must not be empty")
+
+        for source in sources:
+            if 'name' not in source:
+                raise ValueError(
+                    f"Each source in 'ancillary_sources.{ancillary_type}' must have a 'name' field")
+            if 'path' not in source:
+                raise ValueError(
+                    f"Each source in 'ancillary_sources.{ancillary_type}' must have a 'path' field")
+    # Check LUT paths
+    if 'nc_luts_path' not in config:
+        raise ValueError("Configuration must contain 'nc_luts_path'")
+    else:
+        logger.debug(f"nc_luts_path found: {config['nc_luts_path']}")
+
+    # Optional LUT paths (only needed if using specific GMFs)
+    if 'lut_cmod7_path' in config:
+        logger.debug(f"lut_cmod7_path found: {config['lut_cmod7_path']}")
+    if 'lut_ms1ahw_path' in config:
+        logger.debug(f"lut_ms1ahw_path found: {config['lut_ms1ahw_path']}")
+
+    # Validate masks structure if present (optional)
+    if 'masks' in config:
+        if not isinstance(config['masks'], dict):
+            raise ValueError("'masks' must be a dictionary")
+
+        for category, mask_list in config['masks'].items():
+            if not isinstance(mask_list, list):
+                raise ValueError(f"'masks.{category}' must be a list")
+
+            for mask in mask_list:
+                if 'name' not in mask:
+                    raise ValueError(
+                        f"Each mask in 'masks.{category}' must have a 'name' field")
+                if 'path' not in mask:
+                    raise ValueError(
+                        f"Each mask in 'masks.{category}' must have a 'path' field")
+
+        logger.debug(f"Masks configured: {list(config['masks'].keys())}")
+    else:
+        logger.info("No masks configured (optional)")
+
+    # Check which sensors are configured
+    supported_sensors = ['S1A', 'S1B', 'S1C', 'S1D', 'RS2', 'RCM']
+    configured_sensors = [
+        sensor for sensor in supported_sensors if sensor in config]
+    if configured_sensors:
+        logger.info(f"Sensors configured: {', '.join(configured_sensors)}")
+    else:
+        logger.warning(
+            "No sensors configured - at least one sensor (S1A, S1B, S1C, S1D, RS2, RCM) should be present")
+
+    logger.info("Configuration validation passed")