From c9a7b1ad6b25f9fe1fd0d4a81ac0baf4c29852cc Mon Sep 17 00:00:00 2001
From: tian jiax <446100073@qq.com>
Date: Thu, 1 Feb 2024 14:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8B=86=E5=88=86=E5=90=8E?=
 =?UTF-8?q?=E7=9B=90=E7=A2=B1=E5=BA=A6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 soilSalinity/SoilSalinity.xml               | 18 +++++++++---------
 soilSalinity/pspHAAlphaDecomposition.py     |  6 +++---
 vegetationPhenology/VegetationPhenology.xml | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/soilSalinity/SoilSalinity.xml b/soilSalinity/SoilSalinity.xml
index f2bcfcdb..5a68d015 100644
--- a/soilSalinity/SoilSalinity.xml
+++ b/soilSalinity/SoilSalinity.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <Root>
   <TaskID>CSAR_202107275419_0001-0</TaskID>
-  <WorkSpace>E:\Result_GF3\</WorkSpace>
+  <WorkSpace>D:\soilSanlinity\</WorkSpace>
   <AlgCompt>
     <DataTransModel>File</DataTransModel>
     <Artificial>ElementAlg</Artificial>
@@ -38,7 +38,7 @@
         <ParaType>File</ParaType>
         <DataType>tar.gz</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\GF3Data\SoilSalinity\GF3B_SYC_QPSI_008316_E116.2_N43.7_20230622_L1A_AHV_L10000202891-ortho.tar.gz</ParaValue>
+		<ParaValue>F:\2023xibei\GF3C_KSC_QPSI_008440_E86.0_N44.7_20231113_L1A_AHV_L10000215825-ortho.tar.gz</ParaValue>
         <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>
@@ -64,9 +64,9 @@
         <ParaChsName>实测数据</ParaChsName>
         <Description>土壤盐碱度实测数据</Description>
         <ParaType>File</ParaType>
-        <DataType>zip</DataType>
+        <DataType>csv</DataType>
 		<ParaSource>Man</ParaSource>
-        <ParaValue>E:\GF3Data\SoilSalinity\CSAR_soils_soilSality.zip</ParaValue>
+        <ParaValue>F:\2023xibei\soilSality.csv</ParaValue>
         <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>
@@ -78,9 +78,9 @@
         <ParaChsName>地表覆盖类型数据</ParaChsName>
         <Description>经过地理定标（WGS84）的地表覆盖类型数据</Description>
         <ParaType>File</ParaType>
-        <DataType>zip</DataType>
+        <DataType>tif</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\GF3Data\SoilSalinity\CSAR_soils_50T_20220101-20230101.zip</ParaValue>
+		<ParaValue>E:\C-SARNDVINDWIfugaileixingDEM\fugaileixing.tif</ParaValue>
         <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>
@@ -106,9 +106,9 @@
         <ParaChsName>NDVI数据</ParaChsName>
         <Description>经过地理定标（WGS84）的NDVI数据</Description>
         <ParaType>File</ParaType>
-        <DataType>zip</DataType>
+        <DataType>tif</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\GF3Data\SoilSalinity\CSAR_soils_S2_202306_NDVI.zip</ParaValue>
+		<ParaValue>E:\C-SARNDVINDWIfugaileixingDEM\S2_NDVImed2.tif</ParaValue>
         <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>
@@ -138,7 +138,7 @@
         <ParaType>File</ParaType>
         <DataType>tar.gz</DataType>
 		<ParaSource>Man</ParaSource>
-        <ParaValue>E:\Result_GF3\SoilSalinity\Output\GF3B_SYC_QPSI_008316_E116.2_N43.7_20230622_L1A_AHV_L10000202891-ortho-SSAA.tar.gz</ParaValue>
+        <ParaValue>D:\soilSanlinity\SoilSalinity\Output\GF3C_KSC_QPSI_008440_E86.0_N44.7_20231113_L1A_AHV_L10000215825-ortho-SSAA.tar.gz</ParaValue>
         <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>
diff --git a/soilSalinity/pspHAAlphaDecomposition.py b/soilSalinity/pspHAAlphaDecomposition.py
index facf7638..135695df 100644
--- a/soilSalinity/pspHAAlphaDecomposition.py
+++ b/soilSalinity/pspHAAlphaDecomposition.py
@@ -245,7 +245,7 @@ class PspHAAlphaDecomposition:
                      str(alpbetdelgam), str(Lambda), str(alpha), str(entropy), str(anisotropy),
                      str(CombHA), str(CombH1mA), str(Comb1mHA), str(Comb1mH1mA)]
         cmd = ' '.join(para_list)
-
+        logger.info(cmd)
         result_tuple = subprocess.getstatusoutput(cmd)
         if result_tuple[0] != 1 or result_tuple[1].find('error') != -1 or result_tuple[1].find('Could not open') != -1:
             raise Exception(result_tuple[1])
@@ -292,7 +292,7 @@ class PspHAAlphaDecomposition:
                      str(polarisation_fraction), str(erd), str(rvi), str(pedestal),
                      str(shannon), str(lueneburg)]
         cmd = ' '.join(para_list)
-
+        logger.info(cmd)
         result_tuple = subprocess.getstatusoutput(cmd)
         if result_tuple[0] != 1 or result_tuple[1].find('error') != -1 or result_tuple[1].find('Could not open') != -1:
             raise Exception(result_tuple[1])
@@ -330,7 +330,7 @@ class PspHAAlphaDecomposition:
                      str(NwinFilter), str(offsetRow), str(offsetCol), str(numRow), str(numCol),
                      str(alpha123), str(beta123), str(delta123), str(gamma123), str(alpbetdelgam)]
         cmd = ' '.join(para_list)
-
+        logger.info(cmd)
         result_tuple = subprocess.getstatusoutput(cmd)
         if result_tuple[0] != 1 or result_tuple[1].find('error') != -1 or result_tuple[1].find('Could not open') != -1:
             raise Exception(result_tuple[1])
diff --git a/vegetationPhenology/VegetationPhenology.xml b/vegetationPhenology/VegetationPhenology.xml
index f3860c82..8769e9b2 100644
--- a/vegetationPhenology/VegetationPhenology.xml
+++ b/vegetationPhenology/VegetationPhenology.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <Root>
   <TaskID>CSAR_202107275419_0001-0</TaskID>
-  <WorkSpace>E:\Result_GF3\</WorkSpace>
+  <WorkSpace>D:\micro\WorkSpace\</WorkSpace>
   <AlgCompt>
     <DataTransModel>File</DataTransModel>
     <Artificial>ElementAlg</Artificial>
@@ -37,7 +37,7 @@
         <ParaType>File</ParaType>
         <DataType>tar.gz</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\Result_GF3\Ortho\Output\GF3C_MYC_QPSI_006270_E100.4_N27.0_20230615_L1A_AHV_L10000158764-ortho.tar.gz</ParaValue>
+		<ParaValue>F:\VegetationPhenology-likun\lijiang\GF3B_KSC_QPSI_007906_E100.2_N27.0_20230525_L1A_AHV_L10000190531-ortho.tar.gz</ParaValue>
         <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>
@@ -49,9 +49,9 @@
         <ParaChsName>植被物候类型数据</ParaChsName>
         <Description>植被物候类型数据</Description>
         <ParaType>File</ParaType>
-        <DataType>zip</DataType>
+        <DataType>csv</DataType>
 		<ParaSource>Man</ParaSource>
-        <ParaValue>E:\GF3Data\vegetationPhenology\CSAR_vegetation_VegetationPhe_samples.zip</ParaValue>
+        <ParaValue>F:\VegetationPhenology-likun\lijiang\VegetationPhe_samples.csv</ParaValue>
          <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>
@@ -63,9 +63,9 @@
         <ParaChsName>地表覆盖类型数据</ParaChsName>
         <Description>经过地理定标（WGS84）的地表覆盖类型数据</Description>
         <ParaType>File</ParaType>
-        <DataType>zip</DataType>
+        <DataType>tif</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>E:\GF3Data\vegetationPhenology\CSAR_vegetation_n47_25_2020lc030.zip</ParaValue>
+		<ParaValue>F:\VegetationPhenology-likun\lijiang\landcover.tif</ParaValue>
         <EnModification>True</EnModification>
         <EnMultipleChoice>False</EnMultipleChoice>
         <Control>File</Control>
@@ -113,7 +113,7 @@
         <ParaType>Value</ParaType>
         <DataType>string</DataType>
 		<ParaSource>Man</ParaSource>
-		<ParaValue>0,1,2,7,8,9,10,11,12,13</ParaValue>
+		<ParaValue>0,1,2,7,8,9,10</ParaValue>
         <EnModification>True</EnModification>
         <EnMultipleChoice>True</EnMultipleChoice>
         <Control>UploadInput</Control>
@@ -130,7 +130,7 @@
         <ParaType>File</ParaType>
         <DataType>tar.gz</DataType>
 		<ParaSource>Man</ParaSource>
-        <ParaValue>E:\Result_GF3\VegetationPhenology\Output\GF3C_MYC_QPSI_006270_E100.4_N27.0_20230615_L1A_AHV_L10000158764-ortho-VP.tar.gz</ParaValue>
+        <ParaValue>D:\micro\WorkSpace\VegetationPhenology\Output\GF3B_KSC_QPSI_007906_E100.2_N27.0_20230525_L1A_AHV_L10000190531-ortho-VP.tar.gz</ParaValue>
         <MaxValue>DEFAULT</MaxValue>
         <MinValue>DEFAULT</MinValue>
         <OptionValue>DEFAULT</OptionValue>