Merge commit 'c92759a' into cmake

applications/CMakeLists.txt

@@ -23,7 +23,6 @@ set(files
     upsampleDem.py
     waterMask.py
     wbd.py
-    wbd_with_correction.py
     wbdStitcher.py
     )
 

applications/SConscript

@@ -79,8 +79,7 @@ listFiles = ['mdx.py',
 	     'downsampleDEM.py',
 	     'gdal2isce_xml.py',
              'alos2App.py',
-             'alos2burstApp.py',
+             'alos2burstApp.py']
-             'wbd_with_correction.py']
 #             'isce2he5.py']
 
 envapplications.Install(install, listFiles)

applications/wbd.py

@@ -1,60 +1,66 @@
 #!/usr/bin/env python3
 
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# Copyright  2012 California Institute of Technology. ALL RIGHTS RESERVED.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Author: Cunren Liang
-# you may not use this file except in compliance with the License.
+# Copyright 2020
-# You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# United States Government Sponsorship acknowledged. This software is subject to
-# U.S. export control laws and regulations and has been classified as 'EAR99 NLR'
-# (No [Export] License Required except when exporting to an embargoed country,
-# end user, or in support of a prohibited end use). By downloading this software,
-# the user agrees to comply with all applicable U.S. export laws and regulations.
-# The user has the responsibility to obtain export licenses, or other export
-# authority as may be required before exporting this software to any 'EAR99'
-# embargoed foreign country or citizen of those countries.
-#
-# Author: Eric Gurrola
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 import sys
 import isce
-from isceobj.InsarProc.runCreateWbdMask import runCreateWbdMask
+from isceobj.Alos2Proc.runDownloadDem import download_wbd
 
-class INSAR:
-    def __init__(self):
-        self.applyWaterMask = True
-        self.wbdImage = None
 
-class SELF:
+def download_wbd_old(snwe):
-    def __init__(me, snwe):
+    '''
-        me.geocode_bbox = snwe
+    for keeping the option of the old wbd.py
-        me.insar = INSAR()
+    '''
 
-class INFO:
+    from isceobj.InsarProc.runCreateWbdMask import runCreateWbdMask
-    def __init__(self, snwe):
+
-        self.extremes = snwe
+    class INSAR:
-    def getExtremes(x):
+        def __init__(self):
-        return self.extremes
+            self.applyWaterMask = True
+            self.wbdImage = None
+
+    class SELF:
+        def __init__(me, snwe):
+            me.geocode_bbox = snwe
+            me.insar = INSAR()
+
+    class INFO:
+        def __init__(self, snwe):
+            self.extremes = snwe
+        def getExtremes(x):
+            return self.extremes
 
-if __name__=="__main__":
-    if len(sys.argv) < 5:
-        print("Usage: wbd.py s n w e")
-        print("where s, n, w, e are latitude, longitude bounds in degrees")
-        sys.exit(0)
-    snwe = list(map(float,sys.argv[1:]))
     self = SELF(snwe)
     info = INFO(None)
     runCreateWbdMask(self,info)
+
+
+if __name__=="__main__":
+
+    if len(sys.argv) < 5:
+        print()
+        print("usage: wbd.py s n w e [c]")
+        print("  s: south latitude bounds in degrees")
+        print("  n: north latitude bounds in degrees")
+        print("  w: west longitude bounds in degrees")
+        print("  e: east longitude bounds in degrees")
+        print("  c: whether correct missing water body tiles problem")
+        print("       0: False")
+        print("       1: True (default)")
+        sys.exit(0)
+
+    doCorrection = True
+    if len(sys.argv) >= 6:
+    	if int(sys.argv[5]) == 0:
+    		doCorrection = False
+ 
+    snwe = list(map(float,sys.argv[1:5]))
+
+    if doCorrection:
+        download_wbd(snwe[0], snwe[1], snwe[2], snwe[3])
+    else:
+    	download_wbd_old(snwe)

applications/wbd_with_correction.py

@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-
-#
-# Author: Cunren Liang
-# Copyright 2020
-#
-
-
-import sys
-import isce
-from isceobj.Alos2Proc.runDownloadDem import download_wbd
-
-
-if __name__=="__main__":
-
-    if len(sys.argv) < 5:
-        print("usage: wbd_with_correction.py s n w e")
-        print("where s, n, w, e are latitude, longitude bounds in degrees")
-        sys.exit(0)
-
-    snwe = list(map(float,sys.argv[1:]))
-
-    download_wbd(snwe[0], snwe[1], snwe[2], snwe[3])

components/isceobj/Sensor/TOPS/Sentinel1.py

@@ -598,7 +598,14 @@ class Sentinel1(Component):
             burst.numberOfSamples = samples
             burst.numberOfLines = lines
             burst.startingRange = startingRange
-            burst.trackNumber = (orbitnumber-73)%175 + 1  ###Appears to be standard for S1A
+
+            if mission == 'S1A':
+                burst.trackNumber = (orbitnumber-73)%175 + 1
+            elif mission == 'S1B':
+                burst.trackNumber = (orbitnumber-27)%175 + 1
+            else:
+                raise ValueError('Encountered unknown mission id {0}'.format(mission))
+
             burst.orbitNumber = orbitnumber 
             burst.frameNumber = 1  #S1A doesnt appear to have a frame system
             burst.polarization = polarization

examples/input_files/alos2/alos2App.xml

@@ -21,7 +21,10 @@
     <property name="master frames">[3055]</property>
     <property name="slave frames">[3055]</property>
 
-
+    <!--optional, see instructions below on how to get DEM and water body. If you only process one 
+    interferogram, you can choose not to set these and the program will download them for you. If you 
+    process a stack of interferograms, it's better to set these so that the program won't download them 
+    multiple times. -->
     <property name="dem for coregistration">../../../z_common_data/insarzd_test_dataset/gorkha/dem/demLat_N22_N33_Lon_E078_E092.dem.wgs84</property>
     <property name="dem for geocoding">../../../z_common_data/insarzd_test_dataset/gorkha/dem/3/demLat_N22_N33_Lon_E078_E092.dem.wgs84</property>
     <property name="water body">/net/kraken/nobak/cunrenl/z_common_data/insarzd_test_dataset/gorkha/wbd/swbdLat_N22_N33_Lon_E078_E092.wbd</property>
@@ -103,10 +106,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/alos2_tutorial.txt

@@ -115,13 +115,18 @@ process all kinds of InSAR combinations.
     <property name="master frames">[3055]</property>
     <property name="slave frames">[3055]</property>
 
+    <!--optional, see input file on how to set these-->
     <property name="dem for coregistration">../../../z_common_data/insarzd_test_dataset/gorkha/dem/demLat_N22_N33_Lon_E078_E092.dem.wgs84</property>
     <property name="dem for geocoding">../../../z_common_data/insarzd_test_dataset/gorkha/dem/3/demLat_N22_N33_Lon_E078_E092.dem.wgs84</property>
     <property name="water body">/net/kraken/nobak/cunrenl/z_common_data/insarzd_test_dataset/gorkha/wbd/swbdLat_N22_N33_Lon_E078_E092.wbd</property>
 
 
-3. If you want to process a stack of interferograms, you can geocode the products to the same area by 
+3. For processing a stack of interferograms, 
-setting the following parameters:
+
+  1. set "dem for coregistration", "dem for geocoding" and "water body" so that the program won't download 
+  them multiple times.
+
+  2. geocode the products to the same area for time series analysis by setting the following parameter:
 
     <!--=========================================================================================
     This is a four-element list [s, n, w, e], e.g. [26.24, 30.04, 33.45, 37.79].

examples/input_files/alos2/alos2burstApp.xml

@@ -21,7 +21,10 @@
     <property name="master frames">[3055]</property>
     <property name="slave frames">[3055]</property>
 
-
+    <!--optional, see instructions below on how to get DEM and water body. If you only process one 
+    interferogram, you can choose not to set these and the program will download them for you. If you 
+    process a stack of interferograms, it's better to set these so that the program won't download them 
+    multiple times. -->
     <property name="dem for coregistration">../../../z_common_data/insarzd_test_dataset/gorkha/dem/demLat_N22_N33_Lon_E078_E092.dem.wgs84</property>
     <property name="dem for geocoding">../../../z_common_data/insarzd_test_dataset/gorkha/dem/3/demLat_N22_N33_Lon_E078_E092.dem.wgs84</property>
     <property name="water body">/net/kraken/nobak/cunrenl/z_common_data/insarzd_test_dataset/gorkha/wbd/swbdLat_N22_N33_Lon_E078_E092.wbd</property>
@@ -103,10 +106,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar/1/alos2App.xml

@@ -93,10 +93,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar/2/alos2App.xml

@@ -93,10 +93,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar/3/alos2App.xml

@@ -93,10 +93,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar/4/alos2App.xml

@@ -93,10 +93,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar_7s/alos2App.xml

@@ -93,10 +93,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar_burst/1/alos2burstApp.xml

@@ -92,10 +92,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar_burst/2/alos2burstApp.xml

@@ -92,10 +92,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar_burst/3/alos2burstApp.xml

@@ -92,10 +92,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-scansar_burst/4/alos2burstApp.xml

@@ -92,10 +92,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-stripmap/1/alos2App.xml

@@ -91,10 +91,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/scansar-stripmap/2/alos2App.xml

@@ -91,10 +91,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/stripmap-stripmap/1/alos2App.xml

@@ -91,10 +91,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/stripmap-stripmap/2/alos2App.xml

@@ -93,10 +93,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/stripmap-stripmap/3/alos2App.xml

@@ -91,10 +91,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->

examples/input_files/alos2/example_input_files/stripmap-stripmap/4/alos2App.xml

@@ -91,10 +91,12 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
     rm *.hgt* *.log demLat_*_*_Lon_*_*.dem demLat_*_*_Lon_*_*.dem.vrt demLat_*_*_Lon_*_*.dem.xml
     cd ../
 
-    #water body. ATTENTION: DON'T USE wbd.py TO DOWNLOAD WATER BODY!!!
+    #water body
+    #do correct missing water body tiles problem here!!! check usage of wbd.py for more details,
+    #or simply follow the commands below
     mkdir wbd_1_arcsec
     cd wbd_1_arcsec
-    wbd_with_correction.py 29 37 125 133
+    wbd.py 29 37 125 133
     fixImageXml.py -i swbdLat_*_*_Lon_*_*.wbd -f
     cd ../
     ==========================================================================================-->