grdwindinversion 0.2.3.post6__tar.gz → 0.2.3.post7__tar.gz

{grdwindinversion-0.2.3.post6/grdwindinversion.egg-info → grdwindinversion-0.2.3.post7}/PKG-INFO

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

{grdwindinversion-0.2.3.post6 → grdwindinversion-0.2.3.post7}/grdwindinversion/inversion.py

@@ -173,10 +173,7 @@ def inverse(dual_pol, inc, sigma0, sigma0_dual, ancillary_wind, dsig_cr, model_v
         model=(model_vv, model_vh))
     if dual_pol:
         windspeed_co, windspeed_dual = windspeeds
-    else:
-        windspeed_co = windspeeds
-
-    if dual_pol:
+        
         windspeed_cr = windspeed.invert_from_model(
             inc.values,
             sigma0_dual.values,
@@ -185,8 +182,10 @@ def inverse(dual_pol, inc, sigma0, sigma0_dual, ancillary_wind, dsig_cr, model_v
             model=model_vh)
 
         return np.abs(windspeed_co), np.abs(windspeed_dual), np.abs(windspeed_cr)
+    else:
+        windspeed_co = windspeeds
 
-    return windspeed_co, None, None
+    return np.abs(windspeed_co), None, None
 
 
 
@@ -202,11 +201,9 @@ def makeL2asOwi(xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf,
         'ground_heading': 'owiHeading',
         'land_mask': 'owiLandFlag',
         'mask' : 'owiMask',
-        'dsig_cross': 'owiDsig_cross',
         'windspeed_co': 'owiWindSpeed_co',
         'windspeed_cross': 'owiWindSpeed_cross',
-        'windspeed_dual': 'owiWindSpeed',
-        'nesz_cross_final' : 'owiNesz_cross_final',        
+        'windspeed_dual': 'owiWindSpeed',     
     })
         
     xr_dataset['owiNrcs'] = xr_dataset['sigma0_ocean'].sel(pol=copol)
@@ -229,6 +226,12 @@ def makeL2asOwi(xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf,
     xr_dataset.owiNrcs_no_noise_correction.attrs[
             'comment'] = 'owiNrcs_no_noise_correction ; no recalibration'
     
+    if 'swath_number' in xr_dataset:
+        xr_dataset = xr_dataset.rename({
+             'swath_number' : 'owiSwathNumber',
+             'swath_number_flag' : 'owiSwathNumberFlag'
+            })
+        
     if "sigma0_raw__corrected" in xr_dataset:
         xr_dataset['owiNrcs_no_noise_correction_recalibrated'] = xr_dataset['sigma0_raw__corrected'].sel(pol=copol)
         xr_dataset.owiNrcs_no_noise_correction_recalibrated.attrs = xr_dataset.sigma0_raw__corrected.attrs
@@ -241,13 +244,16 @@ def makeL2asOwi(xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf,
         xr_dataset.owiNrcs.attrs['definition'] = 'owiNrcs_no_noise_correction_recalibrated - owiNesz'
 
             
-        xr_dataset = xr_dataset.rename({
-         'swath_number' : 'owiSwathNumber',
-         'swath_number_flag' : 'owiSwathNumberFlag'
-        })
+
 
     
     if dual_pol:
+        
+        xr_dataset = xr_dataset.rename({
+            'dsig_cross': 'owiDsig_cross',
+            'nesz_cross_final' : 'owiNesz_cross_final'
+        })        
+        
         xr_dataset['owiNrcs_cross'] = xr_dataset['sigma0_ocean'].sel(
             pol=crosspol)
         xr_dataset.owiNrcs_cross.attrs['units'] = 'm^2 / m^2'
@@ -607,8 +613,11 @@ def makeL2(filename, out_folder, config_path, overwrite=False, generateCSV=True,
 
     xr_dataset['windspeed_co']  = windspeed_co
     xr_dataset['windspeed_dual'] = windspeed_dual
-    xr_dataset = xr_dataset.assign(
-        windspeed_cross=(['line', 'sample'], windspeed_cr))
+    if dual_pol:
+        xr_dataset = xr_dataset.assign(
+            windspeed_cross=(['line', 'sample'], windspeed_cr))
+    else : 
+        xr_dataset['windspeed_cross'] = windspeed_cr
 
     xr_dataset, encoding = makeL2asOwi(xr_dataset, dual_pol, copol, crosspol, copol_gmf, crosspol_gmf, config)
 

{grdwindinversion-0.2.3.post6 → grdwindinversion-0.2.3.post7/grdwindinversion.egg-info}/PKG-INFO

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