Removed deprecated config options 'enable_ice_retrieval' and 'enable_cloud_screening'.

Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

enpt/cli.py

@@ -115,11 +115,7 @@ def get_enpt_argparser():
         help="3 modes to determine which atmospheric correction is applied at which surfaces (default: land): "
              "('land', water', 'combined')")
     add('--auto_download_ecmwf', type=_str2bool, default=True, nargs='?', const=True,
-        help='Automatically download ECMWF data for atmospheric correction')
-    add('--enable_ice_retrieval', type=_str2bool, default=True, nargs='?', const=True,
-        help='Enable ice retrieval (default); increases accuracy of water vapour retrieval')
-    add('--enable_cloud_screening', type=_str2bool, default=False, nargs='?', const=True,
-        help='Enable cloud screening during atmospheric correction')
+        help='Automatically download ECMWF AUX data when running Polymer atmospheric correction for water surfaces')
     add('--scale_factor_boa_ref', type=int, default=10000,
         help='Scale factor to be applied to BOA reflectance result')
     add('--threads', type=int, default=-1,

enpt/options/config.py

@@ -93,8 +93,6 @@ config_for_testing_water = dict(
     deadpix_P_algorithm='spectral',
     deadpix_P_interp_spatial='linear',
     deadpix_P_interp_spectral='linear',
-    enable_cloud_screening=False,
-    enable_ice_retrieval=True,
     enable_keystone_correction=False,
     enable_vnir_swir_coreg=False,
     n_lines_to_append=None,
@@ -186,7 +184,6 @@ config_for_testing_dlr = dict(
     path_reference_image=os.path.join(path_enptlib, '..', 'tests', 'data', 'T30TXQ_20170218T110111_B05__sub.tif'),
     enable_ac=True,
     mode_ac='land',
-    enable_ice_retrieval=False,
     CPUs=32,
     ortho_resampAlg='gauss',
     vswir_overlap_algorithm='swir_only'
@@ -286,13 +283,7 @@ class EnPTConfig(object):
                           NOTE that this may result in edge effects, e.g., at coastlines
 
         :key auto_download_ecmwf:
-            Automatically download ECMWF data for atmospheric correction
-
-        :key enable_ice_retrieval:
-            Enable ice retrieval (default); increases accuracy of water vapour retrieval
-
-        :key enable_cloud_screening:
-            Enable cloud screening during atmospheric correction
+            Automatically download ECMWF AUX data when running Polymer atmospheric correction for water surfaces
 
         :key scale_factor_boa_ref:
             Scale factor to be applied to BOA reflectance result
@@ -403,8 +394,6 @@ class EnPTConfig(object):
         self.enable_ac = gp('enable_ac')
         self.mode_ac = gp('mode_ac')
         self.auto_download_ecmwf = gp('auto_download_ecmwf')
-        self.enable_ice_retrieval = gp('enable_ice_retrieval')
-        self.enable_cloud_screening = gp('enable_cloud_screening')
         self.scale_factor_boa_ref = gp('scale_factor_boa_ref')
         self.threads = gp('threads')
         self.blocksize = gp('blocksize')

enpt/options/options_default.json

@@ -61,9 +61,7 @@
                                            (land surfaces are not included in the L2A product)
                                   'combined': SICOR is applied to land and POLYMER is applied to water surfaces;
                                               NOTE that this may result in edge effects, e.g., at coastlines*/
-            "auto_download_ecmwf": false,  /*FIXME this might be not needed anymore in future*/
-            "enable_ice_retrieval":  true,  /*enable ice retrieval (default); increases accuracy of water vapour retrieval*/
-            "enable_cloud_screening": false,  /*FIXME this is currently not implemented*/
+            "auto_download_ecmwf": false,  /*automatically download ECMWF AUX data when running Polymer AC for water surfaces*/
             "scale_factor_boa_ref": 10000,  /*scale factor to be applied to BOA reflectance result*/
             "threads": -1, /*number of threads for multiprocessing:
                                     'threads = 0': for single thread

enpt/options/options_schema.py

@@ -86,8 +86,6 @@ enpt_schema_input = dict(
                     enable_ac=dict(type='boolean', required=False),
                     mode_ac=dict(type='string', required=False, allowed=['land', 'water', 'combined']),
                     auto_download_ecmwf=dict(type='boolean', required=False),
-                    enable_ice_retrieval=dict(type='boolean', required=False),
-                    enable_cloud_screening=dict(type='boolean', required=False),
                     scale_factor_boa_ref=dict(type='integer', required=False, min=1),
                     threads=dict(type='integer', required=False),
                     blocksize=dict(type='integer', required=False),
@@ -162,8 +160,6 @@ parameter_mapping = dict(
     enable_ac=('processors', 'atmospheric_correction', 'enable_ac'),
     mode_ac=('processors', 'atmospheric_correction', 'mode_ac'),
     auto_download_ecmwf=('processors', 'atmospheric_correction', 'auto_download_ecmwf'),
-    enable_ice_retrieval=('processors', 'atmospheric_correction', 'enable_ice_retrieval'),
-    enable_cloud_screening=('processors', 'atmospheric_correction', 'enable_cloud_screening'),
     scale_factor_boa_ref=('processors', 'atmospheric_correction', 'scale_factor_boa_ref'),
     threads=('processors', 'atmospheric_correction', 'threads'),
     blocksize=('processors', 'atmospheric_correction', 'blocksize'),