diff --git a/components/isceobj/Alos2Proc/runDownloadDem.py b/components/isceobj/Alos2Proc/runDownloadDem.py
index 8e822a4..255ba0a 100644
--- a/components/isceobj/Alos2Proc/runDownloadDem.py
+++ b/components/isceobj/Alos2Proc/runDownloadDem.py
@@ -97,7 +97,7 @@ def runDownloadDem(self):
#runCmd(cmd)
#cmd = 'rm *.log'
#runCmd(cmd)
-
+
#replace the above system calls with function calls
imagePathXml((glob.glob('swbdLat_*_*_Lon_*_*.wbd'))[0], fullPath=True)
filesRemoved = glob.glob('*.log')
@@ -132,9 +132,9 @@ def downloadDem(bbox, demType='version3', resolution=1, fillingValue=-32768, out
if demType == 'version3':
if resolution == 1:
- ds._url1 = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11'
+ ds._url1 = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11'
else:
- ds._url3 = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11'
+ ds._url3 = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11'
elif demType == 'nasadem':
resolution = 1
#this url is included in the module
diff --git a/components/iscesys/DataManager/Dem1Manager.py b/components/iscesys/DataManager/Dem1Manager.py
index d4479cb..41b2cd8 100755
--- a/components/iscesys/DataManager/Dem1Manager.py
+++ b/components/iscesys/DataManager/Dem1Manager.py
@@ -2,19 +2,19 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Copyright 2012 California Institute of Technology. ALL RIGHTS RESERVED.
-#
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# 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,
@@ -47,10 +47,10 @@ DATA_EXT = Component.Parameter('_dataExt',
mandatory = False,
doc = 'Extension of the data such as .hgt')
URL = Component.Parameter('_url',
- public_name = 'URL',default = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11',
+ public_name = 'URL',default = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL1.003/2000.02.11',
type = str,
mandatory = False,
- doc = "Url for the high resolution DEM.")
+ doc = "Url for the high resolution DEM.")
DTYPE = Component.Parameter('_dtype',
public_name = 'dtype',
default = 'SHORT',
@@ -95,7 +95,7 @@ class Dem1Manager(SRTMManager):
self.outputFile = self.defaultName([min(lats[0],lats[1]),max(lats[0],lats[1]),
min(lons[0],lons[1]),max(lons[0],lons[1])])
return super(Dem1Manager,self).stitch(lats,lons)
-
+
## Corrects the self._image from EGM96 to WGS84 and viceversa.
#@param image \c Image if provided is used instead of the instance attribute self._image
#@param conversionType \c int -1 converts from EGM96 to WGS84, 1 converts from WGS84 to EGM96
@@ -107,7 +107,7 @@ class Dem1Manager(SRTMManager):
)
cg = Correct_geoid_i2_srtm()
return cg(image,conversionType) if image else cg(self._image,conversionType)
-
+
def createImage(self,lats,lons,filename):
img = createDemImage()
lons = np.sort(lons)
@@ -118,7 +118,7 @@ class Dem1Manager(SRTMManager):
img.coord2.coordStart = np.sort(lats)[-1]
img.coord2.coordDelta = -1./self._tileWidth
return img
-
+
def defaultName(self,snwe):
latMin = np.floor(snwe[0])
latMax = np.ceil(snwe[1])
@@ -141,4 +141,3 @@ class Dem1Manager(SRTMManager):
def updateParameters(self):
self.extendParameterList(SRTMManager,Dem1Manager)
super(Dem1Manager,self).updateParameters()
-
diff --git a/components/iscesys/DataManager/Dem3Manager.py b/components/iscesys/DataManager/Dem3Manager.py
index 4fd0fcc..c032457 100755
--- a/components/iscesys/DataManager/Dem3Manager.py
+++ b/components/iscesys/DataManager/Dem3Manager.py
@@ -2,19 +2,19 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Copyright 2012 California Institute of Technology. ALL RIGHTS RESERVED.
-#
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# 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,
@@ -43,10 +43,10 @@ EXTRA = Component.Parameter('_extra',
+' otherwise if no value is provided is then interpreted as None by the xml reader.')
URL = Component.Parameter('_url',
- public_name = 'URL',default = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11',
+ public_name = 'URL',default = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMGL3.003/2000.02.11',
type = str,
mandatory = False,
- doc = "Url for the high resolution DEM.")
+ doc = "Url for the high resolution DEM.")
TILE_SIZE = Component.Parameter('_tileSize',
public_name = 'tileSize',
@@ -64,8 +64,8 @@ class Dem3Manager(Dem1Manager):
URL,
TILE_SIZE
) + Dem1Manager.parameter_list
-
-
+
+
def __init__(self,family = '', name = ''):
self.parameter_list = self.parameter_list + super(Dem1Manager,self).parameter_list
self.updateParameters()
@@ -74,4 +74,3 @@ class Dem3Manager(Dem1Manager):
def updateParameters(self):
self.extendParameterList(Dem1Manager,Dem3Manager)
super(Dem3Manager,self).updateParameters()
-
diff --git a/components/iscesys/DataManager/SWBDManager.py b/components/iscesys/DataManager/SWBDManager.py
index 1c8e461..e73444a 100755
--- a/components/iscesys/DataManager/SWBDManager.py
+++ b/components/iscesys/DataManager/SWBDManager.py
@@ -2,19 +2,19 @@
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Copyright 2012 California Institute of Technology. ALL RIGHTS RESERVED.
-#
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# 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,
@@ -45,10 +45,10 @@ DATA_EXT = Component.Parameter('_dataExt',
mandatory = False,
doc = 'Extension of the data such as .raw')
URL = Component.Parameter('_url',
- public_name = 'URL',default = 'http://e4ftl01.cr.usgs.gov/MEASURES/SRTMSWBD.003/2000.02.11',
+ public_name = 'URL',default = 'https://e4ftl01.cr.usgs.gov/MEASURES/SRTMSWBD.003/2000.02.11',
type = str,
mandatory = False,
- doc = "Url for the high resolution water body mask")
+ doc = "Url for the high resolution water body mask")
DTYPE = Component.Parameter('_dtype',
public_name = 'dtype',
default = 'BYTE',
@@ -85,7 +85,7 @@ class SWBDManager(SRTMManager):
self.outputFile = self.defaultName([min(lats[0],lats[1]),max(lats[0],lats[1]),
min(lons[0],lons[1]),max(lons[0],lons[1])])
super(SWBDManager,self).stitch(lats,lons)
-
+
def createImage(self,lats,lons,filename):
img = createImage()
lons = np.sort(lons)
@@ -97,7 +97,7 @@ class SWBDManager(SRTMManager):
img.coord2.coordDelta = -1./self._tileWidth
img.dataType = self._dtype
return img
-
+
def defaultName(self,snwe):
latMin = np.floor(snwe[0])
latMax = np.ceil(snwe[1])
@@ -120,4 +120,3 @@ class SWBDManager(SRTMManager):
def updateParameters(self):
self.extendParameterList(SRTMManager,SWBDManager)
super(SWBDManager,self).updateParameters()
-
diff --git a/contrib/stack/alosStack/alosStack.xml b/contrib/stack/alosStack/alosStack.xml
index 2667b47..06ca4a4 100644
--- a/contrib/stack/alosStack/alosStack.xml
+++ b/contrib/stack/alosStack/alosStack.xml
@@ -16,7 +16,7 @@
@@ -26,25 +26,25 @@
@@ -57,7 +57,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
@@ -148,7 +148,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
@@ -156,7 +156,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
@@ -196,15 +196,15 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
@@ -314,9 +314,9 @@ FBD (indicated by ^) is the acquisition mode code.
ionosphere estimation. However, a larger number of looks may also lead to phase aliasing in
the resulting inteferograms and therefore lead to phase unwrapping errors, which causes
significant errors in ionosphere estimation.
- If the area has strong troposhere or phase variations (normally in areas with large height
+ If the area has strong troposhere or phase variations (normally in areas with large height
differences such as edges of Tibetan Plateau), a smaller number of looks should be used to
- avoid phase aliasing after taking looks. E.g. 1/2 of the default number of range/azimuth looks
+ avoid phase aliasing after taking looks. E.g. 1/2 of the default number of range/azimuth looks
ion that can be found in the annotation of parameter 'number of range looks 1'.
==========================================================================================-->
@@ -324,7 +324,7 @@ FBD (indicated by ^) is the acquisition mode code.
../../../z_common_data/insarzd_test_dataset/gorkha/d048/150405
../../../z_common_data/insarzd_test_dataset/gorkha/d048/150503
-
../../../z_common_data/insarzd_test_dataset/gorkha/dem/demLat_N22_N33_Lon_E078_E092.dem.wgs84
../../../z_common_data/insarzd_test_dataset/gorkha/dem/3/demLat_N22_N33_Lon_E078_E092.dem.wgs84
@@ -32,7 +32,7 @@
@@ -42,25 +42,25 @@
@@ -69,7 +69,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
@@ -162,15 +162,15 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
@@ -287,9 +287,9 @@ FBD (indicated by ^) is the acquisition mode code.
ionosphere estimation. However, a larger number of looks may also lead to phase aliasing in
the resulting inteferograms and therefore lead to phase unwrapping errors, which causes
significant errors in ionosphere estimation.
- If the area has strong troposhere or phase variations (normally in areas with large height
+ If the area has strong troposhere or phase variations (normally in areas with large height
differences such as edges of Tibetan Plateau), a smaller number of looks should be used to
- avoid phase aliasing after taking looks. E.g. 1/2 of the default number of range/azimuth looks
+ avoid phase aliasing after taking looks. E.g. 1/2 of the default number of range/azimuth looks
ion that can be found in the annotation of parameter 'number of range looks 1'.
==========================================================================================-->
@@ -297,7 +297,7 @@ FBD (indicated by ^) is the acquisition mode code.
../../../z_common_data/insarzd_test_dataset/gorkha/d048/150405
../../../z_common_data/insarzd_test_dataset/gorkha/d048/150503
-
../../../z_common_data/insarzd_test_dataset/gorkha/dem/demLat_N22_N33_Lon_E078_E092.dem.wgs84
../../../z_common_data/insarzd_test_dataset/gorkha/dem/3/demLat_N22_N33_Lon_E078_E092.dem.wgs84
@@ -37,25 +37,25 @@
@@ -65,7 +65,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450
@@ -162,7 +162,7 @@ IEEE Transactions on Geoscience and Remote Sensing, vol. 56, no. 8, pp. 4492-450