Merge pull request #99 from mirzaees/run_master

Run master

contrib/stack/topsStack/stackSentinel.py

@@ -430,11 +430,16 @@ def slcStack(inps, acquisitionDates, stackMasterDate, slaveDates, safe_dict, upd
     #############################
     i=0
 
+    if not updateStack:
         i += 1
         runObj = run()
-    runObj.configure(inps, 'run_' + str(i) + "_unpack_slc_topo_master")
-    if not updateStack:
+        runObj.configure(inps, 'run_' + str(i) + "_unpack_topo_master")
         runObj.unpackStackMasterSLC(safe_dict)
+        runObj.finalize()
+
+    i+=1
+    runObj = run()
+    runObj.configure(inps, 'run_' + str(i) + "_unpack_slave_slc")
     runObj.unpackSlavesSLC(stackMasterDate, slaveDates, safe_dict)
     runObj.finalize()
    

contrib/stack/topsStack/topo.py

@@ -10,6 +10,8 @@ import sys
 import s1a_isce_utils as ut
 from isceobj.Planet.Planet import Planet
 from zerodop.topozero import createTopozero
+import multiprocessing as mp
+
 
 def createParser():
     parser = argparse.ArgumentParser( description='Generates lat/lon/h and los for each pixel')
@@ -30,32 +32,11 @@ def cmdLineParse(iargs=None):
     return parser.parse_args(args=iargs)
 
 
-def main(iargs=None):
+def call_topo(input):
 
-    inps = cmdLineParse(iargs)
+    (dirname, demImage, master, ind) = input
 
-    swathList = ut.getSwathList(inps.master)
-
-    demImage = isceobj.createDemImage()
-    demImage.load(inps.dem + '.xml')
-
-    boxes = []
-    for swath in swathList:
-        master =  ut.loadProduct(os.path.join(inps.master , 'IW{0}.xml'.format(swath)))
-    
-        ###Check if geometry directory already exists.
-        dirname = os.path.join(inps.geom_masterDir, 'IW{0}'.format(swath))
-
-        if os.path.isdir(dirname):
-            print('Geometry directory {0} already exists.'.format(dirname))
-        else:
-            os.makedirs(dirname)
-
-
-    ###For each burst
-        for ind in range(master.numberOfBursts):
     burst = master.bursts[ind]
-
     latname = os.path.join(dirname, 'lat_%02d.rdr' % (ind + 1))
     lonname = os.path.join(dirname, 'lon_%02d.rdr' % (ind + 1))
     hgtname = os.path.join(dirname, 'hgt_%02d.rdr' % (ind + 1))
@@ -88,14 +69,50 @@ def main(iargs=None):
     topo.topo()
 
     bbox = [topo.minimumLatitude, topo.maximumLatitude, topo.minimumLongitude, topo.maximumLongitude]
-            boxes.append(bbox)
 
     topo = None
 
+    return bbox
+
+
+def main(iargs=None):
+
+    inps = cmdLineParse(iargs)
+
+    swathList = ut.getSwathList(inps.master)
+
+    demImage = isceobj.createDemImage()
+    demImage.load(inps.dem + '.xml')
+
+    boxes = []
+    inputs = []
+
+    for swath in swathList:
+        master =  ut.loadProduct(os.path.join(inps.master , 'IW{0}.xml'.format(swath)))
+    
+        ###Check if geometry directory already exists.
+        dirname = os.path.join(inps.geom_masterDir, 'IW{0}'.format(swath))
+
+        if os.path.isdir(dirname):
+            print('Geometry directory {0} already exists.'.format(dirname))
+        else:
+            os.makedirs(dirname)
+
+        for ind in range(master.numberOfBursts):
+            inputs.append((dirname, demImage, master, ind))
+
+    pool = mp.Pool(mp.cpu_count())
+    results = pool.map(call_topo, inputs)
+    pool.close()
+
+    for bbox in results:
+        boxes.append(bbox)
+
     boxes = np.array(boxes)
     bbox = [np.min(boxes[:,0]), np.max(boxes[:,1]), np.min(boxes[:,2]), np.max(boxes[:,3])]
     print ('bbox : ',bbox)
     
+
 if __name__ == '__main__':
 
     main()