diff --git a/json_schemas/schema_MultiSlc.json b/json_schemas/schema_MultiSlc.json
index 8138ec13041a7326e00f8e9083dbec9973d6fd5f..70ec54ed45b974bb16e9eb5a563d8ecc5bf25d7b 100644
--- a/json_schemas/schema_MultiSlc.json
+++ b/json_schemas/schema_MultiSlc.json
@@ -5,7 +5,7 @@
"type": "object",
- "allOf": [{"required": ["Global", "Pre_Processing", "Metadata_Correction", "DIn_SAR",
+ "allOf": [{"required": ["Global", "Pre_Processing", "DIn_SAR",
"Post_Processing"]}],
"properties":
@@ -38,6 +38,14 @@
"additionalProperties": false,
"properties": {"Output_Path": {"type": "string"}}
},
+ "sensor":
+ {
+ "type": "object",
+ "required": ["satellite", "mode"],
+ "additionalProperties": false,
+ "properties": {"satellite": {"type": "string"},
+ "mode": {"type": "string"}}
+ },
"parameter":
{
"type": "object",
diff --git a/json_schemas/schema_S1SM.json b/json_schemas/schema_S1SM.json
index b998bbca7378b7aaf19b991232bc8d33abd42e1f..8c7a8ac0cf25bdff53a2c009ddf5370addb01f9d 100644
--- a/json_schemas/schema_S1SM.json
+++ b/json_schemas/schema_S1SM.json
@@ -5,7 +5,7 @@
"type": "object",
- "allOf": [{"required": ["Global", "Pre_Processing", "Metadata_Correction", "DIn_SAR",
+ "allOf": [{"required": ["Global", "Pre_Processing", "DIn_SAR",
"Post_Processing"]}],
"properties":
diff --git a/python_src/SAR_MultiSlc.py b/python_src/SAR_MultiSlc.py
index ebc6501081f18ff0fbf38ccaed7bc785570d23ef..df4a26d4bf87c097e5cc238513aa7a9389ed333e 100644
--- a/python_src/SAR_MultiSlc.py
+++ b/python_src/SAR_MultiSlc.py
@@ -80,7 +80,7 @@ if __name__ == "__main__":
# ====== Get dictionaries
dict_Global = dataConfig['Global']
dict_PreProcessing = dataConfig['Pre_Processing']
- dict_Metadata_Correction = dataConfig['Metadata_Correction']
+ #dict_Metadata_Correction = dataConfig['Metadata_Correction']
dict_DInSAR = dataConfig['DIn_SAR']
dict_PostProcessing = dataConfig['Post_Processing']
@@ -127,10 +127,18 @@ if __name__ == "__main__":
light_version = dict_Global['parameter']['clean']
light_version = func_utils.str2bool(light_version)
+
+ satellite = "default"
+ mode = "default"
+
+ if 'sensor' in dict_Global:
+ satellite = dict_Global['sensor']['satellite']
+ mode = dict_Global['sensor']['mode']
+
func_utils.check_ifExist(dict_Global['in']['Input_Path'])
- if master_ext[0] == "h5" : # Cosmo case
+ if master_ext[0] == "h5" or satellite.lower() == "cosmo" : # Cosmo case
master_Image = func_utils.get_imgFromDir(dict_Global['in']['Master_Image'], dict_Global['in']['Input_Path'])
if not master_Image :
@@ -167,13 +175,6 @@ if __name__ == "__main__":
manifest = master_Image.split("measurement")[0]+"/manifest.safe"
relative_orbit = func_utils.get_relative_orbit(manifest)
- satellite = "default"
- mode = "default"
-
- if 'sensor' in dict_Global:
- satellite = dict_Global['sensor']['satellite']
- mode = dict_Global['sensor']['mode']
-
# ====== Pre_Processing
rng = 3
azi = 3
@@ -186,16 +187,17 @@ if __name__ == "__main__":
ml_gain = dict_PreProcessing['parameter']['ML_gain']
dop_file = dict_PreProcessing['out']['doppler_file']
- # ====== Metadata_Correction
- activateMetadataCorrection = dict_Metadata_Correction['parameter']['activate']
- ml_simu_range = ml_range
- ml_simu_azimut = ml_azimut
- ml_simu_gain = 1.
- ml_correlSimu_range = ml_range
- ml_correlSimu_azimut = ml_azimut
- correlSimu_gridstep_range = dict_Metadata_Correction['parameter']['GridStep_range']
- correlSimu_gridstep_azimut = dict_Metadata_Correction['parameter']['GridStep_azimut']
- fine_metadata_file = dict_Metadata_Correction['out']['fine_metadata_file']
+ # ====== Metadata_Correction (not use)
+ activateMetadataCorrection = False
+ # activateMetadataCorrection = dict_Metadata_Correction['parameter']['activate']
+ # ml_simu_range = ml_range
+ # ml_simu_azimut = ml_azimut
+ # ml_simu_gain = 1.
+ # ml_correlSimu_range = ml_range
+ # ml_correlSimu_azimut = ml_azimut
+ # correlSimu_gridstep_range = dict_Metadata_Correction['parameter']['GridStep_range']
+ # correlSimu_gridstep_azimut = dict_Metadata_Correction['parameter']['GridStep_azimut']
+ # fine_metadata_file = dict_Metadata_Correction['out']['fine_metadata_file']
# ====== DIn_SAR
roi = None
@@ -485,7 +487,7 @@ if __name__ == "__main__":
# Find eof files for each image if not cosmo
# Then, create the "fine" geom (with precise orbits)
# Eventually, assign an extended filename if EOF file correspond to the image
- if satellite != "cosmo" :
+ if satellite.lower() != "cosmo" :
if eof_Path :
list_ofEOF = func_utils.get_AllFilesWithExt(eof_Path, ".EOF")
diff --git a/python_src/diapOTB.py b/python_src/diapOTB.py
index 34f929d0b607c2762e5804c93a437403e32657b4..1c51d3efe08dbc48d1c74f5cd600803316eb8e9c 100644
--- a/python_src/diapOTB.py
+++ b/python_src/diapOTB.py
@@ -67,7 +67,7 @@ if __name__ == "__main__":
# Get dictionaries
dict_Global = dataConfig['Global']
dict_PreProcessing = dataConfig['Pre_Processing']
- dict_Metadata_Correction = dataConfig['Metadata_Correction']
+ #dict_Metadata_Correction = dataConfig['Metadata_Correction']
dict_DInSAR = dataConfig['DIn_SAR']
dict_PostProcessing = dataConfig['Post_Processing']
@@ -102,16 +102,17 @@ if __name__ == "__main__":
ml_gain = dict_PreProcessing['parameter']['ML_gain']
dop_file = dict_PreProcessing['out']['doppler_file']
- # Metadata_Correction
- activateMetadataCorrection = dict_Metadata_Correction['parameter']['activate']
- ml_simu_range = ml_range
- ml_simu_azimut = ml_azimut
- ml_simu_gain = 1.
- ml_correlSimu_range = ml_range
- ml_correlSimu_azimut = ml_azimut
- correlSimu_gridstep_range = dict_Metadata_Correction['parameter']['GridStep_range']
- correlSimu_gridstep_azimut = dict_Metadata_Correction['parameter']['GridStep_azimut']
- fine_metadata_file = dict_Metadata_Correction['out']['fine_metadata_file']
+ # Metadata_Correction (not use)
+ activateMetadataCorrection = False
+ # activateMetadataCorrection = dict_Metadata_Correction['parameter']['activate']
+ # ml_simu_range = ml_range
+ # ml_simu_azimut = ml_azimut
+ # ml_simu_gain = 1.
+ # ml_correlSimu_range = ml_range
+ # ml_correlSimu_azimut = ml_azimut
+ # correlSimu_gridstep_range = dict_Metadata_Correction['parameter']['GridStep_range']
+ # correlSimu_gridstep_azimut = dict_Metadata_Correction['parameter']['GridStep_azimut']
+ # fine_metadata_file = dict_Metadata_Correction['out']['fine_metadata_file']
# DIn_SAR
geoGrid_gridstep_range = dict_DInSAR['parameter']['GridStep_range']
@@ -216,16 +217,16 @@ if __name__ == "__main__":
# Metadata_Correction
func_utils.log(logging.INFO, " Metadata_Correction : ")
- func_utils.log(logging.INFO, "activateMetadataCorrection : {param}".format(param=activateMetadataCorrection))
- if activateMetadataCorrection :
- func_utils.log(logging.INFO, "ml_simu_range : {param}".format(param=ml_simu_range))
- func_utils.log(logging.INFO, "ml_simu_azimut : {param}".format(param=ml_simu_azimut))
- func_utils.log(logging.INFO, "ml_simu_gain : {param}".format(param=ml_simu_gain))
- func_utils.log(logging.INFO, "ml_correlSimu_range : {param}".format(param=ml_correlSimu_range))
- func_utils.log(logging.INFO, "ml_correlSimu_azimut : {param}".format(param=ml_correlSimu_azimut))
- func_utils.log(logging.INFO, "correlSimu_gridstep_range : {param}".format(param=correlSimu_gridstep_range))
- func_utils.log(logging.INFO, "correlSimu_gridstep_azimut : {param}".format(param=correlSimu_gridstep_azimut))
- func_utils.log(logging.INFO, "fine_metadata_file : {param}".format(param=fine_metadata_file))
+ # func_utils.log(logging.INFO, "activateMetadataCorrection : {param}".format(param=activateMetadataCorrection))
+ # if activateMetadataCorrection :
+ # func_utils.log(logging.INFO, "ml_simu_range : {param}".format(param=ml_simu_range))
+ # func_utils.log(logging.INFO, "ml_simu_azimut : {param}".format(param=ml_simu_azimut))
+ # func_utils.log(logging.INFO, "ml_simu_gain : {param}".format(param=ml_simu_gain))
+ # func_utils.log(logging.INFO, "ml_correlSimu_range : {param}".format(param=ml_correlSimu_range))
+ # func_utils.log(logging.INFO, "ml_correlSimu_azimut : {param}".format(param=ml_correlSimu_azimut))
+ # func_utils.log(logging.INFO, "correlSimu_gridstep_range : {param}".format(param=correlSimu_gridstep_range))
+ # func_utils.log(logging.INFO, "correlSimu_gridstep_azimut : {param}".format(param=correlSimu_gridstep_azimut))
+ # func_utils.log(logging.INFO, "fine_metadata_file : {param}".format(param=fine_metadata_file))
# DIn_SAR
func_utils.log(logging.INFO, " DIn_SAR : ")
@@ -340,7 +341,7 @@ if __name__ == "__main__":
# Find eof files for each image if not cosmo
# Then, create the "fine" geom (with precise orbits)
# Eventually, assign an extended filename if EOF file correspond to the image
- if satellite != "cosmo" :
+ if satellite.lower() != "cosmo" :
if eof_Path :
list_ofEOF = func_utils.get_AllFilesWithExt(eof_Path, ".EOF")
@@ -480,7 +481,7 @@ if __name__ == "__main__":
func_utils.log(logging.INFO, "DIn_SAR chain")
advantage = "projection"
- if satellite == "cosmo" or satellite == "CSK" :
+ if satellite.lower() == "cosmo" or satellite == "CSK" :
advantage = "correlation"
# Create param