Merge pull request #3 from ShashankBice/compatibility_changes

Compatibility changes

Author: dshean

vmap/disp2v.py

@@ -158,9 +158,13 @@ def main():
     offset_str = ''
     if remove_offsets:
         if mask_fn is None:
-            from demcoreg.dem_mask import get_lulc_mask
+            from demcoreg.dem_mask import get_mask
             print("\nUsing demcoreg to prepare mask of stable control surfaces\n")
-            mask = get_lulc_mask(src_ds, mask_glaciers=True, filter='rock+ice+water')
+            #TODO: Accept mask_list as in demcoreg
+            #mask_list = args.mask_list
+            # for now keep it simple, limit to non-glacier surfaces
+            mask_list = ['glaciers',]
+            mask = get_mask(src_ds, mask_list=mask_list, dem_fn=src_fn)
         else:
             print("\nWarping input raster mask")
             #This can be from previous dem_mask.py run (e.g. *rockmask.tif)
@@ -177,11 +181,10 @@ def main():
 
         print("\nRemoving median x and y offset over static control surfaces")
         h_myr_count = h_myr.count()
-        h_myr_static_count = h_myr[mask].count()
-        h_myr_med = malib.fast_median(h_myr[mask])
-        v_myr_med = malib.fast_median(v_myr[mask])
-        h_myr_mad = malib.mad(h_myr[mask])
-        v_myr_mad = malib.mad(v_myr[mask])
+        h_myr_static_count = np.ma.array(h_myr,mask=mask).count()
+        h_myr_mad,h_myr_med = malib.mad(np.ma.array(h_myr,mask=mask),return_med=True)
+        v_myr_mad,v_myr_med = malib.mad(np.ma.array(v_myr,mask=mask),return_med=True)
+
         print("Static pixel count: %i (%0.1f%%)" % (h_myr_static_count, 100*float(h_myr_static_count)/h_myr_count))
         print("median (+/-NMAD)")
         print("x velocity offset: %0.2f (+/-%0.2f) m/%s" % (h_myr_med, h_myr_mad, t_unit))

vmap/vmap.py

@@ -65,9 +65,9 @@ def get_stereo_opt(threads=28, kernel=(35,35), nlevels=5, spr=1, timeout=360, er
     #If using Semi-global matching (spr 0):
     if spr > 3:
         #Use SGM
-        stereo_opt.extend(['--stereo-algorithm', '1'])
+        stereo_opt.extend(['--stereo-algorithm', 'asp_sgm'])
         #Use MGM
-        #stereo_opt.extend(['--stereo-algorithm', '2'])
+        #stereo_opt.extend(['--stereo-algorithm', 'asp_mgm'])
         #bro nodes had 128 GB of RAM, 28 threads, ~4.7 GB/thread
         stereo_opt.extend(['--corr-tile-size', '3600'])
         stereo_opt.extend(['--xcorr-threshold', '-1'])
@@ -77,6 +77,7 @@ def get_stereo_opt(threads=28, kernel=(35,35), nlevels=5, spr=1, timeout=360, er
         #Sub-pixel kernel size (ASP default is 35)
         #Set to same as integer correlator kernel
         stereo_opt.extend(['--subpixel-kernel', str(kernel[0]), str(kernel[1])])
+        stereo_opt.extend(['--stereo-algorithm','asp_bm'])
         #Note: stereo_fltr throws out a lot of good data when noisy
         #Want to play with the following options
         #--rm-half-kernel 5 5
@@ -340,9 +341,9 @@ def main():
             #Check for existence
 
             #HMA seeding
-            vdir = '/nobackup/deshean/rpcdem/hma/velocity_jpl_amaury_2013-2015'
-            vx_fn = os.path.join(vdir, 'PKH_WRS2_B8_2013_2015_snr5_n1_r170_res12.x_vel.TIF')
-            vy_fn = os.path.join(vdir, 'PKH_WRS2_B8_2013_2015_snr5_n1_r170_res12.y_vel.TIF')
+            #vdir = '/nobackup/deshean/rpcdem/hma/velocity_jpl_amaury_2013-2015'
+            #vx_fn = os.path.join(vdir, 'PKH_WRS2_B8_2013_2015_snr5_n1_r170_res12.x_vel.TIF')
+            #vy_fn = os.path.join(vdir, 'PKH_WRS2_B8_2013_2015_snr5_n1_r170_res12.y_vel.TIF')
 
             if os.path.exists(vx_fn) and os.path.exists(vy_fn):
                 ds1_clip = iolib.fn_getds(ds1_clip_fn)