diff --git a/atmosphericDelay-L-SAR/AtmosphericDelay.xml b/atmosphericDelay-L-SAR/AtmosphericDelay.xml
index f164b07..6ba32fb 100644
--- a/atmosphericDelay-L-SAR/AtmosphericDelay.xml
+++ b/atmosphericDelay-L-SAR/AtmosphericDelay.xml
@@ -74,7 +74,7 @@
File
zip
Man
- D:\micro\microproduct_depdence\LT-Deformation\ERA5_N27_N29_E99_E101_20230523_23.zip
+ D:\micro\microproduct_depdence\LT-Deformation\LSAR_atmo_ERA5_N27_N29_E99_E101_20230523_23.zip
True
False
File
@@ -91,7 +91,7 @@
File
zip
Man
- D:\micro\microproduct_depdence\LT-Deformation\ERA5_N27_N29_E99_E101_20230531_23.zip
+ D:\micro\microproduct_depdence\LT-Deformation\LSAR_atmo_ERA5_N27_N29_E99_E101_20230531_23.zip
True
False
File
diff --git a/atmosphericDelay-L-SAR/AtmosphericDelayMain.py b/atmosphericDelay-L-SAR/AtmosphericDelayMain.py
index 1925d83..f08e562 100644
--- a/atmosphericDelay-L-SAR/AtmosphericDelayMain.py
+++ b/atmosphericDelay-L-SAR/AtmosphericDelayMain.py
@@ -233,6 +233,20 @@ class AtmosphericMain:
shutil.copy(file_path, os.path.join(dem_path, tif_name))
para_path = os.path.join(self.__workspace_origin_path, para['ParaName'])
processing_paras.update({'orbits': para_path})
+ if name == 'SARS':
+ name_list = []
+ if para['DataType'] == 'File':
+ processing_paras.update({'slc': para['ParaValue']})
+ else:
+ para_path_list = para['ParaValue'].split(";")
+ dem_path = os.path.join(self.__workspace_origin_path, para['ParaName'])
+ if os.path.exists(dem_path) is False:
+ os.mkdir(dem_path)
+ for file_path in para_path_list:
+ tif_name = os.path.basename(file_path)
+ shutil.copy(file_path, os.path.join(dem_path, tif_name))
+ para_path = os.path.join(self.__workspace_origin_path, para['ParaName'])
+ processing_paras.update({'slc': para_path})
if name == 'box':
datas = para['ParaValue'].split(';')
if len(datas) != 4:
diff --git a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-08-27.log b/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-08-27.log
deleted file mode 100644
index 98a2ea6..0000000
--- a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-08-27.log
+++ /dev/null
@@ -1,152 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\atmosphericDelay-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
-INFO:mylog:check_source success!
-INFO:mylog:progress bar :10%
-INFO:mylog:demhgt2wgs_cmd:DEM2ISCE.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/DEM -o /cygdrive/D/micro\LWork\AtmosphericDelay\Temporary\isce\preprocessed\dem
-INFO:mylog:cmd_result:0
-INFO:mylog:demhgt2wgs finish!
-INFO:mylog:progress bar: 5%
-INFO:mylog:prepSlcLT1AB_cmd:prepSlcLT1AB.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/SARS/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/
-INFO:mylog:cmd_result:0
-INFO:mylog:unpackFrame_LT1AB_cmd:prepSlcLT1AB.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/SARS/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/
-INFO:mylog:cmd_result:0
-INFO:mylog:slc to isce_data finish!
-INFO:mylog:progress bar: 10%
-INFO:mylog:stackStripMap_cmd:stackStripMap.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/ -w /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace -d /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/preprocessed/dem/demLat_N27_N33_Lon_E97_E103.dem.wgs84 -m 20230531 -a 3 -r 3 -x '28.38 28.4 100.38 100.4' -u 'snaphu' --nofocus
-INFO:mylog:cmd_result:0
-INFO:mylog:aux slc stackStripMap finish!
-INFO:mylog:autorun_cmd:['-e', 'D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp', '-o', 'D:\\micro\\LWork\\AtmosphericDelay\\Temporary\\isce\\processing\\isce_workspace']
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_01_crop=========
-INFO:mylog:==========running step:01==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523 ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_02_reference=========
-INFO:mylog:==========running step:02==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:cmd_result:0
-INFO:mylog:create new floder success!
-INFO:mylog:progress bar :35%
-INFO:mylog:stackStripMap_cmd:stackStripMap.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/ -w /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace -d /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/preprocessed/dem/demLat_N27_N33_Lon_E97_E103.dem.wgs84 -m 20230523 -a 3 -r 3 -x '28.38 28.4 100.38 100.4' -u 'snaphu' --nofocus
-INFO:mylog:cmd_result:0
-INFO:mylog:mas slc stackStripMap finish!
-INFO:mylog:autorun_cmd:['-e', 'D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp', '-o', 'D:\\micro\\LWork\\AtmosphericDelay\\Temporary\\isce\\processing\\isce_workspace']
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_01_crop=========
-INFO:mylog:==========running step:01==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523 ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_02_reference=========
-INFO:mylog:==========running step:02==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230523 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_03_focus_split=========
-INFO:mylog:==========running step:03==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_focus_split_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_focus_split_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_04_geo2rdr_coarseResamp=========
-INFO:mylog:==========running step:04==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_geo2rdr_coarseResamp_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_geo2rdr_coarseResamp_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_05_refineSecondaryTiming=========
-INFO:mylog:==========running step:05==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_refineSecondaryTiming_20230523_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_refineSecondaryTiming_20230523_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_06_invertMisreg=========
-INFO:mylog:==========running step:06==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\invertMisreg.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/pairs/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/dates/
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\invertMisreg.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/pairs/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/dates/ ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_07_fineResamp=========
-INFO:mylog:==========running step:07==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\referenceStackCopy.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc_crop/20230523/20230523.slc -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/merged/SLC/20230523/20230523.slc
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\referenceStackCopy.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc_crop/20230523/20230523.slc -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/merged/SLC/20230523/20230523.slc ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_fineResamp_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_fineResamp_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_09_igram=========
-INFO:mylog:==========running step:09==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_igram_20230523_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_igram_20230523_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:cmd_result:0
-ERROR:mylog:master inclocal.rdr is different from Auxiliary inclocal.rdr!
-INFO:mylog:progress bar :75%
-INFO:mylog:image coordinate transformation finished!
-ERROR:mylog:run-time error!
-Traceback (most recent call last):
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 1223, in
- if AtmosphericMain.preprocess_handle() is False:
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 385, in preprocess_handle
- self.pro_img_path = self.check_img_projection(para_names1, para_names22)
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 464, in check_img_projection
- keyword = proj.split("[", 2)[0]
-AttributeError: 'NoneType' object has no attribute 'split'
-INFO:mylog:running use time: 0:13:24.644825
diff --git a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-27-05.log b/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-27-05.log
deleted file mode 100644
index e0d1e87..0000000
--- a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-27-05.log
+++ /dev/null
@@ -1,11 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\atmosphericDelay-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
-ERROR:mylog:run-time error!
-Traceback (most recent call last):
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 1233, in
- if AtmosphericMain.check_source() is False:
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 106, in check_source
- self.__processing_paras = self.__init_processing_paras(self.__input_paras) # 输出{文件名:地址}
-TypeError: __init_processing_paras() missing 1 required positional argument: 'out_path'
-INFO:mylog:running use time: 0:00:00.028986
diff --git a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-27-39.log b/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-27-39.log
deleted file mode 100644
index e1194b4..0000000
--- a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-27-39.log
+++ /dev/null
@@ -1,19 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\atmosphericDelay-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
-ERROR:mylog:run-time error!
-Traceback (most recent call last):
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 1233, in
- if AtmosphericMain.check_source() is False:
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 106, in check_source
- self.__processing_paras = self.__init_processing_paras(self.__input_paras, self.__workspace_preprocessed_path) # 输出{文件名:地址}
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 148, in __init_processing_paras
- file_path = BlockProcess.unzip_file(para_path, out_path)
- File "D:\estar-proj\microproduct-l-sar\tool\algorithm\block\blockprocess.py", line 95, in unzip_file
- with zipfile.ZipFile(zip_file_path, 'r') as zip_ref:
- File "D:\Anaconda\envs\micro\lib\zipfile.py", line 1269, in __init__
- self._RealGetContents()
- File "D:\Anaconda\envs\micro\lib\zipfile.py", line 1336, in _RealGetContents
- raise BadZipFile("File is not a zip file")
-zipfile.BadZipFile: File is not a zip file
-INFO:mylog:running use time: 0:00:00.027993
diff --git a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-28-53.log b/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-28-53.log
deleted file mode 100644
index 9bf6505..0000000
--- a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-28-53.log
+++ /dev/null
@@ -1,3 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\atmosphericDelay-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
diff --git a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-29-41.log b/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-29-41.log
deleted file mode 100644
index c474dd0..0000000
--- a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-29-41.log
+++ /dev/null
@@ -1,152 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\atmosphericDelay-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
-INFO:mylog:check_source success!
-INFO:mylog:progress bar :10%
-INFO:mylog:demhgt2wgs_cmd:DEM2ISCE.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/DEM -o /cygdrive/D/micro\LWork\AtmosphericDelay\Temporary\isce\preprocessed\dem
-INFO:mylog:cmd_result:0
-INFO:mylog:demhgt2wgs finish!
-INFO:mylog:progress bar: 5%
-INFO:mylog:prepSlcLT1AB_cmd:prepSlcLT1AB.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/SARS/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/
-INFO:mylog:cmd_result:0
-INFO:mylog:unpackFrame_LT1AB_cmd:prepSlcLT1AB.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/SARS/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/
-INFO:mylog:cmd_result:0
-INFO:mylog:slc to isce_data finish!
-INFO:mylog:progress bar: 10%
-INFO:mylog:stackStripMap_cmd:stackStripMap.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/ -w /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace -d /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/preprocessed/dem/demLat_N27_N33_Lon_E97_E103.dem.wgs84 -m 20230531 -a 3 -r 3 -x '28.38 28.4 100.38 100.4' -u 'snaphu' --nofocus
-INFO:mylog:cmd_result:0
-INFO:mylog:aux slc stackStripMap finish!
-INFO:mylog:autorun_cmd:['-e', 'D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp', '-o', 'D:\\micro\\LWork\\AtmosphericDelay\\Temporary\\isce\\processing\\isce_workspace']
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_01_crop=========
-INFO:mylog:==========running step:01==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523 ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_02_reference=========
-INFO:mylog:==========running step:02==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:cmd_result:0
-INFO:mylog:create new floder success!
-INFO:mylog:progress bar :35%
-INFO:mylog:stackStripMap_cmd:stackStripMap.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/ -w /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace -d /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/preprocessed/dem/demLat_N27_N33_Lon_E97_E103.dem.wgs84 -m 20230523 -a 3 -r 3 -x '28.38 28.4 100.38 100.4' -u 'snaphu' --nofocus
-INFO:mylog:cmd_result:0
-INFO:mylog:mas slc stackStripMap finish!
-INFO:mylog:autorun_cmd:['-e', 'D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp', '-o', 'D:\\micro\\LWork\\AtmosphericDelay\\Temporary\\isce\\processing\\isce_workspace']
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_01_crop=========
-INFO:mylog:==========running step:01==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523 ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_02_reference=========
-INFO:mylog:==========running step:02==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230523 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_03_focus_split=========
-INFO:mylog:==========running step:03==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_focus_split_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_focus_split_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_04_geo2rdr_coarseResamp=========
-INFO:mylog:==========running step:04==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_geo2rdr_coarseResamp_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_geo2rdr_coarseResamp_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_05_refineSecondaryTiming=========
-INFO:mylog:==========running step:05==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_refineSecondaryTiming_20230523_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_refineSecondaryTiming_20230523_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_06_invertMisreg=========
-INFO:mylog:==========running step:06==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\invertMisreg.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/pairs/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/dates/
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\invertMisreg.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/pairs/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/dates/ ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_07_fineResamp=========
-INFO:mylog:==========running step:07==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\referenceStackCopy.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc_crop/20230523/20230523.slc -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/merged/SLC/20230523/20230523.slc
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\referenceStackCopy.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc_crop/20230523/20230523.slc -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/merged/SLC/20230523/20230523.slc ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_fineResamp_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_fineResamp_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_09_igram=========
-INFO:mylog:==========running step:09==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_igram_20230523_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_igram_20230523_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:cmd_result:0
-ERROR:mylog:master inclocal.rdr is different from Auxiliary inclocal.rdr!
-INFO:mylog:progress bar :75%
-INFO:mylog:image coordinate transformation finished!
-ERROR:mylog:run-time error!
-Traceback (most recent call last):
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 1237, in
- if AtmosphericMain.preprocess_handle() is False:
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 399, in preprocess_handle
- self.pro_img_path = self.check_img_projection(para_names1, para_names22)
- File "D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/AtmosphericDelayMain.py", line 478, in check_img_projection
- keyword = proj.split("[", 2)[0]
-AttributeError: 'NoneType' object has no attribute 'split'
-INFO:mylog:running use time: 0:13:40.186682
diff --git a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-45-56.log b/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-45-56.log
deleted file mode 100644
index 7d12537..0000000
--- a/atmosphericDelay-L-SAR/run_log/AtmosphericDelay2024-02-21-16-45-56.log
+++ /dev/null
@@ -1,172 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\atmosphericDelay-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
-INFO:mylog:variables check true !
-INFO:mylog:The units of variables check true !
-INFO:mylog:The shape of variables check true !
-INFO:mylog:variables check true !
-INFO:mylog:The units of variables check true !
-INFO:mylog:The shape of variables check true !
-INFO:mylog:check_source success!
-INFO:mylog:progress bar :10%
-INFO:mylog:demhgt2wgs_cmd:DEM2ISCE.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/DEM -o /cygdrive/D/micro\LWork\AtmosphericDelay\Temporary\isce\preprocessed\dem
-INFO:mylog:cmd_result:0
-INFO:mylog:demhgt2wgs finish!
-INFO:mylog:progress bar: 5%
-INFO:mylog:prepSlcLT1AB_cmd:prepSlcLT1AB.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/SARS/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/
-INFO:mylog:cmd_result:0
-INFO:mylog:unpackFrame_LT1AB_cmd:prepSlcLT1AB.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/origin/SARS/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/
-INFO:mylog:cmd_result:0
-INFO:mylog:slc to isce_data finish!
-INFO:mylog:progress bar: 10%
-INFO:mylog:stackStripMap_cmd:stackStripMap.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/ -w /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace -d /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/preprocessed/dem/demLat_N27_N33_Lon_E97_E103.dem.wgs84 -m 20230531 -a 3 -r 3 -x '28.38 28.4 100.38 100.4' -u 'snaphu' --nofocus
-INFO:mylog:cmd_result:0
-INFO:mylog:aux slc stackStripMap finish!
-INFO:mylog:autorun_cmd:['-e', 'D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp', '-o', 'D:\\micro\\LWork\\AtmosphericDelay\\Temporary\\isce\\processing\\isce_workspace']
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_01_crop=========
-INFO:mylog:==========running step:01==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523 ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_02_reference=========
-INFO:mylog:==========running step:02==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:cmd_result:0
-INFO:mylog:create new floder success!
-INFO:mylog:progress bar :35%
-INFO:mylog:stackStripMap_cmd:stackStripMap.exe -s /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc/ -w /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace -d /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/preprocessed/dem/demLat_N27_N33_Lon_E97_E103.dem.wgs84 -m 20230523 -a 3 -r 3 -x '28.38 28.4 100.38 100.4' -u 'snaphu' --nofocus
-INFO:mylog:cmd_result:0
-INFO:mylog:mas slc stackStripMap finish!
-INFO:mylog:autorun_cmd:['-e', 'D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp', '-o', 'D:\\micro\\LWork\\AtmosphericDelay\\Temporary\\isce\\processing\\isce_workspace']
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_01_crop=========
-INFO:mylog:==========running step:01==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230523 ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_crop_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_02_reference=========
-INFO:mylog:==========running step:02==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230523
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_reference_20230523 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_03_focus_split=========
-INFO:mylog:==========running step:03==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_focus_split_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_focus_split_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_04_geo2rdr_coarseResamp=========
-INFO:mylog:==========running step:04==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_geo2rdr_coarseResamp_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_geo2rdr_coarseResamp_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_05_refineSecondaryTiming=========
-INFO:mylog:==========running step:05==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_refineSecondaryTiming_20230523_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_refineSecondaryTiming_20230523_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_06_invertMisreg=========
-INFO:mylog:==========running step:06==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\invertMisreg.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/pairs/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/dates/
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\invertMisreg.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/pairs/ -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/refineSecondaryTiming/dates/ ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_07_fineResamp=========
-INFO:mylog:==========running step:07==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\referenceStackCopy.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc_crop/20230523/20230523.slc -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/merged/SLC/20230523/20230523.slc
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\referenceStackCopy.exe -i /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/preprocessed/slc_crop/20230523/20230523.slc -o /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/merged/SLC/20230523/20230523.slc ==========
-
-****************************************
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_fineResamp_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_fineResamp_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=Excetding data=================
-INFO:mylog:D:\micro\LWork\AtmosphericDelay\Temporary\isce\processing\isce_workspace\log.txt=command text:run_09_igram=========
-INFO:mylog:==========running step:09==========
-INFO:mylog: waitline cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_igram_20230523_20230531
-INFO:mylog: state: 0 cmdline: D:/estar-proj/microproduct-l-sar/atmosphericDelay-L-SAR/ISCEApp\stripmapWrapper.exe -c /cygdrive/D/micro/LWork/AtmosphericDelay/Temporary/isce/processing/isce_workspace/configs/config_igram_20230523_20230531 ==========
-
-****************************************
-INFO:mylog:
-====================================exceted=========================
-
-INFO:mylog:cmd_result:0
-ERROR:mylog:master inclocal.rdr is different from Auxiliary inclocal.rdr!
-INFO:mylog:progress bar :75%
-INFO:mylog:image coordinate transformation finished!
-INFO:mylog:ERA data coordinate transformation finished!
-INFO:mylog:calculate intersect finished!
-INFO:mylog:create intersect shp success!
-INFO:mylog:cut MasterNC_geo_h success!
-INFO:mylog:cut MasterNC_re_hum success!
-INFO:mylog:cut MasterNC_temp success!
-INFO:mylog:cut AuxiliaryNC_geo_h success!
-INFO:mylog:cut AuxiliaryNC_re_hum success!
-INFO:mylog:cut AuxiliaryNC_temp success!
-INFO:mylog:cut image finished!
-INFO:mylog:cut images success!
-INFO:mylog:resampling MasterNC_geo_h success!
-INFO:mylog:resampling MasterNC_re_hum success!
-INFO:mylog:resampling MasterNC_temp success!
-INFO:mylog:resampling AuxiliaryNC_geo_h success!
-INFO:mylog:resampling AuxiliaryNC_re_hum success!
-INFO:mylog:resampling AuxiliaryNC_temp success!
-INFO:mylog:resampling finished !
-INFO:mylog:incLocal reasmple success!
-INFO:mylog:read the weather data into arrays success!
-INFO:mylog:ERA data ready !
-INFO:mylog:begin calc wet and dry of diff levels !
-INFO:mylog:finish calc wet and dry delay of diff levels !
-INFO:mylog:start interpolation dry and wet delay...
diff --git a/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-08-27.log b/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-08-27.log
deleted file mode 100644
index e69de29..0000000
diff --git a/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-27-05.log b/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-27-05.log
deleted file mode 100644
index e69de29..0000000
diff --git a/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-27-39.log b/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-27-39.log
deleted file mode 100644
index e69de29..0000000
diff --git a/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-28-53.log b/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-28-53.log
deleted file mode 100644
index e69de29..0000000
diff --git a/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-29-41.log b/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-29-41.log
deleted file mode 100644
index e69de29..0000000
diff --git a/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-45-56.log b/atmosphericDelay-L-SAR/run_log/ISCE_LOG2024-02-21-16-45-56.log
deleted file mode 100644
index e69de29..0000000
diff --git a/deformation-L-SAR/DeformationMain.py b/deformation-L-SAR/DeformationMain.py
index 868f4ee..60d5aa3 100644
--- a/deformation-L-SAR/DeformationMain.py
+++ b/deformation-L-SAR/DeformationMain.py
@@ -416,7 +416,7 @@ class DeformationMain:
isce_work_space = r"/".join(self.__workspace_isce_path.split("\\"))
isce_work_space = '/cygdrive/' + isce_work_space.replace(":/", "/")
- box = "'" + self.__in_processing_paras['box'] + "'"
+
main_img = self.__in_processing_paras['mainimg']
isce_exe_dir = r"/".join(os.path.join(self.env_str, "ISCEApp").split("\\"))
EsdCoherenceThreshold = self.__in_processing_paras['EsdCoherenceThreshold']
@@ -469,18 +469,34 @@ class DeformationMain:
logger.info('slc to isce_data finish!')
logger.info('progress bar: 10%')
- # os.chdir(isce_exe_dir)
- cmd = "stackStripMap.exe -s {} -w {} -d {} -m {} -a {} -r {} -x {} -u 'snaphu' --nofocus".format(out_slc_dir, isce_work_space, dem_path, main_img, 3, 3, box)
- logger.info('stackStripMap_cmd:{}'.format(cmd))
- result = os.system(cmd)
- logger.info('cmd_result:{}'.format(result))
- logger.info('stackStripMap finish!')
+ if self.__in_processing_paras['box'] == 'empty':
+ box = ''
+ cmd = "stackStripMap.exe -s {} -w {} -d {} -m {} -a {} -r {} -u 'snaphu' --nofocus".format(out_slc_dir,
+ isce_work_space,
+ dem_path,
+ main_img, 3, 3)
+ logger.info('stackStripMap_cmd:{}'.format(cmd))
+ result = os.system(cmd)
+ logger.info('cmd_result:{}'.format(result))
+ logger.info('stackStripMap finish!')
+ run_files = os.path.join(self.__workspace_isce_path, 'run_files')
+ for file in list(glob.glob(os.path.join(run_files, '*.job'))):
+ os.remove(file)
+ run_steps = ["run_07_grid_baseline"]
+ self.isce_run_steps(run_steps, self.__workspace_isce_path)
+ else:
+ box = "'" + self.__in_processing_paras['box'] + "'"
+ cmd = "stackStripMap.exe -s {} -w {} -d {} -m {} -a {} -r {} -x {} -u 'snaphu' --nofocus".format(out_slc_dir, isce_work_space, dem_path, main_img, 3, 3, box)
+ logger.info('stackStripMap_cmd:{}'.format(cmd))
+ result = os.system(cmd)
+ logger.info('cmd_result:{}'.format(result))
+ logger.info('stackStripMap finish!')
- run_files = os.path.join(self.__workspace_isce_path, 'run_files')
- for file in list(glob.glob(os.path.join(run_files, '*.job'))):
- os.remove(file)
- run_steps = ["run_08_grid_baseline"]
- self.isce_run_steps(run_steps, self.__workspace_isce_path)
+ run_files = os.path.join(self.__workspace_isce_path, 'run_files')
+ for file in list(glob.glob(os.path.join(run_files, '*.job'))):
+ os.remove(file)
+ run_steps = ["run_08_grid_baseline"]
+ self.isce_run_steps(run_steps, self.__workspace_isce_path)
cmd = ['-e', isce_exe_dir, '-o', self.__workspace_isce_path]
logger.info('autorun_cmd:{}'.format(cmd))
diff --git a/dem-L-SAR/Dem.xml b/dem-L-SAR/Dem.xml
index 46ea7ba..2735827 100644
--- a/dem-L-SAR/Dem.xml
+++ b/dem-L-SAR/Dem.xml
@@ -67,11 +67,11 @@
box
经纬度包围盒
- 经纬度包围盒SNWE。例子:28;28.4;100.15;100.45
+ 经纬度包围盒SNWE。例子:28;28.40;100.2;100.5;;18.90;19.1;109.2;109.4
value
string
Man
- 28.35;28.4;100.35;100.4
+ empty
True
True
UploadInput
@@ -84,9 +84,9 @@
高程数据路径
高程数据数据。数据来源:30米 ASTGTM2, 数据格式:tif。备注:数据的经纬度范围必须是整数
File
- zip
+ tif
Man
- D:\micro\microproduct_depdence\LT-Deformation\dem\97E27N_COP30.zip
+ D:\micro\microproduct_depdence\LT-Deformation\dem\LSAR_atmo_97E27N_COP30.tif
True
False
File
@@ -101,7 +101,7 @@
Value
string
Man
- 0.75
+ 0.8
True
True
UploadInput
diff --git a/dem-L-SAR/DemMain.py b/dem-L-SAR/DemMain.py
index b79a695..30117b5 100644
--- a/dem-L-SAR/DemMain.py
+++ b/dem-L-SAR/DemMain.py
@@ -31,7 +31,6 @@ from ConfigeHandle import Config as cf
import sklearn.neighbors._typedefs
import sklearn.neighbors._partition_nodes
-
EXE_NAME = cf.get('exe_name')
if cf.get('debug') == 'True':
@@ -46,6 +45,8 @@ logger = logging.getLogger("mylog")
# env_str = os.path.split(os.path.realpath(__file__))[0]
env_str = os.path.dirname(os.path.abspath(sys.argv[0]))
os.environ['PROJ_LIB'] = env_str
+
+
class DemMain:
"""
干涉形变主函数
@@ -184,12 +185,15 @@ class DemMain:
if name == 'MainImg':
processing_paras.update({'mainimg': para['ParaValue']})
if name == 'box':
- datas = para['ParaValue'].split(';')
- if len(datas) != 4:
- msg = 'para: box is error!box:' + para['ParaValue']
- raise Exception(msg)
- box = datas[0] + ' ' + datas[1] + ' ' + datas[2] + ' ' + datas[3]
- processing_paras.update({'box': box})
+ if para['ParaValue'] == 'empty':
+ processing_paras.update({'box': 'empty'})
+ else:
+ datas = para['ParaValue'].split(';')
+ if len(datas) != 4:
+ msg = 'para: box is error!box:' + para['ParaValue']
+ raise Exception(msg)
+ box = datas[0] + ' ' + datas[1] + ' ' + datas[2] + ' ' + datas[3]
+ processing_paras.update({'box': box})
if name == 'AuxDir':
if para['DataType'] == 'File':
processing_paras.update({'AuxDir': para['ParaValue']})
@@ -314,13 +318,14 @@ class DemMain:
with open(out_file, "w", encoding="utf-8") as f:
f.write(file_data)
- def isce_stackSentinel(self, slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space, key_word, isce_exe_dir, box,EsdCoherenceThreshold):
+ def isce_stackSentinel(self, slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space, key_word, isce_exe_dir, box,
+ EsdCoherenceThreshold):
"""执行 stackSentinel.exe"""
os.chdir(isce_exe_dir)
# cmd = "stackSentinel.exe -s {} -d {} -a {} -o {} -w {} -n {} -m {} -c {} --exeabsolute_dir {} -b {}".format(slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space,"'1 2 3'", key_word, '1', isce_exe_dir,box)
# cmd = "stackSentinel.exe -s {} -d {} -a {} -o {} -w {} -n {} -m {} -W {} -c {} --exeabsolute_dir {} -b {}".format(slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space,"'1 2 3'", key_word,'interferogram','6', isce_exe_dir,box)
cmd = "stackSentinel.exe -s {} -d {} -a {} -o {} -w {} -n '1 2 3' -m {} -W 'interferogram' -c '1' --exeabsolute_dir {} -e {} -b {}".format(
- slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space, key_word, isce_exe_dir,EsdCoherenceThreshold , box)
+ slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space, key_word, isce_exe_dir, EsdCoherenceThreshold, box)
# cmd = "stackSentinel.exe -s {} -d {} -a {} -o {} -w {} -c {} -b {} -m {} -n '1 2 3' -p 'vv' -W offset -e {} --exeabsolute_dir {}".format(slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space, cum_connections, box, main_img, EsdCoherenceThreshold, isce_exe_dir)
# stackSentinel.exe -s I:/MicroProduct/daqiceshishuju_20221109/slc -d I:/MicroProduct/daqiceshishuju_20221109/DEM/demLat_N37_N40_Lon_E107_E112.dem.wgs84 -a I:/MicroProduct/daqiceshishuju_20221109/AuxDir -o I:/MicroProduct/daqiceshishuju_20221109/orbits -w I:/MicroProduct/daqiceshishuju_20221109/daqi_workspace/isce_workspace -n '1 2 3' -m 20190206 -W interferogram -c 6 --exeabsolute_dir I:/MicroProduct/microproduct/atmosphericDelay/ISCEApp -b '37.3 39.4 108.10 111.82'
logger.info('stackSentinel_cmd:{}'.format(cmd))
@@ -356,8 +361,8 @@ class DemMain:
ortho_temp_dir = os.path.join(self.__workspace_processing_path, 'ortho_temp')
path_list = [dem_out_dir, ortho_out_dir, ortho_temp_dir]
for path in path_list:
- if not os.path.exists(path):
- os.mkdir(path)
+ if not os.path.exists(path):
+ os.mkdir(path)
path2 = env_str
key_word = self.__in_processing_paras['mainimg']
slc_paths = os.path.join(self.__workspace_origin_path, 'SARS', key_word)
@@ -373,8 +378,9 @@ class DemMain:
in_slc_path = os.path.join(slc_paths, slc_path)
break
# 获取校正模型后
- Orthorectification.preCaldem_sar_rc(dem_merged_path, in_slc_path, ortho_temp_dir, ortho_out_dir.replace("\\", "\\\\"))
- #构建轨道
+ Orthorectification.preCaldem_sar_rc(dem_merged_path, in_slc_path, ortho_temp_dir,
+ ortho_out_dir.replace("\\", "\\\\"))
+ # 构建轨道
sim_ori_path = ortho_out_dir + "\\" + "RD_sim_ori.tif"
return sim_ori_path
@@ -394,7 +400,7 @@ class DemMain:
SrcImagePath = self.__input_paras["SARS"]['ParaValue']
paths = SrcImagePath.split(';')
SrcImageName = os.path.split(paths[0])[1].split('.tar.gz')[0]
- meta_xml_path = os.path.join(self.__product_dic, SrcImageName + tar +".meta.xml")
+ meta_xml_path = os.path.join(self.__product_dic, SrcImageName + tar + ".meta.xml")
para_dict = CreateMetaDict(image_path, self.ori_xml, self.__product_dic,
out_path1, out_path2).calu_nature()
@@ -411,7 +417,7 @@ class DemMain:
uwm_file = os.path.join(self.__workspace_isce_path, "run_files", run_steps[i])
shutil.move(uwm_file, target)
- def process_handle(self,start):
+ def process_handle(self, start):
# 执行isce2.5生成干涉图
# 生成工作流配置文件
@@ -420,7 +426,6 @@ class DemMain:
isce_work_space = r"/".join(self.__workspace_isce_path.split("\\"))
isce_work_space = '/cygdrive/' + isce_work_space.replace(":/", "/")
- box = "'" + self.__in_processing_paras['box'] + "'"
main_img = self.__in_processing_paras['mainimg']
isce_exe_dir = r"/".join(os.path.join(self.env_str, "ISCEApp").split("\\"))
EsdCoherenceThreshold = self.__in_processing_paras['EsdCoherenceThreshold']
@@ -449,7 +454,7 @@ class DemMain:
# cum_connections = self.__in_processing_paras['NumConnections']
# cmd = "stackSentinel.exe -s {} -d {} -a {} -o {} -w {} -c {} -b {} -m {} -n '1 2 3' -p 'vv' -W offset -e {} --exeabsolute_dir {}".format(slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space, cum_connections, box, main_img, EsdCoherenceThreshold, isce_exe_dir)
# result = self.isce_stackSentinel(slc_dir, dem_path, aux_dir, orbits_dir, isce_work_space, main_img,
- # isce_exe_dir, box, EsdCoherenceThreshold)
+ # isce_exe_dir, box, EsdCoherenceThreshold)
# os.chdir(isce_exe_dir)
# slc数据转isce格式
@@ -473,18 +478,36 @@ class DemMain:
logger.info('progress bar: 10%')
# os.chdir(isce_exe_dir)
- cmd = "stackStripMap.exe -s {} -w {} -d {} -m {} -a {} -r {} -x {} -u 'snaphu' --nofocus".format(out_slc_dir, isce_work_space, dem_path, main_img, 3, 3, box)
- # cmd = "stackStripMap.exe -s {} -w {} -d {} -m {} -a {} -r {} -u 'snaphu' --nofocus".format(out_slc_dir, isce_work_space, dem_path, main_img, 3, 3)
- logger.info('stackStripMap_cmd:{}'.format(cmd))
- result = os.system(cmd)
- logger.info('cmd_result:{}'.format(result))
- logger.info('stackStripMap finish!')
+ if self.__in_processing_paras['box'] == 'empty':
+ box = ' '
+ cmd = "stackStripMap.exe -s {} -w {} -d {} -m {} -a {} -r {} -u 'snaphu' --nofocus".format(out_slc_dir,
+ isce_work_space,
+ dem_path,
+ main_img, 3, 3)
+ logger.info('stackStripMap_cmd:{}'.format(cmd))
+ result = os.system(cmd)
+ logger.info('cmd_result:{}'.format(result))
+ logger.info('stackStripMap finish!')
- run_files = os.path.join(self.__workspace_isce_path, 'run_files')
- for file in list(glob.glob(os.path.join(run_files, '*.job'))):
- os.remove(file)
- run_steps = ["run_08_grid_baseline"]
- self.isce_run_steps(run_steps, self.__workspace_isce_path)
+ run_files = os.path.join(self.__workspace_isce_path, 'run_files')
+ for file in list(glob.glob(os.path.join(run_files, '*.job'))):
+ os.remove(file)
+ run_steps = ["run_07_grid_baseline"]
+ self.isce_run_steps(run_steps, self.__workspace_isce_path)
+ else:
+ box = "'" + self.__in_processing_paras['box'] + "'"
+ cmd = "stackStripMap.exe -s {} -w {} -d {} -m {} -a {} -r {} -x {} -u 'snaphu' --nofocus".format(
+ out_slc_dir, isce_work_space, dem_path, main_img, 3, 3, box)
+ logger.info('stackStripMap_cmd:{}'.format(cmd))
+ result = os.system(cmd)
+ logger.info('cmd_result:{}'.format(result))
+ logger.info('stackStripMap finish!')
+
+ run_files = os.path.join(self.__workspace_isce_path, 'run_files')
+ for file in list(glob.glob(os.path.join(run_files, '*.job'))):
+ os.remove(file)
+ run_steps = ["run_08_grid_baseline"]
+ self.isce_run_steps(run_steps, self.__workspace_isce_path)
cmd = ['-e', isce_exe_dir, '-o', self.__workspace_isce_path]
logger.info('autorun_cmd:{}'.format(cmd))
@@ -519,10 +542,10 @@ class DemMain:
self.ori_xml = os.path.join(slc_paths, file)
radar_center_frequency = MetaDataHandler.get_RadarCenterFrequency(self.ori_xml)
lamda = float(299792458 / radar_center_frequency)
- dem_proPath = dem.get_Dem(self.__workspace_isce_path, temp_path,out_dir, dem_product, lamda) # 生成tif
+ dem_proPath = dem.get_Dem(self.__workspace_isce_path, temp_path, out_dir, dem_product, lamda) # 生成tif
# dem_proPath = dem.get_Dem(self.__workspace_isce_path, temp_path,out_dir, dem_product) # 生成tif
- self.imageHandler.write_quick_view(dem_product) # 生成快视图
+ self.imageHandler.write_quick_view(dem_product) # 生成快视图
meta_xml_path = self.creat_xml(dem_proPath)
temp_folder = os.path.join(self.__workspace_path, EXE_NAME, 'Output')
@@ -532,15 +555,12 @@ class DemMain:
shutil.copy(meta_xml_path, out_xml)
self.make_targz(self.__out_para, self.__product_dic)
-
logger.info("write quick view and .tar.gz finish")
logger.info('DEM production successful !')
logger.info('progress bar: 100%')
return True
-
-
if __name__ == '__main__':
start = datetime.datetime.now()
try:
@@ -563,6 +583,3 @@ if __name__ == '__main__':
end = datetime.datetime.now()
msg = 'running use time: %s ' % (end - start)
logger.info(msg)
-
-
-
diff --git a/dem-L-SAR/ISCEApp/isce.log b/dem-L-SAR/ISCEApp/isce.log
index d953344..e2d81d7 100644
--- a/dem-L-SAR/ISCEApp/isce.log
+++ b/dem-L-SAR/ISCEApp/isce.log
@@ -1124,3 +1124,276 @@ dtype = CFLOAT
2024-02-21 17:41:43,800 - isce.mroipac.filter - DEBUG - filter strength: 0.8
2024-02-21 17:41:43,800 - isce.mroipac.filter - INFO - Filtering interferogram
2024-02-21 17:41:44,608 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-02-26 10:24:40,512 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-02-26 10:24:40,538 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-02-26 10:24:40,568 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-02-26 10:24:42,035 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230523/20230523.slc
+bands = 1
+width = 25462
+length = 31514
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-26 10:24:44,313 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230531/20230531.slc
+bands = 1
+width = 25586
+length = 28444
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-26 10:24:45,984 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.9293511365051303
+2024-02-26 10:25:59,829 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 3510 which is the number of lines in the slc image.
+2024-02-26 10:25:59,830 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 2407 which is the width of the slc image.
+2024-02-26 10:35:24,161 - isceobj.Location.OffsetField - INFO - 513 offsets culled
+2024-02-26 10:35:24,393 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-26 10:35:24,588 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-26 10:35:24,820 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-26 10:35:26,880 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 3510 which is the number of lines in the slc image.
+2024-02-26 10:35:26,881 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 2407 which is the width of the slc image.
+2024-02-26 10:35:31,794 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-02-26 10:35:31,806 - isce.mroipac.filter - DEBUG - width: 803
+2024-02-26 10:35:31,806 - isce.mroipac.filter - DEBUG - length: 1173
+2024-02-26 10:35:31,806 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/20230523_20230531.int
+2024-02-26 10:35:31,806 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/filt_20230523_20230531.int
+2024-02-26 10:35:31,807 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-02-26 10:35:31,807 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-02-26 10:35:32,568 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-02-27 13:50:18,619 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-02-27 13:50:18,649 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-02-27 13:50:18,682 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-02-27 13:50:20,313 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230523/20230523.slc
+bands = 1
+width = 25462
+length = 31514
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-27 13:50:25,663 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230531/20230531.slc
+bands = 1
+width = 25586
+length = 28444
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-27 13:50:29,283 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.9293173586926877
+2024-02-27 13:53:38,375 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 6304 which is the number of lines in the slc image.
+2024-02-27 13:53:38,375 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 4073 which is the width of the slc image.
+2024-02-27 14:03:06,314 - isceobj.Location.OffsetField - INFO - 425 offsets culled
+2024-02-27 14:03:06,566 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-27 14:03:06,779 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-27 14:03:07,033 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-27 14:03:09,269 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 6304 which is the number of lines in the slc image.
+2024-02-27 14:03:09,269 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 4073 which is the width of the slc image.
+2024-02-27 14:03:20,461 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-02-27 14:03:20,473 - isce.mroipac.filter - DEBUG - width: 1358
+2024-02-27 14:03:20,474 - isce.mroipac.filter - DEBUG - length: 2106
+2024-02-27 14:03:20,474 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/20230523_20230531.int
+2024-02-27 14:03:20,474 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/filt_20230523_20230531.int
+2024-02-27 14:03:20,474 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-02-27 14:03:20,474 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-02-27 14:03:23,358 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-02-27 14:16:21,007 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-02-27 14:16:21,033 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-02-27 14:16:21,059 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-02-27 14:16:21,910 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.929537927249224
+2024-02-27 15:48:16,609 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 28444 which is the number of lines in the slc image.
+2024-02-27 15:48:16,611 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 25586 which is the width of the slc image.
+2024-02-27 16:00:11,758 - isceobj.Location.OffsetField - INFO - 316 offsets culled
+2024-02-27 16:00:11,951 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-27 16:00:12,170 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-27 16:00:12,364 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-27 16:00:25,333 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 28444 which is the number of lines in the slc image.
+2024-02-27 16:00:25,333 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 25586 which is the width of the slc image.
+2024-02-27 16:05:57,095 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-02-27 16:05:57,107 - isce.mroipac.filter - DEBUG - width: 8487
+2024-02-27 16:05:57,107 - isce.mroipac.filter - DEBUG - length: 10504
+2024-02-27 16:05:57,108 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/20230523_20230531.int
+2024-02-27 16:05:57,108 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/filt_20230523_20230531.int
+2024-02-27 16:05:57,108 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-02-27 16:05:57,108 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-02-27 16:07:04,018 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-02-28 14:26:44,850 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-02-28 14:26:44,876 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-02-28 14:26:44,902 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-02-28 14:26:46,054 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230523/20230523.slc
+bands = 1
+width = 25462
+length = 31514
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-28 14:26:50,575 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230531/20230531.slc
+bands = 1
+width = 25586
+length = 28444
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-28 14:26:53,689 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.929281937973942
+2024-02-28 14:29:52,616 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 5709 which is the number of lines in the slc image.
+2024-02-28 14:29:52,617 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 4510 which is the width of the slc image.
+2024-02-28 14:39:26,528 - isceobj.Location.OffsetField - INFO - 426 offsets culled
+2024-02-28 14:39:26,773 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 14:39:26,983 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 14:39:27,228 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 14:39:29,132 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 5709 which is the number of lines in the slc image.
+2024-02-28 14:39:29,133 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 4510 which is the width of the slc image.
+2024-02-28 14:39:41,506 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-02-28 14:39:41,518 - isce.mroipac.filter - DEBUG - width: 1504
+2024-02-28 14:39:41,518 - isce.mroipac.filter - DEBUG - length: 1907
+2024-02-28 14:39:41,518 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/20230523_20230531.int
+2024-02-28 14:39:41,519 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/filt_20230523_20230531.int
+2024-02-28 14:39:41,519 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-02-28 14:39:41,519 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-02-28 14:39:43,729 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-02-28 14:49:25,684 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-02-28 14:49:25,711 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-02-28 14:49:25,736 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-02-28 14:49:26,842 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230523/20230523.slc
+bands = 1
+width = 25462
+length = 31514
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-28 14:50:03,765 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230531/20230531.slc
+bands = 1
+width = 25586
+length = 28444
+scheme = BIP
+dtype = CFLOAT
+
+2024-02-28 14:50:32,463 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.9294462828296046
+2024-02-28 15:28:09,436 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 22243 which is the number of lines in the slc image.
+2024-02-28 15:28:09,437 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 13860 which is the width of the slc image.
+2024-02-28 15:39:16,232 - isceobj.Location.OffsetField - INFO - 391 offsets culled
+2024-02-28 15:39:16,480 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 15:39:16,697 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 15:39:16,958 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 15:39:22,059 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 22243 which is the number of lines in the slc image.
+2024-02-28 15:39:22,059 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 13860 which is the width of the slc image.
+2024-02-28 15:41:23,526 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-02-28 15:41:23,538 - isce.mroipac.filter - DEBUG - width: 4676
+2024-02-28 15:41:23,539 - isce.mroipac.filter - DEBUG - length: 7432
+2024-02-28 15:41:23,539 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/20230523_20230531.int
+2024-02-28 15:41:23,539 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/filt_20230523_20230531.int
+2024-02-28 15:41:23,539 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-02-28 15:41:23,539 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-02-28 15:41:50,730 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-02-28 17:21:05,642 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-02-28 17:21:05,670 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-02-28 17:21:05,701 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-02-28 17:21:06,628 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.935463507067886
+2024-02-28 17:32:43,850 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 10384 which is the number of lines in the slc image.
+2024-02-28 17:32:43,850 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 12154 which is the width of the slc image.
+2024-02-28 17:42:47,570 - isceobj.Location.OffsetField - INFO - 615 offsets culled
+2024-02-28 17:42:47,775 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 17:42:47,947 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 17:42:48,140 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-02-28 17:42:50,981 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 10384 which is the number of lines in the slc image.
+2024-02-28 17:42:50,982 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 12154 which is the width of the slc image.
+2024-02-28 17:43:45,828 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-02-28 17:43:45,840 - isce.mroipac.filter - DEBUG - width: 4051
+2024-02-28 17:43:45,840 - isce.mroipac.filter - DEBUG - length: 3460
+2024-02-28 17:43:45,840 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230328_20230413/20230328_20230413.int
+2024-02-28 17:43:45,840 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230328_20230413/filt_20230328_20230413.int
+2024-02-28 17:43:45,840 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-02-28 17:43:45,841 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-02-28 17:43:57,752 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-02-29 17:44:00,810 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-02-29 17:44:00,823 - isce.mroipac.filter - DEBUG - width: 8487
+2024-02-29 17:44:00,823 - isce.mroipac.filter - DEBUG - length: 10504
+2024-02-29 17:44:00,823 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/20230523_20230531.int
+2024-02-29 17:44:00,824 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/filt_20230523_20230531.int
+2024-02-29 17:44:00,824 - isce.mroipac.filter - DEBUG - filter strength: 1.0
+2024-02-29 17:44:00,824 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-02-29 17:45:05,898 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-03-01 13:51:57,292 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-01 13:51:57,319 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-01 13:51:57,344 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-01 13:51:59,159 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230523/20230523.slc
+bands = 1
+width = 25462
+length = 31514
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 13:52:25,050 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230531/20230531.slc
+bands = 1
+width = 25586
+length = 28444
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 13:52:43,357 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.929501388787854
+2024-03-01 14:17:16,837 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 17483 which is the number of lines in the slc image.
+2024-03-01 14:17:16,838 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 10873 which is the width of the slc image.
+2024-03-01 14:28:15,398 - isceobj.Location.OffsetField - INFO - 424 offsets culled
+2024-03-01 14:28:15,698 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-03-01 14:28:15,950 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-03-01 14:28:16,257 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-03-01 14:28:21,367 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 17483 which is the number of lines in the slc image.
+2024-03-01 14:28:21,368 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 10873 which is the width of the slc image.
+2024-03-01 14:29:52,513 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-03-01 14:29:52,531 - isce.mroipac.filter - DEBUG - width: 3626
+2024-03-01 14:29:52,531 - isce.mroipac.filter - DEBUG - length: 5842
+2024-03-01 14:29:52,531 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/20230523_20230531.int
+2024-03-01 14:29:52,532 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230523_20230531/filt_20230523_20230531.int
+2024-03-01 14:29:52,532 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-03-01 14:29:52,532 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-03-01 14:30:10,573 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-03-04 09:48:10,279 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-04 09:48:10,306 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-04 09:48:10,331 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-04 09:48:11,754 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230328/20230328.slc
+bands = 1
+width = 12154
+length = 10380
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-04 09:48:18,936 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/Dem/Temporary/preprocessed/slc/20230405/20230405.slc
+bands = 1
+width = 12154
+length = 10384
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-04 09:48:25,674 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.935473167775609
+2024-03-04 09:54:03,452 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 6903 which is the number of lines in the slc image.
+2024-03-04 09:54:03,453 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 9454 which is the width of the slc image.
+2024-03-04 10:03:49,924 - isceobj.Location.OffsetField - INFO - 804 offsets culled
+2024-03-04 10:03:50,092 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-03-04 10:03:50,269 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-03-04 10:03:50,426 - isceobj.Location.OffsetField - INFO - 0 offsets culled
+2024-03-04 10:03:53,308 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_LINES has been set to the default value 6903 which is the number of lines in the slc image.
+2024-03-04 10:03:53,308 - isce.stdproc.resamp_slc - WARNING - The variable INPUT_WIDTH has been set to the default value 9454 which is the width of the slc image.
+2024-03-04 10:04:20,219 - isce.tops.runFilter - INFO - Applying power-spectral filter
+2024-03-04 10:04:20,232 - isce.mroipac.filter - DEBUG - width: 3151
+2024-03-04 10:04:20,232 - isce.mroipac.filter - DEBUG - length: 2301
+2024-03-04 10:04:20,232 - isce.mroipac.filter - DEBUG - input: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230328_20230405/20230328_20230405.int
+2024-03-04 10:04:20,233 - isce.mroipac.filter - DEBUG - output: /cygdrive/D/micro/LWork/Dem/Temporary/processing/isce_workspace/Igrams/20230328_20230405/filt_20230328_20230405.int
+2024-03-04 10:04:20,233 - isce.mroipac.filter - DEBUG - filter strength: 0.8
+2024-03-04 10:04:20,233 - isce.mroipac.filter - INFO - Filtering interferogram
+2024-03-04 10:04:25,899 - isce.tops.runFilter - INFO - Estimating spatial coherence based phase sigma
+2024-03-12 14:06:45,775 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-12 14:06:45,802 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-12 14:06:45,827 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-12 14:06:47,000 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.929537927249224
+2024-03-12 17:58:12,955 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-12 17:58:12,982 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-12 17:58:13,008 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-12 17:58:13,877 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.929537927249224
+2024-03-12 18:55:24,932 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.929537927249224
diff --git a/landcover-L-SAR/LandCover-L-SAR.xml b/landcover-L-SAR/LandCover-L-SAR.xml
index 8cb269d..8335df1 100644
--- a/landcover-L-SAR/LandCover-L-SAR.xml
+++ b/landcover-L-SAR/LandCover-L-SAR.xml
@@ -51,9 +51,9 @@
标记数据
标记的样本数据
File
- zip
+ csv
Man
- F:\MicroWorkspace\LT1B\LT230919\LT1B_landaCoverSample.zip
+ F:\MicroWorkspace\LT1B\LT230919\landcover_roi.csv
True
True
UploadInput
@@ -79,15 +79,14 @@
FeatureCombination
极化特征组合
- 可选极化特征组合一、共14种特征(编号依次为0-13)
+ 可选极化特征组合一、共10种特征(编号依次为0-9)
Freeman:表面散射p_s(0)、偶次散射p_d(1)、体散射p_v(2);
- Touzi:散射角α_s(3)、散射相位ϕ_α(4)、目标散射对称度τ(5)、相对能量λ_i(6);
- Yamaguchi:表面散射f_s(7)、二次散射f_d(8)、体散射f_v(9)、螺旋体散射f_h(10);
- Cloude-Pottier:分解散射熵H(11)、反熵A(12)、平均散射角α(13)
+ Yamaguchi:表面散射f_s(3)、二次散射f_d(4)、体散射f_v(5)、螺旋体散射f_h(6);
+ Cloude-Pottier:分解散射熵H(7)、反熵A(8)、平均散射角α(9)
Value
string
Man
- 0,1,2
+ 0,1,2,3,4,5,6,7,8,9
True
True
UploadInput
diff --git a/landcover-L-SAR/LandCoverMain.py b/landcover-L-SAR/LandCoverMain.py
index 02852d9..a09f5a1 100644
--- a/landcover-L-SAR/LandCoverMain.py
+++ b/landcover-L-SAR/LandCoverMain.py
@@ -57,6 +57,7 @@ productLevel = cf.get('productLevel')
LogHandler.init_log_handler('run_log\\' + EXE_NAME)
logger = logging.getLogger("mylog")
FILTER_SIZE = int(cf.get('filter_size'))
+multiprocessing_num = int(cf.get('multiprocessing_num'))
file =fileHandle(DEBUG)
MAX_TRAN_NUM = int(cf.get('max_tran__num_per_class'))
# env_str = os.path.split(os.path.realpath(__file__))[0]
@@ -232,7 +233,7 @@ class LandCoverMain:
logger.error('FreemanDecomposition err')
return False, None
outFolderDic['Freeman'] = freemanOutDir
-
+ logger.info('Freeman successful')
if 'Touzi' in self.__FeatureInput:
# Touzi分解
touziOutDir = os.path.join(self.__workspace_processing_path, 'touzi\\') # self.__workspace_processing_path + 'touzi\\'
@@ -242,7 +243,7 @@ class LandCoverMain:
p = PspTouziDecomposition(self.__preprocessed_paras, touziOutDir)
p.Touzi_decomposition_multiprocessing()
outFolderDic['Touzi'] = touziOutDir
-
+ logger.info('Touzi successful')
if 'Yamaguchi' in self.__FeatureInput:
# Yamaguchi分解
yamaguchiOutDir = os.path.join(self.__workspace_processing_path, 'yamaguchi\\') # self.__workspace_processing_path + 'yamaguchi\\'
@@ -254,7 +255,7 @@ class LandCoverMain:
logger.error('CloudePottierDecomposition err')
return False, None
outFolderDic['Yamaguchi'] = yamaguchiOutDir
-
+ logger.info('Yamaguchi successful')
if 'Cloude' in self.__FeatureInput:
# CloudePottier分解
cloudeOutDir = os.path.join(self.__workspace_processing_path, 'cloude\\') # self.__workspace_processing_path + 'cloude\\'
@@ -266,6 +267,7 @@ class LandCoverMain:
logger.error('CloudePottierDecomposition err')
return False, None
outFolderDic['Cloude'] = cloudeOutDir
+ logger.info('Cloude successful')
return True, outFolderDic
def __getInputFeatures(self):
@@ -288,16 +290,11 @@ class LandCoverMain:
else:
self.__FeatureInput['Freeman'] = [i]
elif 3 <= i < 7:
- if 'Touzi' in self.__FeatureInput:
- self.__FeatureInput['Touzi'].append(i)
- else:
- self.__FeatureInput['Touzi'] = [i]
- elif 7 <= i < 11:
if 'Yamaguchi' in self.__FeatureInput:
self.__FeatureInput['Yamaguchi'].append(i)
else:
self.__FeatureInput['Yamaguchi'] = [i]
- elif 11 <= i < 14:
+ elif 7 <= i < 10:
if 'Cloude' in self.__FeatureInput:
self.__FeatureInput['Cloude'].append(i)
else:
@@ -307,24 +304,19 @@ class LandCoverMain:
def __FeatureParaInit(self):
self.__FeatureMap["Freeman"] = [0, 1, 2]
- self.__FeatureMap["Touzi"] = [3, 4, 5, 6]
- self.__FeatureMap["Yamaguchi"] = [7, 8, 9, 10]
- self.__FeatureMap["Cloude"] = [11, 12, 13]
+ self.__FeatureMap["Yamaguchi"] = [3, 4, 5, 6]
+ self.__FeatureMap["Cloude"] = [7, 8, 9]
self.___FeatureFileNameMap[0] = ['Freeman', "Freeman_Odd.bin"]
self.___FeatureFileNameMap[1] = ['Freeman', "Freeman_Dbl.bin"]
self.___FeatureFileNameMap[2] = ['Freeman', "Freeman_Vol.bin"]
- self.___FeatureFileNameMap[3] = ['Touzi', "alpha.bin"]
- self.___FeatureFileNameMap[4] = ['Touzi', "phi.bin"]
- self.___FeatureFileNameMap[5] = ['Touzi', "tau.bin"]
- self.___FeatureFileNameMap[6] = ['Touzi', "psi.bin"]
- self.___FeatureFileNameMap[7] = ['Yamaguchi', "Yamaguchi4_Odd.bin"]
- self.___FeatureFileNameMap[8] = ['Yamaguchi', "Yamaguchi4_Dbl.bin"]
- self.___FeatureFileNameMap[9] = ['Yamaguchi', "Yamaguchi4_Vol.bin"]
- self.___FeatureFileNameMap[10] = ['Yamaguchi', "Yamaguchi4_Hlx.bin"]
- self.___FeatureFileNameMap[11] = ['Cloude', "anisotropy.bin"]
- self.___FeatureFileNameMap[12] = ['Cloude', "entropy.bin"]
- self.___FeatureFileNameMap[13] = ['Cloude', "alpha.bin"]
+ self.___FeatureFileNameMap[3] = ['Yamaguchi', "Yamaguchi4_Odd.bin"]
+ self.___FeatureFileNameMap[4] = ['Yamaguchi', "Yamaguchi4_Dbl.bin"]
+ self.___FeatureFileNameMap[5] = ['Yamaguchi', "Yamaguchi4_Vol.bin"]
+ self.___FeatureFileNameMap[6] = ['Yamaguchi', "Yamaguchi4_Hlx.bin"]
+ self.___FeatureFileNameMap[7] = ['Cloude', "anisotropy.bin"]
+ self.___FeatureFileNameMap[8] = ['Cloude', "entropy.bin"]
+ self.___FeatureFileNameMap[9] = ['Cloude', "alpha.bin"]
def create_roi(self, img_path):
"""
@@ -467,7 +459,7 @@ class LandCoverMain:
calibration = Calibration.get_Calibration_coefficient(self.__processing_paras['Origin_META'], polarization)
tif_path = atp.calibration(calibration, in_ahv_dir=self.__workspace_preprocessed_path)
atp.ahv_to_polsarpro_t3_soil(t3_path, tif_path)
-
+ logger.info('S2 to T3 success!')
# Lee滤波
leeFilter = LeeRefinedFilterT3()
lee_filter_path = os.path.join(self.__workspace_processing_path, 'lee_filter\\') # self.__workspace_processing_path + 'lee_filter\\'
@@ -485,7 +477,7 @@ class LandCoverMain:
exe_path = r".\baseTool\x64\Release\SIMOrthoProgram-L-SAR.exe"
exe_cmd = r"set PROJ_LIB=.\baseTool\x64\Release; & {0} {1} {2} {3} {4} {5}".format(exe_path, 11, parameter_path,
dem_rc, in_sar, out_sar)
- print(exe_cmd)
+ # print(exe_cmd)
print(os.system(exe_cmd))
print("==========================================================================")
@@ -493,25 +485,27 @@ class LandCoverMain:
dir = os.path.join(self.__workspace_processing_path, 'features_geo\\')
if not os.path.exists(dir):
os.mkdir(dir)
- for key, file in zip(features_path, features_path.values()):
- name = key + '_geo.tif'
- out_path = os.path.join(dir, name)
- self.calInterpolation_bil_Wgs84_rc_sar_sigma(self.__processing_paras['paraMeter'],
- self.__preprocessed_paras['sim_ori'], file, out_path)
- calOutDir = os.path.join(self.__workspace_processing_path, 'cal\\') # 添加四极化后向散射系数到特征图中
- if not os.path.exists(calOutDir):
- os.makedirs(calOutDir)
para_names_l1a = ["HH", "VV", "HV", "VH"]
for key in para_names_l1a:
- name = key + '_geo.tif'
- out_path = os.path.join(dir, name)
- calOut_path = os.path.join(calOutDir, key + '_cal.tif')
+ calOut_path = os.path.join(features_path, key + '_cal.tif')
AHVToPolsarpro.sar_backscattering_sigma(self.__preprocessed_paras[key],
self.__processing_paras['Origin_META'], calOut_path)
- self.calInterpolation_bil_Wgs84_rc_sar_sigma(self.__processing_paras['paraMeter'],
- self.__preprocessed_paras['sim_ori'],
- calOut_path, out_path)
+ parameter = self.__processing_paras['paraMeter']
+ sim_ori = self.__preprocessed_paras['sim_ori']
+ in_tif_paths = list(glob.glob(os.path.join(features_path, '*.tif')))
+ processes_num = min([len(in_tif_paths), multiprocessing_num, multiprocessing.cpu_count() - 1])
+ pool = multiprocessing.Pool(processes=processes_num)
+ pl = []
+ for file_p in in_tif_paths:
+ name = os.path.basename(file_p).split('.')[0] + '_geo.tif'
+ out_path = os.path.join(dir, name)
+ pl.append(pool.apply_async(self.calInterpolation_bil_Wgs84_rc_sar_sigma, (parameter, sim_ori, file_p, out_path))) # topp
+ pool.close()
+ pool.join()
+ # self.calInterpolation_bil_Wgs84_rc_sar_sigma(self.__processing_paras['paraMeter'],
+ # self.__preprocessed_paras['sim_ori'], file, out_path)
+
return dir
def process_handle(self, start):
@@ -552,7 +546,7 @@ class LandCoverMain:
logging.info("feature_tif_paths:%s",feature_tif_paths)
# 对所有特征进行地理编码
- feature_geo = self.features_geo(feature_tif_paths)
+ feature_geo = self.features_geo(self.__feature_tif_dir)
# 新添加的特征做归一化
# for name in self.__feature_name_list:
# proj, geo, arr = self.imageHandler.read_img(self.__preprocessed_paras[name])
diff --git a/landcover-L-SAR/baseTool/x64/Release/ImageMatch.obj b/landcover-L-SAR/baseTool/x64/Release/ImageMatch.obj
index 3671ff2..b537160 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/ImageMatch.obj and b/landcover-L-SAR/baseTool/x64/Release/ImageMatch.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/OctreeNode.obj b/landcover-L-SAR/baseTool/x64/Release/OctreeNode.obj
index 33780f3..84daed8 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/OctreeNode.obj and b/landcover-L-SAR/baseTool/x64/Release/OctreeNode.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/RPC_Correct.obj b/landcover-L-SAR/baseTool/x64/Release/RPC_Correct.obj
index 1417e30..ad020c6 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/RPC_Correct.obj and b/landcover-L-SAR/baseTool/x64/Release/RPC_Correct.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog
index dcf8d7f..7583acc 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog and b/landcover-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log
index 7790ed8..f5b2618 100644
--- a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log
+++ b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log
@@ -1,12 +1,12 @@
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\octreenode.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\interpolation.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\basetool.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\sateorbit.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\imagematch.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\test_moudel.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simptsn.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simorthoprogram.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\rpc_correct.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\test_moudel.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\interpolation.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\sateorbit.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simorthoprogram.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\basetool.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\vc142.pdb
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\concrt140.dll
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\msvcp140.dll
@@ -56,7 +56,7 @@ d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-s
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\spatialite.dll
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\freexl-1.dll
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\minizip.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.11520.write.1.tlog
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.10508.write.1.tlog
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.command.1.tlog
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.read.1.tlog
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\copylocal.read.1u.tlog
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe
index 80d3e9e..a2f5b3c 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe and b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb
index 2931216..2a01045 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb and b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.Build.CppClean.log b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.Build.CppClean.log
deleted file mode 100644
index 2dccc60..0000000
--- a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.Build.CppClean.log
+++ /dev/null
@@ -1,70 +0,0 @@
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\octreenode.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simptsn.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\basetool.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\rpc_correct.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\interpolation.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\imagematch.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\test_moudel.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\sateorbit.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\vc142.pdb
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\concrt140.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\msvcp140.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\msvcp140_1.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\msvcp140_2.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\msvcp140_atomic_wait.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\msvcp140_codecvt_ids.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\vccorlib140.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\vcruntime140.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\vcruntime140_1.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\vcamp140.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\vcomp140.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.exe
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.pdb
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.res
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\boost_filesystem-vc142-mt-x64-1_82.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\gdal.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\zlib1.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libcrypto-3-x64.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libssl-3-x64.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\liblzma.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\qhull_r.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\jpeg62.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\tiff.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\geotiff.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\proj.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\sqlite3.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libcurl.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libpng16.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\lerc.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\zstd.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\gif.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\netcdf.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\hdf5_hl.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\hdf5.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libwebp.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libsharpyuv.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libpq.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\pcre2-8.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libexpat.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\libxml2.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\iconv-2.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\geos_c.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\geos.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\json-c.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\openjp2.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\spatialite.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\freexl-1.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\minizip.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\cl.10524.write.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\cl.command.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\cl.read.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\copylocal.read.1u.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\copylocal.write.1u.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\link.command.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\link.read.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\link.write.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\rc.command.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\rc.read.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\rc.write.1.tlog
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_gf3-strip\x64\release\simorthoprogram.tlog\simorthoprogram.write.1u.tlog
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.exe b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.exe
deleted file mode 100644
index b458ed8..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.exe and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.exe.recipe b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.exe.recipe
deleted file mode 100644
index d8d2007..0000000
--- a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.exe.recipe
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_gf3-strip\x64\Release\SIMOrthoProgram.exe
-
-
-
-
-
-
\ No newline at end of file
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log
index d9fb81b..6ad0b2a 100644
--- a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log
+++ b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log
@@ -7,39 +7,39 @@
SateOrbit.cpp
SIMOrthoProgram.cpp
test_moudel.cpp
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SIMOrthoProgram.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SIMOrthoProgram.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 baseTool.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 baseTool.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SIMOrthoProgram.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 baseTool.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 test_moudel.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 SIMOrthoProgram.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 simptsn.cpp)
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 SIMOrthoProgram.cpp)
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 test_moudel.cpp)
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 baseTool.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\test_moudel.cpp(224,31): warning C4129: “R”: 不可识别的字符转义序列
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 RPC_Correct.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 baseTool.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 ImageMatch.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(469,15): warning C4101: “asfclass”: 未引用的局部变量
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 simptsn.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.cpp(500,18): warning C4154: 删除数组表达式;转换到提供的指针
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(469,15): warning C4101: “asfclass”: 未引用的局部变量
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.cpp(942,28): warning C4267: “初始化”: 从“size_t”转换到“int”,可能丢失数据
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.cpp(944,47): warning C4267: “初始化”: 从“size_t”转换到“int”,可能丢失数据
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 ImageMatch.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(1239,7): warning C4101: “temp_r”: 未引用的局部变量
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(1239,15): warning C4101: “temp_c”: 未引用的局部变量
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(3170,18): warning C4101: “snr”: 未引用的局部变量
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj
index a02e0c2..957baac 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj and b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.pdb b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.pdb
deleted file mode 100644
index 0f47ffa..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.pdb and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.10340.write.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.10340.write.1.tlog
deleted file mode 100644
index 3157be0..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.10340.write.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.13592.write.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.13592.write.1.tlog
deleted file mode 100644
index 301bb9e..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.13592.write.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.command.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.command.1.tlog
deleted file mode 100644
index b1f1d33..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.command.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.read.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.read.1.tlog
deleted file mode 100644
index 9163f60..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CopyLocal.read.1u.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CopyLocal.read.1u.tlog
deleted file mode 100644
index 8588902..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CopyLocal.read.1u.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CopyLocal.write.1u.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CopyLocal.write.1u.tlog
deleted file mode 100644
index f1a36ae..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/CopyLocal.write.1u.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate
deleted file mode 100644
index 4772980..0000000
--- a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:VcpkgTriplet=x64-windows:
-Release|x64|D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_gf3-strip\|
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.write.1u.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.write.1u.tlog
deleted file mode 100644
index cd5bbba..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/SIMOrthoProgram.write.1u.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.command.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.command.1.tlog
deleted file mode 100644
index 565dbeb..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.command.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.read.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.read.1.tlog
deleted file mode 100644
index 8d7f566..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.read.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.write.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.write.1.tlog
deleted file mode 100644
index dc7e79a..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/link.write.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.command.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.command.1.tlog
deleted file mode 100644
index 0190689..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.command.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.read.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.read.1.tlog
deleted file mode 100644
index cf06a88..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.read.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.write.1.tlog b/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.write.1.tlog
deleted file mode 100644
index 136d0c3..0000000
Binary files a/landcover-L-SAR/baseTool/x64/Release/SIMOrthoProgram.tlog/rc.write.1.tlog and /dev/null differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/SateOrbit.obj b/landcover-L-SAR/baseTool/x64/Release/SateOrbit.obj
index d3e747a..ca0b872 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/SateOrbit.obj and b/landcover-L-SAR/baseTool/x64/Release/SateOrbit.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/baseTool.obj b/landcover-L-SAR/baseTool/x64/Release/baseTool.obj
index 80c34e9..d345e97 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/baseTool.obj and b/landcover-L-SAR/baseTool/x64/Release/baseTool.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/interpolation.obj b/landcover-L-SAR/baseTool/x64/Release/interpolation.obj
index 0c56caa..93fe583 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/interpolation.obj and b/landcover-L-SAR/baseTool/x64/Release/interpolation.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/simptsn.obj b/landcover-L-SAR/baseTool/x64/Release/simptsn.obj
index 5e283aa..5552966 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/simptsn.obj and b/landcover-L-SAR/baseTool/x64/Release/simptsn.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/test_moudel.obj b/landcover-L-SAR/baseTool/x64/Release/test_moudel.obj
index 826b50f..8a64d45 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/test_moudel.obj and b/landcover-L-SAR/baseTool/x64/Release/test_moudel.obj differ
diff --git a/landcover-L-SAR/baseTool/x64/Release/vc142.pdb b/landcover-L-SAR/baseTool/x64/Release/vc142.pdb
index ec1b5f0..7c418e1 100644
Binary files a/landcover-L-SAR/baseTool/x64/Release/vc142.pdb and b/landcover-L-SAR/baseTool/x64/Release/vc142.pdb differ
diff --git a/landcover-L-SAR/config.ini b/landcover-L-SAR/config.ini
index 5b025a8..f89dbf6 100644
--- a/landcover-L-SAR/config.ini
+++ b/landcover-L-SAR/config.ini
@@ -4,6 +4,7 @@
######1-算法基本参数######
tar = LANDCLASS
productLevel = 5
+multiprocessing_num = 4
# 算法名称。修改临时工作区生成临时文件的名称,日志名称;
exe_name = LandCover
# 开启调试模式则不删除临时工作区,True:开启调试,False:不开启调试
diff --git a/landcover-L-SAR/h_a_alpha_decomposition_T3.exe b/landcover-L-SAR/h_a_alpha_decomposition_T3.exe
index 43b0c18..c578f0d 100644
Binary files a/landcover-L-SAR/h_a_alpha_decomposition_T3.exe and b/landcover-L-SAR/h_a_alpha_decomposition_T3.exe differ
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-17-50-19.log b/landcover-L-SAR/run_log/LandCover2024-02-21-17-50-19.log
deleted file mode 100644
index 9445439..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-17-50-19.log
+++ /dev/null
@@ -1,54 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\landcover-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
-INFO:mylog:check_source success!
-INFO:root:scope0:[[130.58930555555554, 47.875416666666666], [131.11458333333331, 47.875416666666666], [130.58930555555554, 47.428472222222226], [131.11458333333331, 47.428472222222226]]
-INFO:root:scope1:[[130.58930555555554, 47.875416666666666], [131.11458333333331, 47.875416666666666], [130.58930555555554, 47.428472222222226], [131.11458333333331, 47.428472222222226]]
-INFO:root:scope roi :[(130.58930555555554, 47.428472222222226), (130.58930555555554, 47.875416666666666), (131.11458333333331, 47.875416666666666), (131.11458333333331, 47.428472222222226)]
-INFO:mylog:cut sim_ori success!
-INFO:mylog:preprocess_handle success!
-INFO:mylog:1,water,num:2598827
-INFO:mylog:max number =10000, random select10000 point as train data!
-INFO:mylog:2,build,num:260469
-INFO:mylog:max number =10000, random select10000 point as train data!
-INFO:mylog:3,dryland,num:12290
-INFO:mylog:max number =10000, random select10000 point as train data!
-INFO:mylog:4,road,num:803810
-INFO:mylog:max number =10000, random select10000 point as train data!
-INFO:mylog:read csv data success!
-INFO:mylog:progress bar: 20%
-INFO:mylog:refine_lee filter success!
-INFO:mylog:progress bar: 30%
-INFO:root:feature_tif_paths:{'Freeman_Dbl': 'D:\\micro\\LWork\\LandCover\\Temporary\\processing\\feature_tif\\Freeman_Dbl.tif', 'Freeman_Odd': 'D:\\micro\\LWork\\LandCover\\Temporary\\processing\\feature_tif\\Freeman_Odd.tif', 'Freeman_Vol': 'D:\\micro\\LWork\\LandCover\\Temporary\\processing\\feature_tif\\Freeman_Vol.tif'}
-INFO:mylog:decompose feature success!
-INFO:mylog:progress bar: 50%
-INFO:mylog:feature_list:['0: Freeman_Dbl_geo.tif', '1: Freeman_Odd_geo.tif', '2: Freeman_Vol_geo.tif', '3: HH_geo.tif', '4: HV_geo.tif', '5: VH_geo.tif', '6: VV_geo.tif']
-INFO:mylog:gene_train_set success!
-INFO:mylog:importances:[0.04468712 0.12261322 0.1810672 0.15963443 0.1590307 0.15587516
- 0.17709217],threshold=0.07
-INFO:mylog:optimal_feature:[2, 6, 3, 4, 5, 1]
-INFO:mylog:correlation_map:
- [[0. 0.97868005 0.96331923 0.9994675 0.99960076 1. ]
- [0. 0. 0.97593382 0.9802677 0.98012763 0.97868045]
- [0. 0. 0. 0.96648162 0.96612449 0.96331962]
- [0. 0. 0. 0. 0.99998857 0.99946743]
- [0. 0. 0. 0. 0. 0.9996007 ]
- [0. 0. 0. 0. 0. 0. ]]
-INFO:mylog:validity_list_corr:[2]
-INFO:mylog:[2]
-INFO:mylog:train_feature:['2: Freeman_Vol_geo.tif']
-INFO:mylog:RF trainning
-INFO:mylog:RF train successful
-INFO:mylog:progress bar: 60%
-INFO:mylog:block size is :3072
-INFO:mylog:test_feature:dict_keys(['Freeman_Vol_geo'])
-INFO:mylog:blocking tifs success!
-INFO:mylog:create features matrix success!
-INFO:mylog:testing
-INFO:mylog:test success!
-INFO:mylog:progress bar: 95%
-INFO:mylog:trans_tif2mask success, path: D:\micro\LWork\LandCover\Temporary\processing\tif_mask.tif
-INFO:mylog:create ROI image success!
-INFO:mylog:process_handle success!
-INFO:mylog:successful production of LandCover products!
-INFO:mylog:running use time: 14:43:34.363577
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-02.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-02.log
deleted file mode 100644
index 778ce72..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-02.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:0 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_0_3072.tif
-INFO:mylog:total:25,block:0 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_0_3072.tif
-INFO:mylog:total:25,block:17 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_3072_6144.tif
-INFO:mylog:total:25,block:17 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_3072_6144.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-03.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-03.log
deleted file mode 100644
index 9145dc8..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-03.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:1 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_11883_14955.tif
-INFO:mylog:total:25,block:1 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_11883_14955.tif
-INFO:mylog:total:25,block:15 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_0_3072.tif
-INFO:mylog:total:25,block:15 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_0_3072.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-05.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-05.log
deleted file mode 100644
index 952ca2f..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-05.log
+++ /dev/null
@@ -1,2 +0,0 @@
-INFO:mylog:total:25,block:2 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_3072_6144.tif
-INFO:mylog:total:25,block:2 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_3072_6144.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-08.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-08.log
deleted file mode 100644
index 8e21f00..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-08.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:3 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_6144_9216.tif
-INFO:mylog:total:25,block:3 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_6144_9216.tif
-INFO:mylog:total:25,block:18 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_6144_9216.tif
-INFO:mylog:total:25,block:18 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_6144_9216.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-10.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-10.log
deleted file mode 100644
index 50edc7d..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-10.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:4 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_9216_12288.tif
-INFO:mylog:total:25,block:4 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_0_3072_9216_12288.tif
-INFO:mylog:total:25,block:20 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_0_3072.tif
-INFO:mylog:total:25,block:20 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_0_3072.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-12.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-12.log
deleted file mode 100644
index d430095..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-12.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:5 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_0_3072.tif
-INFO:mylog:total:25,block:5 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_0_3072.tif
-INFO:mylog:total:25,block:16 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_11883_14955.tif
-INFO:mylog:total:25,block:16 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_11883_14955.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-15.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-15.log
deleted file mode 100644
index bfde76f..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-15.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:6 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_11883_14955.tif
-INFO:mylog:total:25,block:6 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_11883_14955.tif
-INFO:mylog:total:25,block:19 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_9216_12288.tif
-INFO:mylog:total:25,block:19 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9216_12288_9216_12288.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-17.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-17.log
deleted file mode 100644
index 05a5fa3..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-17.log
+++ /dev/null
@@ -1,2 +0,0 @@
-INFO:mylog:total:25,block:7 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_3072_6144.tif
-INFO:mylog:total:25,block:7 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_3072_6144.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-19.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-19.log
deleted file mode 100644
index 75a376c..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-19.log
+++ /dev/null
@@ -1,2 +0,0 @@
-INFO:mylog:total:25,block:8 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_6144_9216.tif
-INFO:mylog:total:25,block:8 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_6144_9216.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-22.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-22.log
deleted file mode 100644
index 7a8e2e1..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-22.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:9 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_9216_12288.tif
-INFO:mylog:total:25,block:9 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_3072_6144_9216_12288.tif
-INFO:mylog:total:25,block:21 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_11883_14955.tif
-INFO:mylog:total:25,block:21 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_11883_14955.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-24.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-24.log
deleted file mode 100644
index a9122ae..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-24.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:10 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_0_3072.tif
-INFO:mylog:total:25,block:10 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_0_3072.tif
-INFO:mylog:total:25,block:23 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_6144_9216.tif
-INFO:mylog:total:25,block:23 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_6144_9216.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-26.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-26.log
deleted file mode 100644
index b85c3b3..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-26.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:11 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_11883_14955.tif
-INFO:mylog:total:25,block:11 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_11883_14955.tif
-INFO:mylog:total:25,block:22 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_3072_6144.tif
-INFO:mylog:total:25,block:22 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_3072_6144.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-31.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-31.log
deleted file mode 100644
index 305bb46..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-31.log
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO:mylog:total:25,block:12 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_3072_6144.tif
-INFO:mylog:total:25,block:12 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_3072_6144.tif
-INFO:mylog:total:25,block:24 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_9216_12288.tif
-INFO:mylog:total:25,block:24 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_9653_12725_9216_12288.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-36.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-36.log
deleted file mode 100644
index f421f2c..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-36.log
+++ /dev/null
@@ -1,2 +0,0 @@
-INFO:mylog:total:25,block:13 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_6144_9216.tif
-INFO:mylog:total:25,block:13 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_6144_9216.tif
diff --git a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-41.log b/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-41.log
deleted file mode 100644
index 487ddb5..0000000
--- a/landcover-L-SAR/run_log/LandCover2024-02-21-18-08-41.log
+++ /dev/null
@@ -1,2 +0,0 @@
-INFO:mylog:total:25,block:14 testing data !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_9216_12288.tif
-INFO:mylog:total:25,block:14 test data finished !path:D:\micro\LWork\LandCover\Temporary\processing\LandCover\LandCover_6144_9216_9216_12288.tif
diff --git a/soilMoisture-L-SAR/SoilMoistureMain.py b/soilMoisture-L-SAR/SoilMoistureMain.py
index d14851a..261e35b 100644
--- a/soilMoisture-L-SAR/SoilMoistureMain.py
+++ b/soilMoisture-L-SAR/SoilMoistureMain.py
@@ -359,9 +359,11 @@ class MoistureMain:
proj, geos, data = self.imageHandler.read_img(product_path)
- data[data < soil_moisture_value_min] = soil_moisture_value_min
- data[data > soil_moisture_value_max] = soil_moisture_value_max
- self.imageHandler.write_img(product_path, proj, geos, data)
+ # data[data < soil_moisture_value_min] = soil_moisture_value_min
+ # data[data > soil_moisture_value_max] = soil_moisture_value_max
+ data[data < soil_moisture_value_min] = -9999
+ data[data > soil_moisture_value_max] = -9999
+ self.imageHandler.write_img(product_path, proj, geos, data, '-9999')
# 生成快视图
self.imageHandler.write_quick_view(product_path)
diff --git a/soilMoisture-L-SAR/config.ini b/soilMoisture-L-SAR/config.ini
index 07b0324..f0064ef 100644
--- a/soilMoisture-L-SAR/config.ini
+++ b/soilMoisture-L-SAR/config.ini
@@ -20,4 +20,4 @@ block_size_config=1024
# 土壤水分产品值范围,超出范围的用最大值或最小值代替
product_value_min = 0
-product_value_max = 0.4
\ No newline at end of file
+product_value_max = 1
\ No newline at end of file
diff --git a/soilSalinity-L-SAR/SoilSalinity.xml b/soilSalinity-L-SAR/SoilSalinity.xml
index 29e7b91..30038f1 100644
--- a/soilSalinity-L-SAR/SoilSalinity.xml
+++ b/soilSalinity-L-SAR/SoilSalinity.xml
@@ -64,9 +64,9 @@
实测数据
土壤盐碱度实测数据
File
- zip
+ csv
Man
- G:\辅助数据\LTData\soilSalinity\LSAR_soilSalinity_Sality.zip
+ F:\MicroWorkspace\LT1B\LT230919\LSAR_soilSalinity_Sality.csv
DEFAULT
DEFAULT
DEFAULT
@@ -78,9 +78,9 @@
地表覆盖类型数据
经过地理定标(WGS84)的地表覆盖类型数据
File
- zip
+ tif
Man
- G:\辅助数据\LTData\soilSalinity\LSAR_soilSalinity_LandCover.zip
+ F:\MicroWorkspace\LT1B\LT230919\LSAR_vegetationPhenology_LandCover.tif
DEFAULT
DEFAULT
DEFAULT
@@ -106,9 +106,9 @@
NDVI数据
经过地理定标(WGS84)的NDVI数据
File
- zip
+ tif
Man
- G:\辅助数据\LTData\soilSalinity\LSAR_soilSalinity_NDVI.zip
+ F:\MicroWorkspace\LT1B\LT230919\LSAR_surfaceRougness_NDVI.tif
DEFAULT
DEFAULT
DEFAULT
diff --git a/soilSalinity-L-SAR/SoilSalinityMain.py b/soilSalinity-L-SAR/SoilSalinityMain.py
index 67ec8a0..a5a24a0 100644
--- a/soilSalinity-L-SAR/SoilSalinityMain.py
+++ b/soilSalinity-L-SAR/SoilSalinityMain.py
@@ -10,6 +10,7 @@
[修改序列] [修改日期] [修改者] [修改内容]
1 2022-6-27 石海军 1.增加配置文件config.ini; 2.内部处理使用地理坐标系(4326);
"""
+import glob
import logging
import shutil
@@ -314,6 +315,7 @@ class SalinityMain:
rows = self.imageHandler.get_img_height(self.__preprocessed_paras['HH'])
cols = self.imageHandler.get_img_width(self.__preprocessed_paras['HH'])
+
block_size = bp.get_block_size(rows, cols)
bp.cut(out_dir, self.__workspace_block_tif_path, ['tif', 'tiff'], 'tif', block_size)
img_dir, img_name = bp.get_file_names(self.__workspace_block_tif_path, ['tif'])
@@ -324,6 +326,7 @@ class SalinityMain:
for key in dir_dict:
key_name = key
block_num = len(dir_dict[key])
+ break
for n in range(block_num):
name = os.path.basename(dir_dict[key_name][n])
diff --git a/soilSalinity-L-SAR/h_a_alpha_decomposition_T3.exe b/soilSalinity-L-SAR/h_a_alpha_decomposition_T3.exe
index 43b0c18..760ae05 100644
Binary files a/soilSalinity-L-SAR/h_a_alpha_decomposition_T3.exe and b/soilSalinity-L-SAR/h_a_alpha_decomposition_T3.exe differ
diff --git a/soilSalinity-L-SAR/h_a_alpha_eigenvalue_set_T3.exe b/soilSalinity-L-SAR/h_a_alpha_eigenvalue_set_T3.exe
index 2c5dad5..70f1a65 100644
Binary files a/soilSalinity-L-SAR/h_a_alpha_eigenvalue_set_T3.exe and b/soilSalinity-L-SAR/h_a_alpha_eigenvalue_set_T3.exe differ
diff --git a/soilSalinity-L-SAR/h_a_alpha_eigenvector_set_T3.exe b/soilSalinity-L-SAR/h_a_alpha_eigenvector_set_T3.exe
index 5ea6b37..a8e55ba 100644
Binary files a/soilSalinity-L-SAR/h_a_alpha_eigenvector_set_T3.exe and b/soilSalinity-L-SAR/h_a_alpha_eigenvector_set_T3.exe differ
diff --git a/soilSalinity-L-SAR/pspHAAlphaDecomposition.py b/soilSalinity-L-SAR/pspHAAlphaDecomposition.py
index facf763..dcc140e 100644
--- a/soilSalinity-L-SAR/pspHAAlphaDecomposition.py
+++ b/soilSalinity-L-SAR/pspHAAlphaDecomposition.py
@@ -60,9 +60,10 @@ class PspHAAlphaDecomposition:
h_a_alpha_features.update(self.api_read_T3_matrix(polsarpro_in_dir))
return h_a_alpha_features
- def api_creat_h_a_alpha_features(self, h_a_alpha_out_dir,
- h_a_alpha_decomposition_T3_path, h_a_alpha_eigenvalue_set_T3_path,
- h_a_alpha_eigenvector_set_T3_path, polsarpro_in_dir,is_trans_to_tif=True, is_read_to_dic=False):
+ def api_creat_h_a_alpha_features_thread(self, h_a_alpha_out_dir,
+ h_a_alpha_decomposition_T3_path, h_a_alpha_eigenvalue_set_T3_path,
+ h_a_alpha_eigenvector_set_T3_path, polsarpro_in_dir, is_trans_to_tif=True,
+ is_read_to_dic=False):
"""
对porsarpro格式T3矩阵做Cloude-Pottier分解(h_a_alpha_decomposition、h_a_alpha_eigenvalue_set 和 h_a_alpha_eigenvector_set)
:param h_a_alpha_out_dir : 输出h_a_alpha二进制数据的目录
@@ -76,18 +77,24 @@ class PspHAAlphaDecomposition:
pl = []
logger.info("run h_a_alpha_decomposition_T3!")
- pl.append(pool.apply_async(self.api_h_a_alpha_decomposition_T3, (h_a_alpha_out_dir, h_a_alpha_decomposition_T3_path, polsarpro_in_dir, is_trans_to_tif, is_read_to_dic, *(1, 1, 1, 1, 1, 1, 1, 1, 1))))
+ pl.append(pool.apply_async(self.api_h_a_alpha_decomposition_T3, (
+ h_a_alpha_out_dir, h_a_alpha_decomposition_T3_path, polsarpro_in_dir, is_trans_to_tif, is_read_to_dic,
+ *(1, 1, 1, 1, 1, 1, 1, 1, 1))))
logger.info("run h_a_alpha_eigenvalue_set_T3!")
- pl.append(pool.apply_async(self.api_h_a_alpha_eigenvalue_set_T3, (h_a_alpha_out_dir, h_a_alpha_eigenvalue_set_T3_path, polsarpro_in_dir, is_trans_to_tif, is_read_to_dic, *(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1))))
+ pl.append(pool.apply_async(self.api_h_a_alpha_eigenvalue_set_T3, (
+ h_a_alpha_out_dir, h_a_alpha_eigenvalue_set_T3_path, polsarpro_in_dir, is_trans_to_tif, is_read_to_dic,
+ *(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1))))
logger.info("run h_a_alpha_eigenvector_set_T3!")
- pl.append(pool.apply_async(self.api_h_a_alpha_eigenvector_set_T3, (h_a_alpha_out_dir, h_a_alpha_eigenvector_set_T3_path, polsarpro_in_dir, is_trans_to_tif,is_read_to_dic, *(1, 1, 1, 1, 1))))
+ pl.append(pool.apply_async(self.api_h_a_alpha_eigenvector_set_T3, (
+ h_a_alpha_out_dir, h_a_alpha_eigenvector_set_T3_path, polsarpro_in_dir, is_trans_to_tif, is_read_to_dic,
+ *(1, 1, 1, 1, 1))))
pool.close()
pool.join()
logger.info(pl)
logger.info('progress bar: 60%')
- h_a_alpha_features ={}
+ h_a_alpha_features = {}
h_a_alpha_features.update(self.__res_h_a_alpha_decomposition_T3)
logger.info("run h_a_alpha_decomposition_T3 success!")
h_a_alpha_features.update(self.__res_h_a_alpha_eigenvalue_set_T3)
@@ -98,6 +105,48 @@ class PspHAAlphaDecomposition:
self.api_trans_T3_to_tif(h_a_alpha_out_dir, polsarpro_in_dir)
if is_read_to_dic:
h_a_alpha_features.update(self.api_read_T3_matrix(polsarpro_in_dir))
+ logger.info('run bin to tif success!')
+ return h_a_alpha_features
+
+ def api_creat_h_a_alpha_features(self, h_a_alpha_out_dir,
+ h_a_alpha_decomposition_T3_path, h_a_alpha_eigenvalue_set_T3_path,
+ h_a_alpha_eigenvector_set_T3_path, polsarpro_in_dir, is_trans_to_tif=True,
+ is_read_to_dic=False):
+ """
+ 对porsarpro格式T3矩阵做Cloude-Pottier分解(h_a_alpha_decomposition、h_a_alpha_eigenvalue_set 和 h_a_alpha_eigenvector_set)
+ :param h_a_alpha_out_dir : 输出h_a_alpha二进制数据的目录
+ :param h_a_alpha_decomposition_T3_path: haalphadecompositionT3.exe路径
+ :param h_a_alpha_eigenvalue_set_T3_path: h_a_alpha_eigenvalue_set_T3.exe路径
+ :param h_a_alpha_eigenvector_set_T3_path: h_a_alpha_eigenvector_set_T3.exe路径
+ :param polsarpro_in_dir:输入porsarpro格式T3矩阵目录,包含.bin,.config
+ """
+
+ logger.info("run h_a_alpha_decomposition_T3!")
+ self.api_h_a_alpha_decomposition_T3(h_a_alpha_out_dir, h_a_alpha_decomposition_T3_path, polsarpro_in_dir,
+ is_trans_to_tif, is_read_to_dic, *(1, 1, 1, 1, 1, 1, 1, 1, 1))
+ logger.info("run h_a_alpha_decomposition_T3 success!")
+ logger.info("run h_a_alpha_eigenvalue_set_T3!")
+ self.api_h_a_alpha_eigenvalue_set_T3(h_a_alpha_out_dir, h_a_alpha_eigenvalue_set_T3_path, polsarpro_in_dir,
+ is_trans_to_tif, is_read_to_dic, *(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1))
+ logger.info("run h_a_alpha_eigenvalue_set_T3 success!")
+ logger.info("run h_a_alpha_eigenvector_set_T3!")
+ self.api_h_a_alpha_eigenvector_set_T3(h_a_alpha_out_dir, h_a_alpha_eigenvector_set_T3_path, polsarpro_in_dir,
+ is_trans_to_tif, is_read_to_dic, *(1, 1, 1, 1, 1))
+ logger.info("run h_a_alpha_eigenvector_set_T3 success!")
+ logger.info('progress bar: 60%')
+
+ h_a_alpha_features = {}
+ h_a_alpha_features.update(self.__res_h_a_alpha_decomposition_T3)
+
+ h_a_alpha_features.update(self.__res_h_a_alpha_eigenvalue_set_T3)
+
+ h_a_alpha_features.update(self.__res_h_a_alpha_eigenvector_set_T3)
+
+ if is_trans_to_tif:
+ self.api_trans_T3_to_tif(h_a_alpha_out_dir, polsarpro_in_dir)
+ if is_read_to_dic:
+ h_a_alpha_features.update(self.api_read_T3_matrix(polsarpro_in_dir))
+ logger.info('run bin to tif success!')
return h_a_alpha_features
def api_h_a_alpha_decomposition_T3(self, h_a_alpha_out_dir, h_a_alpha_decomposition_T3_path, polsarpro_in_dir, is_trans_to_tif=True, is_read_to_dic=False, *args):
diff --git a/soilSalinity-L-SAR/打包步骤.txt b/soilSalinity-L-SAR/打包步骤.txt
index 1dcaefa..be1d56a 100644
--- a/soilSalinity-L-SAR/打包步骤.txt
+++ b/soilSalinity-L-SAR/打包步骤.txt
@@ -10,4 +10,6 @@
192.168.0.1
οӣhttps://www.jb51.net/article/187806.htm
-pyinstaller -F --add-data "D:/Anaconda/envs/micro/Lib/site-packages/dask/dask.yaml;./dask" --add-data "D:/Anaconda/envs/micro/Lib/site-packages/distributed/distributed.yaml;./distributed" --hidden-import pyproj._compat
\ No newline at end of file
+pyinstaller -F --add-data "D:/Anaconda/envs/micro/Lib/site-packages/dask/dask.yaml;./dask" --add-data "D:/Anaconda/envs/micro/Lib/site-packages/distributed/distributed.yaml;./distributed" --hidden-import pyproj._compat
+
+pyinstaller -F --add-data "F:\Anaconda3\envs\micro\Lib\site-packages\pykrige;./pykrige"
\ No newline at end of file
diff --git a/tool/algorithm/algtools/PreProcess.py b/tool/algorithm/algtools/PreProcess.py
index 3158632..4b4c4c2 100644
--- a/tool/algorithm/algtools/PreProcess.py
+++ b/tool/algorithm/algtools/PreProcess.py
@@ -255,7 +255,7 @@ class PreProcess:
:return: 多边形相交的区域坐标((x0,y0),(x1,y1),..., (xn,yn))
"""
if len(scopes_tuple) < 2:
- logger.error('len(scopes_tuple) < 2')
+ logger.warning('len(scopes_tuple) < 2')
# return # todo 修改只有单景会出现无法判断相交区域问题
try:
diff --git a/tool/algorithm/ml/machineLearning.py b/tool/algorithm/ml/machineLearning.py
index a45efe3..0c3876e 100644
--- a/tool/algorithm/ml/machineLearning.py
+++ b/tool/algorithm/ml/machineLearning.py
@@ -19,6 +19,7 @@ from tool.algorithm.block.blockprocess import BlockProcess
import logging
import os
import glob
+import shutil
from PIL import Image
from tool.file.fileHandle import fileHandle
import multiprocessing
@@ -65,21 +66,25 @@ class MachineLeaning:
rows = ImageHandler.get_img_height(in_tif_paths[0])
workspace_block_tif_path = os.path.join(feature_tif_dir, 'block')
workspace_block_feature_path = os.path.join(feature_tif_dir, 'feature')
- file.creat_dirs([workspace_block_tif_path, workspace_block_feature_path])
+ feature_cut_dir = os.path.join(feature_tif_dir, 'feature_cut')
+ file.creat_dirs([workspace_block_tif_path, workspace_block_feature_path, feature_cut_dir])
+ for m, feature_file in zip(range(len(in_tif_paths)), in_tif_paths):
+ if m in optimal_feature:
+ shutil.copy(feature_file, os.path.join(feature_cut_dir, os.path.basename(feature_file)))
# 特征分块
bp = BlockProcess()
block_size = bp.get_block_size(rows, cols)
logger.info('block size is :%s', block_size)
- bp.cut(feature_tif_dir, workspace_block_tif_path, ['tif', 'tiff'], 'tif', block_size)
+ bp.cut(feature_cut_dir, workspace_block_tif_path, ['tif', 'tiff'], 'tif', block_size)
img_dir, img_name = bp.get_file_names(workspace_block_tif_path, ['tif'])
dir_dict_all = bp.get_same_img(img_dir, img_name)
# 选择最优特征子集特征影像
dir_dict = {}
for n, key in zip(range(len(dir_dict_all)), dir_dict_all):
- if n in optimal_feature:
- dir_dict.update({key: dir_dict_all[key]})
+ # if n in optimal_feature:
+ dir_dict.update({key: dir_dict_all[key]})
logger.info('test_feature:%s', dir_dict.keys())
logger.info('blocking tifs success!')
X_test_list = []
@@ -384,6 +389,20 @@ class MachineLeaning:
logger.info('total:%s,num:%s create train set success!', len(measured_data_img), n)
return np.array(X_train), np.array(Y_train)
+ @staticmethod
+ def get_train_data(features_array, measured_data):
+ X_train = []
+ Y_train = []
+ for data in measured_data:
+ row = data[0]
+ col = data[1]
+ feature = features_array[:, row, col]
+ if not np.isnan(feature).any() or np.isinf(feature).any():
+ X_train.append(list(feature))
+ Y_train.append([data[2]])
+
+ return np.array(X_train), np.array(Y_train)
+
@staticmethod
def trainRF(X_train, Y_train):
#随机森林
diff --git a/tool/algorithm/polsarpro/AHVToPolsarpro.py b/tool/algorithm/polsarpro/AHVToPolsarpro.py
index 6e595a5..33e48e9 100644
--- a/tool/algorithm/polsarpro/AHVToPolsarpro.py
+++ b/tool/algorithm/polsarpro/AHVToPolsarpro.py
@@ -11,6 +11,7 @@
import os
import numpy as np
import glob
+import pickle
import struct
from tool.algorithm.algtools.MetaDataHandler import MetaDataHandler
@@ -289,6 +290,11 @@ class AHVToPolsarpro:
im_bin = struct.pack("f" * self._cols, *np.reshape(im[row, :], (self._cols, 1), order='F'))
f.write(im_bin)
f.close()
+ # self._rows = im.shape[0]
+ # self._cols = im.shape[1]
+ # with open(file_path, 'wb') as f:
+ # pickle.dump(im, f)
+
@staticmethod
def __write_bin_hdr(out_hdr_path, bin_path, rows, cols):
diff --git a/tool/algorithm/polsarpro/createfeature.py b/tool/algorithm/polsarpro/createfeature.py
index 6640d49..e5a5c40 100644
--- a/tool/algorithm/polsarpro/createfeature.py
+++ b/tool/algorithm/polsarpro/createfeature.py
@@ -29,10 +29,10 @@ class CreateFeature:
atp = AHVToPolsarpro()
atp = AHVToPolsarpro(hh_hv_vh_vv_list)
- lee_filter_path = os.path.join(workspace_processing_path, name, 'lee_filter\\') # workspace_processing_path + name + '\\lee_filter\\'
+ lee_filter_path = os.path.join(workspace_processing_path, name.split('_')[7], 'lee_filter\\') # workspace_processing_path + name + '\\lee_filter\\'
if self._debug == False:
- t3_path = os.path.join(workspace_processing_path, name, 'psp_t3\\') # workspace_processing_path + name + '\\psp_t3\\'
+ t3_path = os.path.join(workspace_processing_path, name.split('_')[7], 'psp_t3\\') # workspace_processing_path + name + '\\psp_t3\\'
# atp.ahv_to_polsarpro_t3(t3_path, tif_path)
polarization = ['HH', 'HV', 'VH', 'VV']
@@ -42,6 +42,7 @@ class CreateFeature:
calibration = Calibration.get_Calibration_coefficient(meta_dic['Origin_META'], polarization)
tif_path = atp.calibration(calibration, workspace_preprocessing_path, name)
atp.ahv_to_polsarpro_t3_veg(t3_path, tif_path)
+ logger.info('img to T3 success!')
# Lee滤波
leeFilter = LeeRefinedFilterT3()
@@ -61,7 +62,7 @@ class CreateFeature:
outFolderDic = {}
if 'Freeman' in FeatureInput:
# freeman分解
- freemanOutDir = os.path.join(workspace_processing_path, name + '\\freeman\\')
+ freemanOutDir = os.path.join(workspace_processing_path, name.split('_')[7] + '\\freeman\\')
if self._debug == False:
freemDecom = PspFreemanDecomposition(exeDir, t3_path, freemanOutDir)
flag = freemDecom.api_freeman_decomposition_T3(0, 0, rows, cols)
@@ -69,22 +70,23 @@ class CreateFeature:
logger.error('FreemanDecomposition err')
return False, None
outFolderDic['Freeman'] = freemanOutDir
+ logger.info('Freeman successful')
# Touzi分解
if 'Touzi' in FeatureInput:
-
- touziOutDir = os.path.join(workspace_processing_path, name + '\\touzi\\')
- if not os.path.exists(touziOutDir):
- os.makedirs(touziOutDir)
- if self._debug == False:
- # touzi分解耗时较长,且对特征表达效果较差
- p = PspTouziDecomposition(hh_hv_vh_vv_dic, touziOutDir)
- p.Touzi_decomposition_multiprocessing()
- outFolderDic['Touzi'] = touziOutDir
+ pass
+ # touziOutDir = os.path.join(workspace_processing_path, name + '\\touzi\\')
+ # if not os.path.exists(touziOutDir):
+ # os.makedirs(touziOutDir)
+ # if self._debug == False:
+ # # touzi分解耗时较长,且对特征表达效果较差
+ # p = PspTouziDecomposition(hh_hv_vh_vv_dic, touziOutDir)
+ # p.Touzi_decomposition_multiprocessing()
+ # outFolderDic['Touzi'] = touziOutDir
if 'Yamaguchi' in FeatureInput:
# Yamaguchi分解
- yamaguchiOutDir = os.path.join(workspace_processing_path, name + '\\yamaguchi\\')
+ yamaguchiOutDir = os.path.join(workspace_processing_path, name.split('_')[7] + '\\yamaguchi\\')
if self._debug == False:
yamaguchiDecom = PspYamaguchiDecomposition(exeDir, t3_path, yamaguchiOutDir)
flag = yamaguchiDecom.api_yamaguchi_4components_decomposition_T3(0, 0, rows, cols)
@@ -92,10 +94,11 @@ class CreateFeature:
logger.error('CloudePottierDecomposition err')
return False, None
outFolderDic['Yamaguchi'] = yamaguchiOutDir
+ logger.info('Yamaguchi successful')
if 'Cloude' in FeatureInput:
# CloudePottier分解
- cloudeOutDir = os.path.join(workspace_processing_path, name + '\\cloude\\')
+ cloudeOutDir = os.path.join(workspace_processing_path, name.split('_')[7] + '\\cloude\\')
if self._debug == False:
cloudeDecom = PspCloudePottierDecomposition(
exeDir, t3_path, cloudeOutDir)
@@ -105,6 +108,7 @@ class CreateFeature:
logger.error('CloudePottierDecomposition err')
return False, None
outFolderDic['Cloude'] = cloudeOutDir
+ logger.info('Cloude successful')
return True, outFolderDic
def creat_h_a_alpha_features(self, t3_path, out_dir):
@@ -149,15 +153,16 @@ class CreateFeature:
hh_hv_vh_vv_dic.update({'VH': hh_hv_vh_vv_list[2]})
hh_hv_vh_vv_dic.update({'VV': hh_hv_vh_vv_list[3]})
t3_path = os.path.join(workspace_processing_path, name, "lee_filter") # workspace_processing_path + name + "\\lee_filter"
- feature_tif_dir = os.path.join(workspace_processing_path, name, 'features') # workspace_processing_path + name + "\\features"
+ feature_tif_dir = os.path.join(workspace_processing_path, name.split('_')[7], 'features') # workspace_processing_path + name + "\\features"
cfeature = CreateFeature(debug, exe_dir)
- cfeature.creat_h_a_alpha_features(t3_path, feature_tif_dir)
+ # cfeature.creat_h_a_alpha_features(t3_path, feature_tif_dir)
t3_path = cfeature.ahv_to_t3(workspace_processing_path, workspace_preprocessing_path, hh_hv_vh_vv_list, name, FILTER_SIZE)
flag, outFolderDic = cfeature.decompose(workspace_processing_path, name, t3_path, rows, cols, hh_hv_vh_vv_dic, FeatureInput) # , 'Touzi'
cfeature.cereat_features_dic(outFolderDic, feature_tif_dir)
+ logger.info("create feature dict success")
return feature_tif_dir
if __name__ == '__main__':
diff --git a/tool/algorithm/polsarpro/pspCloudePottierDecomposition.py b/tool/algorithm/polsarpro/pspCloudePottierDecomposition.py
index fb31608..f36ba97 100644
--- a/tool/algorithm/polsarpro/pspCloudePottierDecomposition.py
+++ b/tool/algorithm/polsarpro/pspCloudePottierDecomposition.py
@@ -81,43 +81,47 @@ class PspCloudePottierDecomposition:
entropy = 1
anisotropy = 1
- CombHA = 1
- CombH1mA = 1
- Comb1mHA = 1
- Comb1mH1mA = 1
+ CombHA = 0
+ CombH1mA = 0
+ Comb1mHA = 0
+ Comb1mH1mA = 0
Off_lig = rectX
Off_col = rectY
Sub_Nlig = rectWidth
Sub_Ncol = rectHeight
- para_list = [
- exePath,
- self.__inT3Dir,
- self.__outDir,
- Nwin,
- Off_lig,
- Off_col,
- Sub_Nlig,
- Sub_Ncol,
- alpbetdelgam,
- Lambda,
- alpha,
- entropy,
- anisotropy,
- CombHA,
- CombH1mA,
- Comb1mHA,
- Comb1mH1mA]
- cmd = " ".join(str(i) for i in para_list)
+ para_list = [exePath, self.__inT3Dir, self.__outDir, Nwin, Off_lig, Off_col, Sub_Nlig, Sub_Ncol, alpbetdelgam,
+ Lambda, alpha, entropy, anisotropy, CombHA, CombH1mA, Comb1mHA, Comb1mH1mA]
+ cmd = "h_a_alpha_decomposition_T3.exe -id {} -od {} -iodf T3 -nwr 1 -nwc 1 -ofr 0 -ofc 0 -fnr {} " \
+ "-fnc {} -fl1 {} -fl2 {} -fl3 {} -fl4 {} -fl5 {} -fl6 {} -fl7 {} -fl8 {} -fl9 {}".format(self.__inT3Dir,
+ self.__outDir,
+ Sub_Nlig,
+ Sub_Ncol,
+ alpbetdelgam,
+ Lambda,
+ alpha,
+ entropy,
+ anisotropy,
+ CombHA,
+ CombH1mA,
+ Comb1mHA,
+ Comb1mH1mA)
+
+ logger.info('h_a_alpha_decomposition:{}'.format(cmd))
+ result = os.system(cmd)
+ logger.info('cmd_result:{}'.format(result))
+ logger.info('h_a_alpha_decomposition finish!')
+ # cmd = " ".join(str(i) for i in para_list)
config_path = os.path.join(self.__inT3Dir, 'config.txt')
shutil.copyfile(config_path, os.path.join(self.__outDir, 'config.txt'))
- result_tuple = subprocess.getstatusoutput(cmd)
+ # result_tuple = subprocess.getstatusoutput(cmd)
- if result_tuple[0] != 1 or result_tuple[1].find('error') != -1:
- raise Exception(result_tuple[1])
+ # if result_tuple[0] != 1 or result_tuple[1].find('error') != -1:
+ # raise Exception(result_tuple[1])
self.__DecompostFlag = True
return True
+
@staticmethod
def _checkT3Matrix(T3Dir):
# 检测T3矩阵
diff --git a/tool/algorithm/xml/AlgXmlHandle.py b/tool/algorithm/xml/AlgXmlHandle.py
index 7cb3d50..92cb40a 100644
--- a/tool/algorithm/xml/AlgXmlHandle.py
+++ b/tool/algorithm/xml/AlgXmlHandle.py
@@ -717,8 +717,7 @@ class InitPara:
para_dic.update({'name': name})
file_dir = os.path.join(workspace_preprocessing_path, name + '\\')
- if self._debug == False:
- fileHandle().de_targz(tar_gz_path, file_dir)
+ fileHandle().de_targz(tar_gz_path, file_dir)
# 元文件字典
para_dic.update(InitPara.get_meta_dic_VP(InitPara.get_meta_paths(file_dir, name), name))
# tif路径字典
diff --git a/tool/file/fileHandle.py b/tool/file/fileHandle.py
index 28ce04e..f7210bb 100644
--- a/tool/file/fileHandle.py
+++ b/tool/file/fileHandle.py
@@ -11,6 +11,8 @@
import os
import tarfile
import shutil
+import zipfile
+
class fileHandle:
def __init__(self, debug_mode=False):
@@ -72,6 +74,20 @@ class fileHandle:
t = tarfile.open(tar_gz_path)
t.extractall(path=file_dir)
+ @staticmethod
+ def make_zip(output_filename, source_file):
+ """
+ 一次性打包整个根目录。空子目录会被打包。
+ 如果只打包不压缩,将"w:gz"参数改为"w:"或"w"即可。
+ :param output_filename:输出压缩包的完整路径,eg:'E:\test.tar.gz'
+ :param source_dir:需要打包的跟目录,eg: 'E:\testFfile\'打包文件夹里面的所有文件,'E:\testFfile'打包文件夹
+ """
+ dir = os.path.split(output_filename)[0]
+ if os.path.exists(dir) is False:
+ os.makedirs(dir)
+ with zipfile.ZipFile(output_filename, "w") as zipf:
+ zipf.write(source_file, os.path.basename(source_file))
+
@staticmethod
def copyfile2dir(srcfile, dir): # 复制函数
if not os.path.isfile(srcfile):
diff --git a/vegetationHeight-L-SAR/ISCEApp/isce.log b/vegetationHeight-L-SAR/ISCEApp/isce.log
index a9f3bee..ee8592f 100644
--- a/vegetationHeight-L-SAR/ISCEApp/isce.log
+++ b/vegetationHeight-L-SAR/ISCEApp/isce.log
@@ -1104,3 +1104,103 @@ scheme = BIP
dtype = CFLOAT
2024-01-30 10:09:50,349 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.935522020657171
+2024-03-01 13:45:58,710 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-01 13:45:58,713 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-01 13:45:58,715 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-01 13:45:59,958 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230328/20230328.slc
+bands = 1
+width = 12154
+length = 10380
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 13:46:11,772 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230405/20230405.slc
+bands = 1
+width = 12154
+length = 10384
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 13:46:23,317 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.935463497883003
+2024-03-01 15:27:20,344 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-01 15:27:20,346 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-01 15:27:20,348 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-01 15:27:21,214 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230328/20230328.slc
+bands = 1
+width = 12154
+length = 10380
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 15:27:29,111 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230405/20230405.slc
+bands = 1
+width = 12154
+length = 10384
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 15:27:36,738 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.9354508230096465
+2024-03-01 15:46:22,699 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-01 15:46:22,702 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-01 15:46:22,703 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-01 15:46:23,608 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230328/20230328.slc
+bands = 1
+width = 12154
+length = 10380
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 15:46:32,239 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230405/20230405.slc
+bands = 1
+width = 12154
+length = 10384
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 15:46:40,423 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.935441654837829
+2024-03-01 15:50:01,482 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-01 15:50:01,485 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-01 15:50:01,487 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-01 15:50:02,375 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230328/20230328.slc
+bands = 1
+width = 12154
+length = 10380
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 15:50:09,376 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230405/20230405.slc
+bands = 1
+width = 12154
+length = 10384
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 15:50:16,308 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.935472810515542
+2024-03-01 17:16:11,633 - isce.mroipac.baseline - INFO - Sampling time 0
+2024-03-01 17:16:11,635 - isce.mroipac.baseline - INFO - Sampling time 1
+2024-03-01 17:16:11,637 - isce.mroipac.baseline - INFO - Sampling time 2
+2024-03-01 17:16:12,499 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230328/20230328.slc
+bands = 1
+width = 12154
+length = 10380
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 17:16:19,204 - root - DEBUG - Creating readonly ISCE mmap with
+file = /cygdrive/D/micro/LWork/VegetationHeight/Temporary/preprocessed/slc/20230405/20230405.slc
+bands = 1
+width = 12154
+length = 10384
+scheme = BIP
+dtype = CFLOAT
+
+2024-03-01 17:16:25,776 - isce.zerodop.topozero - WARNING - Default Peg heading set to: -2.935472810515542
diff --git a/vegetationHeight-L-SAR/VegetationHeight.xml b/vegetationHeight-L-SAR/VegetationHeight.xml
index 380e212..8d126fe 100644
--- a/vegetationHeight-L-SAR/VegetationHeight.xml
+++ b/vegetationHeight-L-SAR/VegetationHeight.xml
@@ -39,9 +39,9 @@
主影像
经过几何校正和地形校正的SAR影像产品
File
- zip
+ tar.gz
Man
- G:\辅助数据\LTData\vegetationHeight\LT1A_MONO_KSC_STRIP4_006353_E109.3_N19.0_20230328_SLC_AHV_L1A_0000087468.tar.gz
+ F:\MicroWorkspace\LT1A\HaiNan\LT1A_MONO_KSC_STRIP4_006353_E109.3_N19.0_20230328_SLC_AHV_L1A_0000087468.tar.gz
True
False
File
@@ -54,9 +54,9 @@
辅影像
经过几何校正和地形校正的SAR影像产品
File
- zip
+ tar.gz
Man
- G:\辅助数据\LTData\vegetationHeight\LT1A_MONO_KRN_STRIP4_006593_E109.3_N19.0_20230413_SLC_AHV_L1A_0000097039.tar.gz
+ F:\MicroWorkspace\LT1A\HaiNan\LT1A_MONO_KSC_STRIP4_006472_E109.3_N19.0_20230405_SLC_AHV_L1A_0000091812.tar.gz
True
False
File
@@ -69,9 +69,9 @@
高程数据路径
高程数据数据。数据来源:30米 ASTGTM2, 数据格式:tif。备注:数据的经纬度范围必须是整数
File
- zip
+ File
Man
- G:\辅助数据\LTData\vegetationHeight\LSAR_vegetationHeight_109E15N_COP30.zip;G:\辅助数据\LTData\vegetationHeight\LSAR_vegetationHeight_109E21N_COP30.zip
+ F:\MicroWorkspace\LT1A\HaiNan\DEM
True
False
File
@@ -86,7 +86,7 @@
Value
string
Man
- 18.9;18.905;109.2;109.205
+ 18.90;19.1;109.2;109.4
True
True
UploadInput
diff --git a/vegetationPhenology-L-SAR/VegetationPhenology.xml b/vegetationPhenology-L-SAR/VegetationPhenology.xml
index 696091a..7882916 100644
--- a/vegetationPhenology-L-SAR/VegetationPhenology.xml
+++ b/vegetationPhenology-L-SAR/VegetationPhenology.xml
@@ -49,9 +49,9 @@
植被物候类型数据
植被物候类型数据
File
- zip
+ csv
Man
- G:\辅助数据\LTData\vegetationPhenology\LSAR_vegetationPhenology_roi.zip
+ F:\MicroWorkspace\LT1B\LT230919\LSAR_vegetationPhenology_roi.csv
DEFAULT
DEFAULT
DEFAULT
@@ -63,9 +63,9 @@
地表覆盖类型数据
经过地理定标(WGS84)的地表覆盖类型数据
File
- zip
+ tif
Man
- G:\辅助数据\LTData\vegetationPhenology\LSAR_vegetationPhenology_LandCover.zip
+ F:\MicroWorkspace\LT1B\LT230919\LSAR_vegetationPhenology_LandCover.tif
True
False
File
@@ -105,15 +105,14 @@
FeatureCombination
极化特征组合
- 可选极化特征组合一、共14种特征(编号依次为0-13)
+ 可选极化特征组合一、共10种特征(编号依次为0-9)
Freeman:表面散射p_s(0)、偶次散射p_d(1)、体散射p_v(2);
- Touzi:散射角α_s(3)、散射相位ϕ_α(4)、目标散射对称度τ(5)、相对能量λ_i(6);
- Yamaguchi:表面散射f_s(7)、二次散射f_d(8)、体散射f_v(9)、螺旋体散射f_h(10);
- Cloude-Pottier:分解散射熵H(11)、反熵A(12)、平均散射角α(13)
+ Yamaguchi:表面散射f_s(3)、二次散射f_d(4)、体散射f_v(5)、螺旋体散射f_h(6);
+ Cloude-Pottier:分解散射熵H(7)、反熵A(8)、平均散射角α(9)
Value
string
Man
- 0,1,2,7,8,9,10
+ 0,1,2,3,4,5,6,7,8,9
True
True
UploadInput
diff --git a/vegetationPhenology-L-SAR/VegetationPhenologyMain.py b/vegetationPhenology-L-SAR/VegetationPhenologyMain.py
index 36ecd9d..04171af 100644
--- a/vegetationPhenology-L-SAR/VegetationPhenologyMain.py
+++ b/vegetationPhenology-L-SAR/VegetationPhenologyMain.py
@@ -30,6 +30,7 @@ from tool.algorithm.xml.CreateMetaDict import CreateMetaDict, CreateProductXml
from tool.file.fileHandle import fileHandle
from tool.algorithm.algtools.ROIAlg import ROIAlg as roi
import sys
+import multiprocessing
from tool.algorithm.transforml1a.transHandle import TransImgL1A
from tool.csv.csvHandle import csvHandle
from tool.algorithm.polsarpro.createfeature import CreateFeature
@@ -49,6 +50,7 @@ tar = r'-' + cf.get('tar')
productLevel = cf.get('productLevel')
FILTER_SIZE = int(cf.get('filter_size'))
MAX_TRAN_NUM = int(cf.get('max_tran__num_per_class'))
+multiprocessing_num = int(cf.get('multiprocessing_num'))
file =fileHandle(DEBUG)
# env_str = os.path.split(os.path.realpath(__file__))[0]
env_str =os.path.dirname(os.path.abspath(sys.argv[0]))
@@ -231,10 +233,8 @@ class PhenologyMain:
if 0 <= i < 3:
featureInput.add('Freeman')
elif 3 <= i < 7:
- featureInput.add('Touzi')
- elif 7 <= i < 11:
featureInput.add('Yamaguchi')
- elif 11 <= i < 14:
+ elif 7 <= i < 10:
featureInput.add('Cloude')
else:
logger.warning("__decomposeSteps Invalid data:%s!", i)
@@ -243,24 +243,19 @@ class PhenologyMain:
def __FeatureParaInit(self):
self.__FeatureMap["Freeman"] = [0, 1, 2]
- self.__FeatureMap["Touzi"] = [3, 4, 5, 6]
- self.__FeatureMap["Yamaguchi"] = [7, 8, 9, 10]
- self.__FeatureMap["Cloude"] = [11, 12, 13]
+ self.__FeatureMap["Yamaguchi"] = [3, 4, 5, 6]
+ self.__FeatureMap["Cloude"] = [7, 8, 9]
self.___FeatureFileNameMap[0] = ['Freeman', "Freeman_Odd.bin"]
self.___FeatureFileNameMap[1] = ['Freeman', "Freeman_Dbl.bin"]
self.___FeatureFileNameMap[2] = ['Freeman', "Freeman_Vol.bin"]
- self.___FeatureFileNameMap[3] = ['Touzi', "alpha.bin"]
- self.___FeatureFileNameMap[4] = ['Touzi', "phi.bin"]
- self.___FeatureFileNameMap[5] = ['Touzi', "tau.bin"]
- self.___FeatureFileNameMap[6] = ['Touzi', "psi.bin"]
- self.___FeatureFileNameMap[7] = ['Yamaguchi', "Yamaguchi4_Odd.bin"]
- self.___FeatureFileNameMap[8] = ['Yamaguchi', "Yamaguchi4_Dbl.bin"]
- self.___FeatureFileNameMap[9] = ['Yamaguchi', "Yamaguchi4_Vol.bin"]
- self.___FeatureFileNameMap[10] = ['Yamaguchi', "Yamaguchi4_Hlx.bin"]
- self.___FeatureFileNameMap[11] = ['Cloude', "anisotropy.bin"]
- self.___FeatureFileNameMap[12] = ['Cloude', "entropy.bin"]
- self.___FeatureFileNameMap[13] = ['Cloude', "alpha.bin"]
+ self.___FeatureFileNameMap[3] = ['Yamaguchi', "Yamaguchi4_Odd.bin"]
+ self.___FeatureFileNameMap[4] = ['Yamaguchi', "Yamaguchi4_Dbl.bin"]
+ self.___FeatureFileNameMap[5] = ['Yamaguchi', "Yamaguchi4_Vol.bin"]
+ self.___FeatureFileNameMap[6] = ['Yamaguchi', "Yamaguchi4_Hlx.bin"]
+ self.___FeatureFileNameMap[7] = ['Cloude', "anisotropy.bin"]
+ self.___FeatureFileNameMap[8] = ['Cloude', "entropy.bin"]
+ self.___FeatureFileNameMap[9] = ['Cloude', "alpha.bin"]
def calInterpolation_bil_Wgs84_rc_sar_sigma(self, parameter_path, dem_rc, in_sar, out_sar):
'''
@@ -270,9 +265,10 @@ class PhenologyMain:
exe_path = r".\baseTool\x64\Release\SIMOrthoProgram-L-SAR.exe"
exe_cmd = r"set PROJ_LIB=.\baseTool\x64\Release; & {0} {1} {2} {3} {4} {5}".format(exe_path, 11, parameter_path,
dem_rc, in_sar, out_sar)
- print(exe_cmd)
- print(os.system(exe_cmd))
- print("==========================================================================")
+ # print(exe_cmd)
+ os.system(exe_cmd)
+ # print(os.system(exe_cmd))
+ # print("==========================================================================")
def create_feature_single_tar(self, name):
key_list = [key for key in self.__preprocessed_paras.keys() if((name in key) and ('inc_angle' not in key) and ('LocalIncidenceAngle' not in key))]
@@ -295,7 +291,7 @@ class PhenologyMain:
logger.info("read phenology Measure.csv success!")
# 添加四极化后向散射系数到特征图中
- feature_tif_dir = os.path.join(self.__workspace_processing_path, name, 'features')
+ feature_tif_dir = os.path.join(self.__workspace_processing_path, name.split('_')[7], 'features')
if not os.path.exists(feature_tif_dir):
os.makedirs(feature_tif_dir)
origin_xml = self.__processing_paras[name + "_Origin_META"]
@@ -325,7 +321,9 @@ class PhenologyMain:
featureInput = self.__getInputFeatures()
feature_dir = CreateFeature.decompose_single_tar(hh_hv_vh_vv_list, self.__workspace_processing_path, self.__workspace_preprocessing_path, name, self._env_str, rows, cols, FILTER_SIZE=3, debug=DEBUG, FeatureInput=featureInput)
+ logger.info("features slc to wgs84 start!")
feature_geo_dir = self.features_geo(feature_dir, paramter, sim_ori_path, name)
+ logger.info("features to wgs84 end!")
# # 获取训练集提取特征的信息
# ids = []
# class_ids = []
@@ -354,14 +352,19 @@ class PhenologyMain:
return feature_geo_dir, train_data_dic
def features_geo(self, features_path, paraMeter, sim_ori, sar_name):
- dir = os.path.join(self.__workspace_processing_path, sar_name, 'features_geo')
+ dir = os.path.join(self.__workspace_processing_path, sar_name.split('_')[7], 'features_geo')
if not os.path.exists(dir):
os.mkdir(dir)
in_tif_paths = list(glob.glob(os.path.join(features_path, '*.tif')))
+ processes_num = min([len(in_tif_paths), multiprocessing_num, multiprocessing.cpu_count() - 1])
+ pool = multiprocessing.Pool(processes=processes_num)
+ pl = []
for file in in_tif_paths:
name = os.path.basename(file).split('.')[0] + '_geo.tif'
out_path = os.path.join(dir, name)
- self.calInterpolation_bil_Wgs84_rc_sar_sigma(paraMeter, sim_ori, file, out_path)
+ pl.append(pool.apply_async(self.calInterpolation_bil_Wgs84_rc_sar_sigma, (paraMeter, sim_ori, file, out_path))) # topp
+ pool.close()
+ pool.join()
return dir
def process_handle(self, start):
@@ -403,7 +406,7 @@ class PhenologyMain:
logger.info("generate train and test set success!")
logger.info('progress bar: 30%')
- optimal_X_train, optimal_Y_train, optimal_feature = ml.sel_optimal_feature(X_train, Y_train, total_name_list, correlation_threshold=0.7)
+ optimal_X_train, optimal_Y_train, optimal_feature = ml.sel_optimal_feature(X_train, Y_train, total_name_list, 0.07, 0.85)
# RF
clf = ml.trainRF(optimal_X_train, optimal_Y_train)
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/ImageMatch.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/ImageMatch.obj
index 3671ff2..b537160 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/ImageMatch.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/ImageMatch.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/OctreeNode.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/OctreeNode.obj
index 33780f3..84daed8 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/OctreeNode.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/OctreeNode.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/RPC_Correct.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/RPC_Correct.obj
index 1417e30..ad020c6 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/RPC_Correct.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/RPC_Correct.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog
index dcf8d7f..7583acc 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog and b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrtho.7722b0a9.tlog/CL.read.1.tlog differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log
index 7790ed8..f5b2618 100644
--- a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log
+++ b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.Build.CppClean.log
@@ -1,12 +1,12 @@
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\octreenode.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\interpolation.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\basetool.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\sateorbit.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\imagematch.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\test_moudel.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simptsn.obj
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simorthoprogram.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\rpc_correct.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\test_moudel.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\interpolation.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\sateorbit.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simorthoprogram.obj
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\basetool.obj
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\vc142.pdb
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\concrt140.dll
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\msvcp140.dll
@@ -56,7 +56,7 @@ d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-s
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\spatialite.dll
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\freexl-1.dll
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\minizip.dll
-d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.11520.write.1.tlog
+d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.10508.write.1.tlog
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.command.1.tlog
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\cl.read.1.tlog
d:\estar-proj\simorthoprogram-orth_gf3-strip-master\simorthoprogram-orth_l_sar-strip\x64\release\simortho.7722b0a9.tlog\copylocal.read.1u.tlog
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe
index 80d3e9e..a2f5b3c 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe and b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.exe differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb
index 2931216..2a01045 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb and b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram-L-SAR.pdb differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log
index d9fb81b..6ad0b2a 100644
--- a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log
+++ b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.log
@@ -7,39 +7,39 @@
SateOrbit.cpp
SIMOrthoProgram.cpp
test_moudel.cpp
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SIMOrthoProgram.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SIMOrthoProgram.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 baseTool.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 baseTool.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\Half.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 SIMOrthoProgram.cpp)
-D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\BFloat16.h(1,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 baseTool.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 test_moudel.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 SIMOrthoProgram.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 RPC_Correct.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 ImageMatch.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 test_moudel.cpp)
+D:\estar-proj\Vcpkg\vcpkg\installed\x64-windows\include\Eigen\src\Core\arch\Default\GenericPacketMathFunctions.h(676,1): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 (编译源文件 simptsn.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 SateOrbit.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 simptsn.cpp)
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 SIMOrthoProgram.cpp)
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 test_moudel.cpp)
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 baseTool.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\test_moudel.cpp(224,31): warning C4129: “R”: 不可识别的字符转义序列
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 RPC_Correct.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 baseTool.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 ImageMatch.cpp)
-D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(469,15): warning C4101: “asfclass”: 未引用的局部变量
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 simptsn.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.cpp(500,18): warning C4154: 删除数组表达式;转换到提供的指针
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(469,15): warning C4101: “asfclass”: 未引用的局部变量
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.cpp(942,28): warning C4267: “初始化”: 从“size_t”转换到“int”,可能丢失数据
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.cpp(944,47): warning C4267: “初始化”: 从“size_t”转换到“int”,可能丢失数据
+D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\baseTool.h(257,11): warning C4101: “res”: 未引用的局部变量 (编译源文件 ImageMatch.cpp)
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(1239,7): warning C4101: “temp_r”: 未引用的局部变量
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(1239,15): warning C4101: “temp_c”: 未引用的局部变量
D:\estar-proj\SIMOrthoProgram-Orth_GF3-Strip-master\simorthoprogram-orth_L_sar-strip\simptsn.cpp(3170,18): warning C4101: “snr”: 未引用的局部变量
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj
index a02e0c2..957baac 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/SIMOrthoProgram.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/SateOrbit.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/SateOrbit.obj
index d3e747a..ca0b872 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/SateOrbit.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/SateOrbit.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/baseTool.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/baseTool.obj
index 80c34e9..d345e97 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/baseTool.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/baseTool.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/interpolation.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/interpolation.obj
index 0c56caa..93fe583 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/interpolation.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/interpolation.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/simptsn.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/simptsn.obj
index 5e283aa..5552966 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/simptsn.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/simptsn.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/test_moudel.obj b/vegetationPhenology-L-SAR/baseTool/x64/Release/test_moudel.obj
index 826b50f..8a64d45 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/test_moudel.obj and b/vegetationPhenology-L-SAR/baseTool/x64/Release/test_moudel.obj differ
diff --git a/vegetationPhenology-L-SAR/baseTool/x64/Release/vc142.pdb b/vegetationPhenology-L-SAR/baseTool/x64/Release/vc142.pdb
index ec1b5f0..7c418e1 100644
Binary files a/vegetationPhenology-L-SAR/baseTool/x64/Release/vc142.pdb and b/vegetationPhenology-L-SAR/baseTool/x64/Release/vc142.pdb differ
diff --git a/vegetationPhenology-L-SAR/config.ini b/vegetationPhenology-L-SAR/config.ini
index 0c8f398..c9516ec 100644
--- a/vegetationPhenology-L-SAR/config.ini
+++ b/vegetationPhenology-L-SAR/config.ini
@@ -5,6 +5,7 @@
tar = VP
productLevel = 5
+multiprocessing_num = 4
# 算法名称。修改临时工作区生成临时文件的名称,日志名称;
exe_name = VegetationPhenology
# 开启调试模式则不删除临时工作区,True:开启调试,False:不开启调试
diff --git a/vegetationPhenology-L-SAR/h_a_alpha_decomposition_T3.exe b/vegetationPhenology-L-SAR/h_a_alpha_decomposition_T3.exe
index 43b0c18..c578f0d 100644
Binary files a/vegetationPhenology-L-SAR/h_a_alpha_decomposition_T3.exe and b/vegetationPhenology-L-SAR/h_a_alpha_decomposition_T3.exe differ
diff --git a/vegetationPhenology-L-SAR/h_a_alpha_eigenvalue_set_T3.exe b/vegetationPhenology-L-SAR/h_a_alpha_eigenvalue_set_T3.exe
deleted file mode 100644
index 2c5dad5..0000000
Binary files a/vegetationPhenology-L-SAR/h_a_alpha_eigenvalue_set_T3.exe and /dev/null differ
diff --git a/vegetationPhenology-L-SAR/h_a_alpha_eigenvector_set_T3.exe b/vegetationPhenology-L-SAR/h_a_alpha_eigenvector_set_T3.exe
deleted file mode 100644
index 5ea6b37..0000000
Binary files a/vegetationPhenology-L-SAR/h_a_alpha_eigenvector_set_T3.exe and /dev/null differ
diff --git a/vegetationPhenology-L-SAR/run_log/VegetationPhenology2024-02-23-13-38-33.log b/vegetationPhenology-L-SAR/run_log/VegetationPhenology2024-02-23-13-38-33.log
deleted file mode 100644
index fc847ca..0000000
--- a/vegetationPhenology-L-SAR/run_log/VegetationPhenology2024-02-23-13-38-33.log
+++ /dev/null
@@ -1,13 +0,0 @@
-INFO:mylog:sysdir: D:\estar-proj\microproduct-l-sar\vegetationPhenology-L-SAR
-INFO:mylog:init algXML succeed
-INFO:mylog:create new workspace success!
-INFO:mylog:check_source success!
-INFO:mylog:progress bar: 10%
-INFO:root:scope0:[[130.58930555555554, 47.875416666666666], [131.11458333333331, 47.875416666666666], [130.58930555555554, 47.428472222222226], [131.11458333333331, 47.428472222222226]]
-INFO:root:scope1:[[130.58930555555554, 47.875416666666666], [131.11458333333331, 47.875416666666666], [130.58930555555554, 47.428472222222226], [131.11458333333331, 47.428472222222226]]
-INFO:root:scope2:[[130.40576233571758, 47.936153520704124], [131.8327786879565, 47.936153520704124], [130.40576233571758, 47.10644445056424], [131.8327786879565, 47.10644445056424]]
-INFO:root:scope roi :[(130.58930555555554, 47.428472222222226), (130.58930555555554, 47.875416666666666), (131.11458333333331, 47.875416666666666), (131.11458333333331, 47.428472222222226)]
-INFO:mylog:cut LT1B_MONO_MYC_STRIP4_005860_E130.9_N47.7_20230327_SLC_AHV_L1A_0000086966-ortho_sim_ori success!
-INFO:mylog:cut Covering success!
-INFO:mylog:preprocess_handle success!
-INFO:mylog:progress bar: 10%