Skip to content
Snippets Groups Projects
Commit debeea19 authored by Valentin Genin's avatar Valentin Genin
Browse files

Fix relative path into absolute path for build_virtual_raster function... 

Fix relative path into absolute path for build_virtual_raster function (func_utils.py) and update logger input informations
parent 7871d68b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
python_src/SAR_MultiSlc.py
+ 18
− 5
View file @ debeea19
...@@ -107,7 +107,6 @@ if __name__ == "__main__": ...@@ -107,7 +107,6 @@ if __name__ == "__main__":
exclude = "-9999" exclude = "-9999"
if 'Exclude' in dict_Global['in']: if 'Exclude' in dict_Global['in']:
exclude = dict_Global['in']['Exclude'] exclude = dict_Global['in']['Exclude']
light_version = dict_Global['parameter']['clean']
relative_orbit = "" relative_orbit = ""
manifest = "" manifest = ""
light_version = True light_version = True
...@@ -192,8 +191,6 @@ if __name__ == "__main__": ...@@ -192,8 +191,6 @@ if __name__ == "__main__":
func_utils.check_ifExist(master_Image) func_utils.check_ifExist(master_Image)
# ====== Create global folder with starting and ending dates + master date # ====== Create global folder with starting and ending dates + master date
# output_glob = "./output_{}_to_{}_m_{}".format(start_time, end_time,
# master_date)
output_glob = "{}/output_{}_to_{}_m_{}".format(output_dir, start_time, output_glob = "{}/output_{}_to_{}_m_{}".format(output_dir, start_time,
end_time, master_date) end_time, master_date)
if not os.path.exists(output_glob): if not os.path.exists(output_glob):
...@@ -201,7 +198,8 @@ if __name__ == "__main__": ...@@ -201,7 +198,8 @@ if __name__ == "__main__":
# ====== Create Digital Elevation Model # ====== Create Digital Elevation Model
dem, target_dir = func_utils.build_virutal_raster(master_Image, start_time, end_time, dem, target_dir = func_utils.build_virutal_raster(master_Image, start_time, end_time,
master_date, srtm_shapefile, hgts_path) master_date, srtm_shapefile, hgts_path,
output_dir)
print("\n Removing master_image_envelope shp files...\n") print("\n Removing master_image_envelope shp files...\n")
for i in os.listdir(target_dir): for i in os.listdir(target_dir):
if i.startswith("master_envelope"): if i.startswith("master_envelope"):
...@@ -214,11 +212,22 @@ if __name__ == "__main__": ...@@ -214,11 +212,22 @@ if __name__ == "__main__":
# Recap of input parameter into info.log # Recap of input parameter into info.log
func_utils.log(logging.INFO, "########### Input Parameters for the current execution ############## ") func_utils.log(logging.INFO, "########### Input Parameters for the current execution ############## ")
# Global
func_utils.log(logging.INFO, " Global : ") func_utils.log(logging.INFO, " Global : ")
func_utils.log(logging.INFO, "srtm_shapefile : {param}".format(param=srtm_shapefile)) func_utils.log(logging.INFO, "srtm_shapefile : {param}".format(param=srtm_shapefile))
func_utils.log(logging.INFO, "hgts_path : {param}".format(param=hgts_path)) func_utils.log(logging.INFO, "hgts_path : {param}".format(param=hgts_path))
func_utils.log(logging.INFO, "geoid_path : {param}".format(param=geoid_path)) func_utils.log(logging.INFO, "geoid_path : {param}".format(param=geoid_path))
func_utils.log(logging.INFO, "Input_Path : {param}".format(param=dict_Global['in']['Input_Path']))
func_utils.log(logging.INFO, "Start_Date : {param}".format(param=start_time))
func_utils.log(logging.INFO, "End_Date : {param}".format(param=end_time))
func_utils.log(logging.INFO, "Master_Image : {param}".format(param=master_Image_base))
func_utils.log(logging.INFO, "Exclude : {param}".format(param=exclude))
func_utils.log(logging.INFO, "clean : {param}".format(param=light_version))
func_utils.log(logging.INFO, "optram : {param}".format(param=ram))
func_utils.log(logging.INFO, "satellite : {param}".format(param=satellite))
func_utils.log(logging.INFO, "mode : {param}".format(param=mode))
# Pre_Processing
func_utils.log(logging.INFO, " Pre_Processing : ") func_utils.log(logging.INFO, " Pre_Processing : ")
func_utils.log(logging.INFO, "ml_range : {param}".format(param=ml_range)) func_utils.log(logging.INFO, "ml_range : {param}".format(param=ml_range))
func_utils.log(logging.INFO, "ml_azimut : {param}".format(param=ml_azimut)) func_utils.log(logging.INFO, "ml_azimut : {param}".format(param=ml_azimut))
...@@ -233,6 +242,10 @@ if __name__ == "__main__": ...@@ -233,6 +242,10 @@ if __name__ == "__main__":
func_utils.log(logging.INFO, "ml_geoGrid_range : {param}".format(param=ml_geoGrid_range)) func_utils.log(logging.INFO, "ml_geoGrid_range : {param}".format(param=ml_geoGrid_range))
func_utils.log(logging.INFO, "ml_geoGrid_azimut : {param}".format(param=ml_geoGrid_azimut)) func_utils.log(logging.INFO, "ml_geoGrid_azimut : {param}".format(param=ml_geoGrid_azimut))
func_utils.log(logging.INFO, "gain_interfero : {param}".format(param=gain_interfero)) func_utils.log(logging.INFO, "gain_interfero : {param}".format(param=gain_interfero))
func_utils.log(logging.INFO, "Spacingxy : {param}".format(param=spacingxy))
func_utils.log(logging.INFO, "roi : {param}".format(param=roi))
func_utils.log(logging.INFO, "Activate_Interferogram : {param}".format(param=version_interferogram))
func_utils.log(logging.INFO, "Activate_Ortho : {param}".format(param=ortho_interferogram))
# ============================= # =============================
# Get the elements from os.dirs # Get the elements from os.dirs
......
python_src/SAR_MultiSlc_IW.py
+ 16
− 2
View file @ debeea19
...@@ -193,7 +193,8 @@ if __name__ == "__main__": ...@@ -193,7 +193,8 @@ if __name__ == "__main__":
# ====== Create Digital Elevation Model # ====== Create Digital Elevation Model
dem, target_dir = func_utils.build_virutal_raster(master_Image, start_time, end_time, dem, target_dir = func_utils.build_virutal_raster(master_Image, start_time, end_time,
master_date, srtm_shapefile, hgts_path) master_date, srtm_shapefile, hgts_path,
output_dir)
print("\n Removing master_image_envelope shp files...\n") print("\n Removing master_image_envelope shp files...\n")
for i in os.listdir(target_dir): for i in os.listdir(target_dir):
if i.startswith("master_envelope"): if i.startswith("master_envelope"):
...@@ -207,9 +208,17 @@ if __name__ == "__main__": ...@@ -207,9 +208,17 @@ if __name__ == "__main__":
# Recap of input parameter into info.log # Recap of input parameter into info.log
func_utils.log(logging.INFO, "########### Input Parameters for the current execution ############## ") func_utils.log(logging.INFO, "########### Input Parameters for the current execution ############## ")
func_utils.log(logging.INFO, " Global : ") func_utils.log(logging.INFO, " Global : ")
func_utils.log(logging.INFO, "Input_Path : {param}".format(param=dict_Global['in']['Input_Path']))
func_utils.log(logging.INFO, "Master_Image : {param}".format(param=master_Image_base))
func_utils.log(logging.INFO, "Start_Date : {param}".format(param=start_time))
func_utils.log(logging.INFO, "End_Date : {param}".format(param=end_time))
func_utils.log(logging.INFO, "srtm_shapefile : {param}".format(param=srtm_shapefile)) func_utils.log(logging.INFO, "srtm_shapefile : {param}".format(param=srtm_shapefile))
func_utils.log(logging.INFO, "hgts_path : {param}".format(param=hgts_path)) func_utils.log(logging.INFO, "hgts_path : {param}".format(param=hgts_path))
func_utils.log(logging.INFO, "geoid_path : {param}".format(param=geoid_path)) func_utils.log(logging.INFO, "geoid_path : {param}".format(param=geoid_path))
func_utils.log(logging.INFO, "optram : {param}".format(param=ram))
func_utils.log(logging.INFO, "clean : {param}".format(param=light_version))
func_utils.log(logging.INFO, "burst_index : {param}".format(param=burst_index))
func_utils.log(logging.INFO, "Exclude : {param}".format(param=exclude))
func_utils.log(logging.INFO, " Pre_Processing : ") func_utils.log(logging.INFO, " Pre_Processing : ")
func_utils.log(logging.INFO, "ml_range : {param}".format(param=ml_range)) func_utils.log(logging.INFO, "ml_range : {param}".format(param=ml_range))
...@@ -225,7 +234,12 @@ if __name__ == "__main__": ...@@ -225,7 +234,12 @@ if __name__ == "__main__":
func_utils.log(logging.INFO, "ml_geoGrid_range : {param}".format(param=ml_geoGrid_range)) func_utils.log(logging.INFO, "ml_geoGrid_range : {param}".format(param=ml_geoGrid_range))
func_utils.log(logging.INFO, "ml_geoGrid_azimut : {param}".format(param=ml_geoGrid_azimut)) func_utils.log(logging.INFO, "ml_geoGrid_azimut : {param}".format(param=ml_geoGrid_azimut))
func_utils.log(logging.INFO, "gain_interfero : {param}".format(param=gain_interfero)) func_utils.log(logging.INFO, "gain_interfero : {param}".format(param=gain_interfero))
func_utils.log(logging.INFO, "Activate_Interferogram : {param}".format(param=version_interferogram))
func_utils.log(logging.INFO, "Activate_Ortho : {param}".format(param=ortho_interferogram))
func_utils.log(logging.INFO, "roi : {param}".format(param=roi))
func_utils.log(logging.INFO, "Spacingxy : {param}".format(param=spacingxy))
func_utils.log(logging.INFO, "esd_NbIter : {param}".format(param=esd_NbIter))
func_utils.log(logging.INFO, "esd_AutoMode : {param}".format(param=esd_AutoMode))
# ============================ # ============================
# Get the elements from os.dirs # Get the elements from os.dirs
......
python_src/utils/func_utils.py
+ 5
− 5
View file @ debeea19
...@@ -362,7 +362,7 @@ def get_relative_orbit(manifest): ...@@ -362,7 +362,7 @@ def get_relative_orbit(manifest):
return int(root.find("metadataSection/metadataObject/metadataWrap/xmlData/{http://www.esa.int/safe/sentinel-1.0}orbitReference/{http://www.esa.int/safe/sentinel-1.0}relativeOrbitNumber").text) return int(root.find("metadataSection/metadataObject/metadataWrap/xmlData/{http://www.esa.int/safe/sentinel-1.0}orbitReference/{http://www.esa.int/safe/sentinel-1.0}relativeOrbitNumber").text)
def build_virutal_raster(master_Image, start_time, end_time, master_date, def build_virutal_raster(master_Image, start_time, end_time, master_date,
srtm_shapefile, hgts_path): srtm_shapefile, hgts_path, output_dir="."):
""" """
Build a vrt file corresponding to a dem from hgt (SRTM) files. Build a vrt file corresponding to a dem from hgt (SRTM) files.
The hgt file are contained into a global path : hgts_path The hgt file are contained into a global path : hgts_path
...@@ -380,10 +380,10 @@ def build_virutal_raster(master_Image, start_time, end_time, master_date, ...@@ -380,10 +380,10 @@ def build_virutal_raster(master_Image, start_time, end_time, master_date,
hgts_tuple.append(hgts_path + hgt) hgts_tuple.append(hgts_path + hgt)
print("\n Creating virtual raster from intersected hgt files...\n") print("\n Creating virtual raster from intersected hgt files...\n")
dem = gdal.BuildVRT("./output_{}_to_{}_m_{}/dem_scene.vrt".format( dem = gdal.BuildVRT("{}/output_{}_to_{}_m_{}/dem_scene.vrt".format(
start_time, end_time, master_date), hgts_tuple) output_dir, start_time, end_time, master_date), hgts_tuple)
dem = "./output_{}_to_{}_m_{}/dem_scene.vrt".format(start_time, end_time, dem = "{}/output_{}_to_{}_m_{}/dem_scene.vrt".format(output_dir, start_time,
master_date) end_time, master_date)
return dem, target_dir return dem, target_dir
def argDates_to_isoDates(start_date, end_date): def argDates_to_isoDates(start_date, end_date):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment