Commit 0247aeb0fbac3d06749a682641269240fff76efb

Authored by Olivier Hagolle
1 parent cd2da8ea
Exists in master and in 1 other branch develop

Change Wdark weight, and adjust blue red coefficients, come back to cloud detect…

…ion coeffcients adapted to MAJA <3.2
GIPP_S2_MAJA_3_TM/S2A_TEST_GIP_L2COMM_L_ALLSITES_10009_20150703_21000101.EEF
... ... @@ -108,7 +108,7 @@
108 108 </Quicklook_Refl_Variation>
109 109 <Subsampling>
110 110 <!-- Threshold to consider a L2 resolution pixel as saturated -->
111   - <Saturation_Threshold>0.900</Saturation_Threshold>
  111 + <Saturation_Threshold>1.3</Saturation_Threshold>
112 112 <!-- Threshold to consider a L2 coarse resolution image as saturated -->
113 113 <Saturation_Threshold_Sub>0.900</Saturation_Threshold_Sub>
114 114 </Subsampling>
... ... @@ -183,7 +183,7 @@
183 183 <!-- Offset for reflectance threshold to detect a cirrus -->
184 184 <Cirrus_Mask_Threshold_Offset>0.007</Cirrus_Mask_Threshold_Offset>
185 185 <!-- Gain for reflectance threshold to detect a cirrus -->
186   - <Cirrus_Mask_Threshold_Gain>0.000012</Cirrus_Mask_Threshold_Gain>
  186 + <Cirrus_Mask_Threshold_Gain>0.000015</Cirrus_Mask_Threshold_Gain>
187 187 </Cirrus_Mask>
188 188 <Snow_Masking>
189 189 <!-- Structuring element for dilatation of the snow mask -->
... ... @@ -324,7 +324,7 @@
324 324 <NDVI_Threshold>0.3</NDVI_Threshold>
325 325 <Red_TOA_Threshold>0.2</Red_TOA_Threshold>
326 326 <!-- Slope of the MS linear relationship between the red and the blue reflectance. -->
327   - <MS_Slope>0.45</MS_Slope>
  327 + <MS_Slope>0.5</MS_Slope>
328 328 <!-- Y intercept of the MS linear relationship between the red and the blue reflectance. -->
329 329 <MS_YIntercept>0.00</MS_YIntercept>
330 330 <!-- Slope for the multi spectral weight that depends on NDVI -->
... ... @@ -399,7 +399,7 @@
399 399 <!-- Neighborhood size : Half_Window_Size parameter in spec -->
400 400 <Half_Window_Size>3</Half_Window_Size>
401 401 <!-- Weight for the AOT maximal value equation -->
402   - <W_dark>10</W_dark>
  402 + <W_dark>0.5</W_dark>
403 403 <!-- Weight for the equations to control the AOT to stay between the bounds of the LUT -->
404 404 <W_bounds>1000000000</W_bounds>
405 405 <!-- Minimum value for the AOT. AOT_min must be greater that the first index of the list of AOT -->
... ...
GIPP_S2_MAJA_3_TM/S2B_TEST_GIP_L2COMM_L_ALLSITES_10009_20150703_21000101.EEF
... ... @@ -108,7 +108,7 @@
108 108 </Quicklook_Refl_Variation>
109 109 <Subsampling>
110 110 <!-- Threshold to consider a L2 resolution pixel as saturated -->
111   - <Saturation_Threshold>0.900</Saturation_Threshold>
  111 + <Saturation_Threshold>1.3</Saturation_Threshold>
112 112 <!-- Threshold to consider a L2 coarse resolution image as saturated -->
113 113 <Saturation_Threshold_Sub>0.900</Saturation_Threshold_Sub>
114 114 </Subsampling>
... ... @@ -183,7 +183,7 @@
183 183 <!-- Offset for reflectance threshold to detect a cirrus -->
184 184 <Cirrus_Mask_Threshold_Offset>0.007</Cirrus_Mask_Threshold_Offset>
185 185 <!-- Gain for reflectance threshold to detect a cirrus -->
186   - <Cirrus_Mask_Threshold_Gain>0.000012</Cirrus_Mask_Threshold_Gain>
  186 + <Cirrus_Mask_Threshold_Gain>0.000015</Cirrus_Mask_Threshold_Gain>
187 187 </Cirrus_Mask>
188 188 <Snow_Masking>
189 189 <!-- Structuring element for dilatation of the snow mask -->
... ... @@ -324,7 +324,7 @@
324 324 <NDVI_Threshold>0.3</NDVI_Threshold>
325 325 <Red_TOA_Threshold>0.2</Red_TOA_Threshold>
326 326 <!-- Slope of the MS linear relationship between the red and the blue reflectance. -->
327   - <MS_Slope>0.45</MS_Slope>
  327 + <MS_Slope>0.5</MS_Slope>
328 328 <!-- Y intercept of the MS linear relationship between the red and the blue reflectance. -->
329 329 <MS_YIntercept>0.00</MS_YIntercept>
330 330 <!-- Slope for the multi spectral weight that depends on NDVI -->
... ... @@ -399,7 +399,7 @@
399 399 <!-- Neighborhood size : Half_Window_Size parameter in spec -->
400 400 <Half_Window_Size>3</Half_Window_Size>
401 401 <!-- Weight for the AOT maximal value equation -->
402   - <W_dark>10</W_dark>
  402 + <W_dark>0.5</W_dark>
403 403 <!-- Weight for the equations to control the AOT to stay between the bounds of the LUT -->
404 404 <W_bounds>1000000000</W_bounds>
405 405 <!-- Minimum value for the AOT. AOT_min must be greater that the first index of the list of AOT -->
... ...