Merge branch 'UAVSAR' of https://github.com/EJFielding/isce2 into UAVSAR

contrib/stack/stripmapStack/Stack.py

@@ -658,7 +658,7 @@ def baselinePair(baselineDir, master, slave):
     print('Baseline at top/bottom: %f %f'%(bObj.pBaselineTop,bObj.pBaselineBottom))
     return (bObj.pBaselineTop+bObj.pBaselineBottom)/2.
 
-def baselineStack(inps,stackMaster,acqDates):
+def baselineStack(inps,stackMaster,acqDates,doBaselines=True):
     from collections import OrderedDict
     baselineDir = os.path.join(inps.workDir,'baselines')
     if not os.path.exists(baselineDir):
@@ -671,7 +671,10 @@ def baselineStack(inps,stackMaster,acqDates):
     for slv in acqDates:
         if slv != stackMaster:
             slave = os.path.join(inps.slcDir, slv)
+            if doBaselines:
                 baselineDict[slv]=baselinePair(baselineDir, master, slave)
+            else:
+                baselineDict[slv] = 0.0    # set slave baselines to zero if not calculated
             t = datetime.datetime.strptime(slv, datefmt)
             timeDict[slv] = t - t0
         else:
@@ -680,11 +683,11 @@ def baselineStack(inps,stackMaster,acqDates):
 
     return baselineDict, timeDict
 
-def selectPairs(inps,stackMaster, slaveDates, acuisitionDates):
-    baselineDict, timeDict = baselineStack(inps, stackMaster, acuisitionDates)
+def selectPairs(inps,stackMaster, slaveDates, acuisitionDates,doBaselines=True):
+
+    baselineDict, timeDict = baselineStack(inps, stackMaster, acuisitionDates,doBaselines)
     for slave in slaveDates:
        print (slave,' : ' , baselineDict[slave])
-
     numDates = len(acuisitionDates)
     pairs = []
     for i in range(numDates-1):

contrib/stack/stripmapStack/prepareUAVSAR_coregStack.py

@@ -24,6 +24,8 @@ def createParser():
             help='output directory which will be used for unpacking.')
     parser.add_argument('-s', '--segment', dest='segment', type=str, default='1',
             help='segment of the UAVSAR stack to prepare. For "s2" use "2", etc. Default is "1" ')
+    parser.add_argument('-t', '--text_cmd', dest='text_cmd', type=str, default='source ~/.bash_profile;', 
+            help='text command to be added to the beginning of each line of the run files. Default: source ~/.bash_profile;')
 
     return parser
 

contrib/stack/stripmapStack/stackStripMap.py

@@ -318,7 +318,10 @@ def main(iargs=None):
   if not os.path.exists(runDir):
        os.makedirs(runDir)
 
-  pairs = selectPairs(inps,stackMasterDate, slaveDates, acquisitionDates)
+  if inps.sensor.lower() == 'uavsar_stack':    # don't try to calculate baselines for UAVSAR_STACK data
+    pairs = selectPairs(inps,stackMasterDate, slaveDates, acquisitionDates,doBaselines=False)
+  else:
+    pairs = selectPairs(inps,stackMasterDate, slaveDates, acquisitionDates,doBaselines=True)  
   print ('number of pairs: ', len(pairs))
 
   ###If only a summary is requested quit after this