CHANGES-UPSTREAM-78.diff

diff --git testGeogrid_ISCE.py testGeogrid_ISCE.py
--- testGeogrid_ISCE.py
+++ testGeogrid_ISCE.py
@@ -67,6 +67,10 @@ def cmdLineParse():
             help='Input stable surface mask')
     parser.add_argument('-fo', '--flag_optical', dest='optical_flag', type=bool, required=False, default=0,
             help='flag for reading optical data (e.g. Landsat): use 1 for on and 0 (default) for off')
+    parser.add_argument('-b', '--buffer', dest='buffer', type=bool, required=False, default=0,
+            help='buffer to add to the starting/end range accounting for all passes from the same relative orbit')
+    parser.add_argument('-p', '--parse', dest='parse', action='store_true',
+            default=False, help='Parse the SAFE zip file to get radar image and orbit metadata; no need to run ISCE')
 
     return parser.parse_args()
 
@@ -113,7 +117,7 @@ def getMergedOrbit(product):
     return orb
 
 
-def loadMetadata(indir):
+def loadMetadata(indir,buffer=0):
     '''
     Input file.
     '''
@@ -135,12 +139,57 @@ def loadMetadata(indir):
     info.prf = 1.0 / frames[0].bursts[0].azimuthTimeInterval
     info.rangePixelSize = frames[0].bursts[0].rangePixelSize
     info.lookSide = -1
+        
+    info.startingRange -= buffer * info.rangePixelSize
+    info.farRange += buffer * info.rangePixelSize
+    
     info.numberOfLines = int( np.round( (info.sensingStop - info.sensingStart).total_seconds() * info.prf)) + 1
-    info.numberOfSamples = int( np.round( (info.farRange - info.startingRange)/info.rangePixelSize)) + 1
+    info.numberOfSamples = int( np.round( (info.farRange - info.startingRange)/info.rangePixelSize)) + 1  + 2 * buffer
     info.orbit = getMergedOrbit(frames)
 
     return info
 
+def loadParsedata(indir,buffer=0):
+    '''
+    Input file.
+    '''
+    import os
+    import numpy as np
+    import isce
+    from isceobj.Sensor.TOPS.Sentinel1 import Sentinel1
+    
+
+    frames = []
+    for swath in range(1,4):
+        rdr=Sentinel1()
+        rdr.configure()
+#        rdr.safe=['./S1A_IW_SLC__1SDH_20180401T100057_20180401T100124_021272_024972_8CAF.zip']
+        rdr.safe=[indir]
+        rdr.output='reference'
+        rdr.orbitDir='/Users/yanglei/orbit/S1A/precise'
+        rdr.auxDir='/Users/yanglei/orbit/S1A/aux'
+        rdr.swathNumber=swath
+        rdr.polarization='hh'
+        rdr.parse()
+        frames.append(rdr.product)
+    
+    info = Dummy()
+    info.sensingStart = min([x.sensingStart for x in frames])
+    info.sensingStop = max([x.sensingStop for x in frames])
+    info.startingRange = min([x.startingRange for x in frames])
+    info.farRange = max([x.farRange for x in frames])
+    info.prf = 1.0 / frames[0].bursts[0].azimuthTimeInterval
+    info.rangePixelSize = frames[0].bursts[0].rangePixelSize
+    info.lookSide = -1
+    
+    info.startingRange -= buffer * info.rangePixelSize
+    info.farRange += buffer * info.rangePixelSize
+    
+    info.numberOfLines = int( np.round( (info.sensingStop - info.sensingStart).total_seconds() * info.prf)) + 1
+    info.numberOfSamples = int( np.round( (info.farRange - info.startingRange)/info.rangePixelSize)) + 1 + 2 * buffer
+    info.orbit = getMergedOrbit(frames)
+    
+    return info
 
 def coregisterLoadMetadataOptical(indir_m, indir_s):
     '''
@@ -383,8 +432,12 @@ def main():
         metadata_m, metadata_s = coregisterLoadMetadataOptical(inps.indir_m, inps.indir_s)
         runGeogridOptical(metadata_m, metadata_s, inps.demfile, inps.dhdxfile, inps.dhdyfile, inps.vxfile, inps.vyfile, inps.srxfile, inps.sryfile, inps.csminxfile, inps.csminyfile, inps.csmaxxfile, inps.csmaxyfile, inps.ssmfile)
     else:
-        metadata_m = loadMetadata(inps.indir_m)
-        metadata_s = loadMetadata(inps.indir_s)
+        if inps.parse:
+            metadata_m = loadParsedata(inps.indir_m,inps.buffer)
+            metadata_s = loadParsedata(inps.indir_s,inps.buffer)
+        else:
+            metadata_m = loadMetadata(inps.indir_m,inps.buffer)
+            metadata_s = loadMetadata(inps.indir_s,inps.buffer)
         runGeogrid(metadata_m, metadata_s, inps.demfile, inps.dhdxfile, inps.dhdyfile, inps.vxfile, inps.vyfile, inps.srxfile, inps.sryfile, inps.csminxfile, inps.csminyfile, inps.csmaxxfile, inps.csmaxyfile, inps.ssmfile)