grdwindinversion 0.3.5__py3-none-any.whl → 0.3.6__py3-none-any.whl

grdwindinversion/inversion.py

@@ -14,7 +14,7 @@ import yaml
 from scipy.ndimage import binary_dilation
 import re
 import string
-from grdwindinversion.utils import check_incidence_range, get_pol_ratio_name, timing
+from grdwindinversion.utils import check_incidence_range, get_pol_ratio_name, timing, convert_polarization_name
 from grdwindinversion.load_config import getConf
 import logging
 import os
@@ -101,8 +101,9 @@ def getOutputName(
             "(...)_(..)_(...)(.)_(.)(.)(..)_(........T......)_(........T......)_(......)_(......)_(....).SAFE"
         )
         template = string.Template(
-            "${MISSIONID}_${BEAM}_${PRODUCT}${RESOLUTION}_${LEVEL}${CLASS}${POL}_${STARTDATE}_${STOPDATE}_${ORBIT}_${TAKEID}_${PRODID}.SAFE"
+            "${MISSIONID}_${SWATH}_${PRODUCT}${RESOLUTION}_${LEVEL}${CLASS}${POLARIZATION}_${STARTDATE}_${STOPDATE}_${ORBIT}_${TAKEID}_${PRODID}.SAFE"
         )
+        # S1A_IW_GRDH_1SDV_20210909T130650_20210909T130715_039605_04AE83_C34F
         match = regex.match(basename_match)
         if not match:
             raise AttributeError(
@@ -111,25 +112,27 @@ def getOutputName(
 
         (
             MISSIONID,
-            BEAM,
+            SWATH,
             PRODUCT,
             RESOLUTION,
             LEVEL,
             CLASS,
-            POL,
+            POLARIZATION,
             STARTDATE,
             STOPDATE,
             ORBIT,
             TAKEID,
             PRODID,
         ) = match.groups()
-        new_format = f"{MISSIONID.lower()}-{BEAM.lower()}-owi-xx-{STARTDATE.lower()}-{STOPDATE.lower()}-{ORBIT}-{TAKEID}.nc"
+        # last two terms of polarization are removed
+        new_format = f"{MISSIONID.lower()}-{SWATH.lower()}-owi-{POLARIZATION.lower()}-{STARTDATE.lower()}-{STOPDATE.lower()}-{ORBIT}-{TAKEID}.nc"
     elif sensor == "RS2":
         regex = re.compile(
             "(RS2)_OK([0-9]+)_PK([0-9]+)_DK([0-9]+)_(....)_(........)_(......)_(.._?.?.?)_(S.F)"
         )
+        # RS2_OK141302_PK1242223_DK1208537_SCWA_20220904_093402_VV_VH_SGF
         template = string.Template(
-            "${MISSIONID}_OK${DATA1}_PK${DATA2}_DK${DATA3}_${DATA4}_${DATE}_${TIME}_${POLARIZATION}_${LAST}"
+            "${MISSIONID}_OK${DATA1}_PK${DATA2}_DK${DATA3}_${SWATH}_${DATE}_${TIME}_${POLARIZATION}_${LAST}"
         )
         match = regex.match(basename_match)
         if not match:
@@ -137,25 +140,27 @@ def getOutputName(
                 f"RC2 file {basename_match} does not match the expected pattern"
             )
 
-        MISSIONID, DATA1, DATA2, DATA3, DATA4, DATE, TIME, POLARIZATION, LAST = (
+        MISSIONID, DATA1, DATA2, DATA3, SWATH, DATE, TIME, POLARIZATION, LAST = (
             match.groups()
         )
-        new_format = f"{MISSIONID.lower()}--owi-xx-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
+        new_format = f"{MISSIONID.lower()}-{SWATH.lower()}-owi-{convert_polarization_name(POLARIZATION)}-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
     elif sensor == "RCM":
 
         regex = re.compile(
             r"(RCM[0-9])_OK([0-9]+)_PK([0-9]+)_([0-9]+)_([A-Z0-9]+)_(\d{8})_(\d{6})_([A-Z]{2}(?:_[A-Z]{2})?)_([A-Z]+)$"
         )
+        # RCM1_OK2767220_PK2769320_1_SCLND_20230930_214014_VV_VH_GRD
+
         match = regex.match(basename_match)
         if not match:
             raise AttributeError(
                 f"RCM file {basename_match} does not match the expected pattern"
             )
 
-        MISSIONID, DATA1, DATA2, DATA3, BEAM, DATE, TIME, POLARIZATION, PRODUCT = (
+        MISSIONID, DATA1, DATA2, DATA3, SWATH, DATE, TIME, POLARIZATION, PRODUCT = (
             match.groups()
         )
-        new_format = f"{MISSIONID.lower()}-{BEAM.lower()}-owi-xx-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
+        new_format = f"{MISSIONID.lower()}-{SWATH.lower()}-owi-{convert_polarization_name(POLARIZATION)}-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
 
     else:
         raise ValueError(
@@ -1074,35 +1079,8 @@ def preprocess(
         )
 
     if (recalibration) & ("SENTINEL" in sensor_longname):
-        xr_dataset.attrs["path_aux_pp1_new"] = os.path.basename(
-            os.path.dirname(
-                os.path.dirname(
-                    xsar_dataset.datatree["recalibration"].attrs["path_aux_pp1_new"]
-                )
-            )
-        )
-        xr_dataset.attrs["path_aux_cal_new"] = os.path.basename(
-            os.path.dirname(
-                os.path.dirname(
-                    xsar_dataset.datatree["recalibration"].attrs["path_aux_cal_new"]
-                )
-            )
-        )
-
-        xr_dataset.attrs["path_aux_pp1_old"] = os.path.basename(
-            os.path.dirname(
-                os.path.dirname(
-                    xsar_dataset.datatree["recalibration"].attrs["path_aux_pp1_old"]
-                )
-            )
-        )
-        xr_dataset.attrs["path_aux_cal_old"] = os.path.basename(
-            os.path.dirname(
-                os.path.dirname(
-                    xsar_dataset.datatree["recalibration"].attrs["path_aux_cal_old"]
-                )
-            )
-        )
+        xr_dataset.attrs["aux_cal_recal"] = xsar_dataset.datatree["recalibration"].attrs["aux_cal_new"]
+        xr_dataset.attrs["aux_pp1_recal"] = xsar_dataset.datatree["recalibration"].attrs["aux_pp1_new"]
 
     if add_nrcs_model:
         # add timing
@@ -1477,12 +1455,7 @@ def makeL2(
         "coverage": xr_dataset.attrs["coverage"],
     }
 
-    for recalib_attrs in [
-        "path_aux_pp1_new",
-        "path_aux_pp1_old",
-        "path_aux_cal_new",
-        "path_aux_cal_old",
-    ]:
+    for recalib_attrs in ["aux_pp1_recal", "aux_pp1", "aux_cal_recal", "aux_cal"]:
         if recalib_attrs in xr_dataset.attrs:
             attrs[recalib_attrs] = xr_dataset.attrs[recalib_attrs]
 
@@ -1490,7 +1463,7 @@ def makeL2(
         if arg in xr_dataset.attrs:
             attrs["passDirection"] = xr_dataset.attrs[arg]
 
-    _S1_added_attrs = ["ipf", "platform_heading"]
+    _S1_added_attrs = ["ipf_version", "platform_heading"]
     _RCM_added_attrs = ["productId"]
 
     for sup_attr in _S1_added_attrs + _RCM_added_attrs:

grdwindinversion/utils.py

@@ -18,6 +18,31 @@ except ImportError:
     mem_monitor = False
 
 
+def convert_polarization_name(pol):
+    """
+    Convert polarization name to the format used in the output filename
+    
+    Parameters
+    ----------
+    pol : str
+        polarization name
+        
+    Returns
+    ------- 
+    str
+        polarization name in the format used in the output filename (dv/dh/sv/sh/xx)
+    """
+    if pol == "VV_VH":
+        return "dv"
+    elif pol == "HH_HV":
+        return "dh"
+    elif pol == "VV":
+        return "sv"
+    elif pol == "HH":
+        return "sh"
+    else:
+        return "xx"
+
 def check_incidence_range(incidence, models, **kwargs):
     """
     Check if the incidence range of the dataset is within the range of the LUT of the model.

{grdwindinversion-0.3.5.dist-info → grdwindinversion-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: grdwindinversion
-Version: 0.3.5
+Version: 0.3.6
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 Author-email: Antoine Grouazel <antoine.grouazel@ifremer.fr>
 License: MIT
@@ -35,7 +35,7 @@ Requires-Dist: aiohttp
 Package to perform Wind inversion from GRD Level-1 SAR images
 
 -   Free software: MIT license
--   Documentation: https://grdwindinversion.readthedocs.io.
+-   Documentation: https://cerweb.ifremer.fr/datarmor/doc_sphinx/grdwindinversion/index.html.
 
 ## Usage
 

{grdwindinversion-0.3.5.dist-info → grdwindinversion-0.3.6.dist-info}/RECORD

@@ -7,16 +7,16 @@ grdwindinversion/config_prod_streaks.yaml,sha256=lJMl4qH6XYqO8ich7yW0WDQsQDrjmWT
 grdwindinversion/config_prod_streaks_nrcsmod.yaml,sha256=4yC4KcsC7rUumYHwhpKxM8_LDMe_Je-RIu4-9e1ayp8,1312
 grdwindinversion/data_config.yaml,sha256=FnglUHbAtGwHWg8w86hwZt3-vo-dY8uIjxqyI1jZpv8,567
 grdwindinversion/gradientFeatures.py,sha256=NIeAJzb1zrlJPBq1th7wjEZoNJMxwqDpNHLMWP6FQN0,18198
-grdwindinversion/inversion.py,sha256=rRqmDDL0byTJPu5PZIalTALSaQBNiIXYJpdS2eGYDiI,56525
+grdwindinversion/inversion.py,sha256=gCjuhTbLRvh_vHdx1Ut9XluuqaBPSPOgMYiGTnnrNc4,56099
 grdwindinversion/load_config.py,sha256=ZPozOWt0rf2Pmyc6P2D75cE_9wKUfKfr7RUzlE3WoiY,833
 grdwindinversion/main.py,sha256=Cwmxxz-PEt53JvpTL0Jx1WKLJpWvlIXZ9xtnyGKrGHY,3254
-grdwindinversion/utils.py,sha256=Jj2M433WC9z5Yk4yZaUxSnKwCskfCzB_EsIbVDW5PPw,3818
+grdwindinversion/utils.py,sha256=2BRq_UEbKbP5yCy_0X-nV-SQFmmp4aKrFaRgrs5MqJo,4347
 grdwindinversion/utils_memory.py,sha256=NA0bvkpCTkEiqCcJuldG1XsrP40-3AQUUt3HLeoRpbY,1432
 grdwindinversion/.github/ISSUE_TEMPLATE.md,sha256=qiM_a7CCUz3fSrz3Q20Se1nwPNFS8QCc8tkwK_0DSCo,327
-grdwindinversion-0.3.5.dist-info/AUTHORS.rst,sha256=KmhW_5LBKGTIGwWEVkoTm1qx_bvdDR3yYL-1cwbDOFQ,218
-grdwindinversion-0.3.5.dist-info/LICENSE,sha256=-B8mBiTeY3J7OLuayiV1myqmc7yeijBc7s34kc8RTmg,1075
-grdwindinversion-0.3.5.dist-info/METADATA,sha256=Ox0BIVGEoEmbnEyv9a3SH7fQLwAXfo_RV7VeTXgZh7g,2441
-grdwindinversion-0.3.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-grdwindinversion-0.3.5.dist-info/entry_points.txt,sha256=2rjvlVCy0iasRXjOz3kOIGuy2OCGQ-VTNuwuViQ6cMM,95
-grdwindinversion-0.3.5.dist-info/top_level.txt,sha256=z6lPix3QPEYOo37qq8plA2hY7S3C8MQZY81agRlksMI,17
-grdwindinversion-0.3.5.dist-info/RECORD,,
+grdwindinversion-0.3.6.dist-info/AUTHORS.rst,sha256=KmhW_5LBKGTIGwWEVkoTm1qx_bvdDR3yYL-1cwbDOFQ,218
+grdwindinversion-0.3.6.dist-info/LICENSE,sha256=-B8mBiTeY3J7OLuayiV1myqmc7yeijBc7s34kc8RTmg,1075
+grdwindinversion-0.3.6.dist-info/METADATA,sha256=XifamxABLa3IIQ7oyioa6ozPB3qQFDXFThmKM2TPUY0,2475
+grdwindinversion-0.3.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+grdwindinversion-0.3.6.dist-info/entry_points.txt,sha256=2rjvlVCy0iasRXjOz3kOIGuy2OCGQ-VTNuwuViQ6cMM,95
+grdwindinversion-0.3.6.dist-info/top_level.txt,sha256=z6lPix3QPEYOo37qq8plA2hY7S3C8MQZY81agRlksMI,17
+grdwindinversion-0.3.6.dist-info/RECORD,,

{grdwindinversion-0.3.5.dist-info → grdwindinversion-0.3.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any