From 2a0b4ebfe08d3efef078398963907b4489792bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABlle=20USSEGLIO?= <gaelle.usseglio@cnes.fr>
Date: Fri, 12 Jun 2020 12:43:29 +0000
Subject: [PATCH] ENH : Some cleaning and schema corrections
---
include/otbSARGroupedByMLImageFilter.txx | 8 --------
json_schemas/schema_S1IW.json | 2 +-
json_schemas/schema_S1SM.json | 8 ++++----
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/include/otbSARGroupedByMLImageFilter.txx b/include/otbSARGroupedByMLImageFilter.txx
index a5619ef..1ae8cd3 100644
--- a/include/otbSARGroupedByMLImageFilter.txx
+++ b/include/otbSARGroupedByMLImageFilter.txx
@@ -110,12 +110,6 @@ namespace otb
m_SelectedBands["isdata"] = true;
}
- std::cout << "m_nbBands = " << m_nbBands << std::endl;
-
- std::cout << "amp = " << m_SelectedBands["amp"] << std::endl;
- std::cout << "pha = " << m_SelectedBands["pha"] << std::endl;
- std::cout << "coh = " << m_SelectedBands["coh"] << std::endl;
- std::cout << "isdata = " << m_SelectedBands["isdata"] << std::endl;
}
/**
@@ -171,8 +165,6 @@ namespace otb
outputPtr->SetOrigin(outOrigin);
outputPtr->SetSpacing(outSP);
- std::cout << "outputLargestPossibleRegion : " << outputLargestPossibleRegion << std::endl;
-
// Add ML factors and bands meaning into keyWordList
ImageKeywordlist outputKWL = masterKWL;
outputKWL.AddKey("support_data.band.Amplitude", std::to_string(0));
diff --git a/json_schemas/schema_S1IW.json b/json_schemas/schema_S1IW.json
index 11d8aaa..137e846 100644
--- a/json_schemas/schema_S1IW.json
+++ b/json_schemas/schema_S1IW.json
@@ -5,7 +5,7 @@
"type": "object",
- "allOf": [{"required": ["Global", "Pre_Processing", "Ground", "DIn_SAR"]}],
+ "allOf": [{"required": ["Global", "Pre_Processing", "Ground", "DIn_SAR", "Post_Processing"]}],
"properties":
{
diff --git a/json_schemas/schema_S1SM.json b/json_schemas/schema_S1SM.json
index 7d918aa..c18077f 100644
--- a/json_schemas/schema_S1SM.json
+++ b/json_schemas/schema_S1SM.json
@@ -5,7 +5,8 @@
"type": "object",
- "allOf": [{"required": ["Global", "Pre_Processing", "Metadata_Correction", "DIn_SAR"]}],
+ "allOf": [{"required": ["Global", "Pre_Processing", "Metadata_Correction", "DIn_SAR",
+ "Post_Processing"]}],
"properties":
{
@@ -106,7 +107,7 @@
{
"type": "object",
"required": ["GridStep_range", "GridStep_azimut", "Grid_Threshold", "Grid_Gap",
- "Interferogram_gain", "Interferogram_ortho"],
+ "Interferogram_gain"],
"additionalProperties": false,
"properties": {"GridStep_range": {"type": "number"},
"GridStep_azimut": {"type": "number"},
@@ -114,8 +115,7 @@
"Grid_Gap": {"type": "number"},
"Interferogram_gain": {"type": "number"},
"Interferogram_mlran": {"type": "number"},
- "Interferogram_mlazi": {"type": "number"},
- "Interferogram_ortho": {"type": "boolean"}
+ "Interferogram_mlazi": {"type": "number"}
}
}
},
--
GitLab