Revert "Merge branch 'int_stage_roman' into 'develop'"

This reverts merge request !71 (merged)

app/let_it_snow_fsc.py

@@ -31,7 +31,7 @@ from s2snow.parser import create_fsc_argument_parser
 from s2snow.snow_detector import detect_snow
 
 
-def main(config_file, input_dir, output_dir, dem, tcd, water_mask, h2_chain_version=None, product_counter=None, relief_shadow_mask=None):
+def main(config_file, input_dir, output_dir, dem, tcd, water_mask, h2_chain_version=None, product_counter=None):
     # Check configuration file
     if not os.path.exists(config_file):
         logging.error("Configuration file does not exist.")
@@ -42,7 +42,7 @@ def main(config_file, input_dir, output_dir, dem, tcd, water_mask, h2_chain_vers
         data = json.load(json_data_file)
         logging.info("Reading configuration = " + config_file)
         try:
-            config = FscConfig(data, input_dir, dem, tcd, water_mask, relief_shadow_mask)
+            config = FscConfig(data, input_dir, dem, tcd, water_mask)
         except LisConfigurationException:
             return CONFIGURATION_ERROR
         except UnknownProductException:
@@ -82,8 +82,6 @@ if __name__ == "__main__":
             config_file = global_config.get("config_file", None)
             h2_chain_version = global_config.get("chain_version", None)
             product_counter = global_config.get("product_counter", "1")
-            relief_shadow_mask = global_config.get("relief_shadow_mask", None)
-
     else:
         input_dir = None
         output_dir = None
@@ -94,7 +92,6 @@ if __name__ == "__main__":
         h2_chain_version = None
         product_counter = None
         log_level = None
-        relief_shadow_mask = None
 
     if args.output_dir is not None:
         output_dir = args.output_dir
@@ -104,6 +101,7 @@ if __name__ == "__main__":
 
     if not os.path.exists(output_dir):
         os.makedirs(output_dir)
+
     # Create tmp dir
     os.makedirs(output_dir + "/" + TMP_DIR, exist_ok=True)
     tmp_dir = os.path.join(output_dir, TMP_DIR)
@@ -159,4 +157,4 @@ if __name__ == "__main__":
         logging.info("product counter: %s", args.product_counter)
         product_counter = args.product_counter
 
-    main(config_file, input_dir, output_dir, dem, tcd, water_mask, h2_chain_version, product_counter, relief_shadow_mask)
+    main(config_file, input_dir, output_dir, dem, tcd, water_mask, h2_chain_version, product_counter)