diff --git a/.gitignore b/.gitignore index efd4ada1..e8d6e643 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /deformation-C-SAR/tool/ /dem-C-SAR/tool/ /soilMoistureTop/tool/ +/backScattering/dist/ diff --git a/Ortho/Ortho.xml b/Ortho/Ortho.xml index 0c0d9ae0..b74b5504 100644 --- a/Ortho/Ortho.xml +++ b/Ortho/Ortho.xml @@ -45,7 +45,7 @@ File tar.gz Cal - E:\202306hb\sar_img\GF3_KSC_QPSI_036065_E116.2_N43.5_20230616_L1A_AHV_L10006792279.tar.gz + E:\202306hb\sar_img\GF3B_SYC_QPSI_008316_E116.1_N43.3_20230622_L1A_AHV_L10000202892.tar.gz True False File @@ -92,7 +92,7 @@ File tar.gz Cal - D:\micro\WorkSpace\Ortho\Output\GF3_KSC_QPSI_036065_E116.2_N43.5_20230616_L1A_AHV_L10006792279-ortho.tar.gz + D:\micro\WorkSpace\Ortho\Output\GF3B_SYC_QPSI_008316_E116.1_N43.3_20230622_L1A_AHV_L10000202892-ortho.tar.gz DEFAULT DEFAULT DEFAULT diff --git a/backScattering/dist/BackScatteringMain.exe b/backScattering/dist/BackScatteringMain.exe index af2aa877..a81b3fc5 100644 Binary files a/backScattering/dist/BackScatteringMain.exe and b/backScattering/dist/BackScatteringMain.exe differ diff --git a/tool/algorithm/algtools/ROIAlg.py b/tool/algorithm/algtools/ROIAlg.py index 9ee6f706..186fb968 100644 --- a/tool/algorithm/algtools/ROIAlg.py +++ b/tool/algorithm/algtools/ROIAlg.py @@ -224,7 +224,7 @@ class ROIAlg: for i in range(0, im_bands): tif_array[i, :, :][np.isnan(mask_array)] = background_value tif_array[i, :, :][mask_array == 0] = background_value - image_handler.write_img(out_tif_path, proj, geotrans, tif_array, '-9999') + image_handler.write_img(out_tif_path, proj, geotrans, tif_array, background_value) logger.info("cal_roi success, path: %s", out_tif_path) return True diff --git a/vegetationPhenology/VegetationPhenology.xml b/vegetationPhenology/VegetationPhenology.xml index 4cd6c2ad..b87c7cf0 100644 --- a/vegetationPhenology/VegetationPhenology.xml +++ b/vegetationPhenology/VegetationPhenology.xml @@ -37,7 +37,7 @@ File tar.gz Man - G:\VegetationPhenology-likun\rusuoces\GF3C_MYC_QPSI_006270_E100.4_N27.0_20230615_L1A_AHV_L10000158764-ortho.tar.gz + E:\VegetationPhenology-likun\rusuoces\GF3C_MYC_QPSI_006270_E100.4_N27.0_20230615_L1A_AHV_L10000158764-ortho.tar.gz DEFAULT DEFAULT DEFAULT @@ -51,7 +51,7 @@ File csv Man - G:\VegetationPhenology-likun\rusuoces\VegetationPhe_samples.csv + E:\VegetationPhenology-likun\rusuoces\VegetationPhe_samples.csv DEFAULT DEFAULT DEFAULT @@ -65,7 +65,7 @@ File tif Man - G:\VegetationPhenology-likun\rusuoces\landcover.tif + E:\VegetationPhenology-likun\rusuoces\N47_25_2020LC030\n47_25_2020lc030.tif True False File @@ -80,7 +80,7 @@ Value string Man - empty + 10 True False UploadInput @@ -113,7 +113,7 @@ Value string Man - 0,1,2,7,8,9,10 + 0,1,2,7,8,9,10,11,12,13 True True UploadInput diff --git a/vegetationPhenology/VegetationPhenologyMain.py b/vegetationPhenology/VegetationPhenologyMain.py index 76513d0d..8dea872e 100644 --- a/vegetationPhenology/VegetationPhenologyMain.py +++ b/vegetationPhenology/VegetationPhenologyMain.py @@ -381,7 +381,7 @@ class PhenologyMain: feature_dir, train_data_dic = self.create_feature_single_tar(name) # 生成训练集 - X_train_part, Y_train_part, optimal_feature = ml.gene_optimal_train_set(train_data_dic, feature_dir, 0.07, 0.85) + X_train_part, Y_train_part, optimal_feature = ml.gene_optimal_train_set(train_data_dic, feature_dir, 0.08, 0.85) name_list = ml.get_name_list(feature_dir) if len(optimal_feature) <= 0: logger.error('特征筛选结果为空,无可用特征作为训练集') @@ -527,7 +527,6 @@ class PhenologyMain: # product_geo_path = self.__product_dic + img_name + '_VegetationPhenologyProduct.tif' # int_16_array = np.array(array, dtype=np.int16) - rows, cols = self.get_name_rows_cols(img_name) array = np.zeros((rows, cols), dtype='float16') array[row_list, col_list] = Y_test