Adjust sign error and handle multiple tropo files

insarlab · Mar 28, 2023 · 90bebdb · 90bebdb
1 parent 43869a0
commit 90bebdb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/mintpy/cli/prep_aria.py b/src/mintpy/cli/prep_aria.py
@@ -161,10 +161,14 @@ def cmd_line_parse(iargs = None):
         # search for wildcard pattern
         fnames = glob.glob(iDict[key]) if iDict[key] else []
 
-        # user the first element if more than one exist
+        # return the first element if more than one exist
+        # except for tropo, for which multiple inputs could be passed
         if len(fnames) > 0:
-            iDict[key] = fnames[0]
-            print('{k:<{w}} : {f}'.format(k=key, w=max_digit, f=fnames[0]))
+            if 'tropo' not in key:
+                iDict[key] = fnames[0]
+            else:
+                iDict[key] = fnames
+            print('{k:<{w}} : {f}'.format(k=key, w=max_digit, f=iDict[key]))
 
         elif key in required_ds_keys:
             # raise exception if any required DS is missing

diff --git a/src/mintpy/prep_aria.py b/src/mintpy/prep_aria.py
@@ -545,7 +545,7 @@ def write_model_stack(outfile, corrStack, box=None,
 
         # Get the wavelength. need to convert radians to meters
         wavelength = np.float64(dsCor.GetRasterBand(1).GetMetadata(layer)["Wavelength (m)"])
-        phase2range = -1 * wavelength / (4.*np.pi)
+        phase2range = wavelength / (4.*np.pi)
 
         # get model dates and time
         nDate = dsCor.RasterCount
@@ -854,8 +854,10 @@ def load_aria(inps):
 
     # 3.2 - model based corrections: SolidEarthTides and Troposphere 
     # Loop through other correction layers also provided as epochs
-
-    correction_layers = [inps.tropoFile, inps.setFile]
+    # handle multiple tropo stacks (if specified)
+    if inps.tropoFile is None:
+         inps.tropoFile = [None]
+    correction_layers = inps.tropoFile + [inps.setFile]
     for layer in correction_layers:
         if layer:
             # get name and type
@@ -878,15 +880,15 @@ def load_aria(inps):
 
             if run_or_skip(inps, ds_name_dict, out_file=inps.outfile[0]) == 'run':
                 writefile.layout_hdf5(
-                    f'{out_dir}/{layer_name}.h5',
+                    f'{out_dir}/{layer_name}_ARIA.h5',
                     ds_name_dict,
                     metadata=meta,
                     compression=inps.compression,
                     )
 
                 # write data to disk
                 write_model_stack(
-                    f'{out_dir}/{layer_name}.h5',
+                    f'{out_dir}/{layer_name}_ARIA.h5',
                     corrStack=layer,  
                     box=box,
                     xstep=inps.xstep,