Merge pull request #56 from DeDop/default-cnf-correction

Default cnf correction
DeDop · Sep 4, 2018 · b060ea0 · b060ea0
2 parents 12eec1c + 7210604
commit b060ea0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/dedop/ui/data/config/CNF.json b/dedop/ui/data/config/CNF.json
@@ -142,5 +142,10 @@
     "value": 240,
     "units": null,
     "description": "Number of looks in 1 stack"
+  },
+  "output_format_flag_cnf": {
+    "value": "extended",
+    "units": "flag",
+    "description": "Flag that specifies output format: the DeDop extended format ('extended') or default Sentinel-3 format ('sentinel-3')"
   }
-}
+}
diff --git a/dedop/ui/data/cryosat_config/CNF.json b/dedop/ui/data/cryosat_config/CNF.json
@@ -142,5 +142,10 @@
     "value": 240,
     "units": null,
     "description": "Number of looks in 1 stack"
+  },
+  "output_format_flag_cnf": {
+    "value": "extended",
+    "units": "flag",
+    "description": "Flag that specifies output format: the DeDop extended format ('extended') or default Sentinel-3 format ('sentinel-3')"
   }
-}
+}
diff --git a/tests/webapi/test_websocket.py b/tests/webapi/test_websocket.py
@@ -87,7 +87,7 @@ def test_config_management(self):
         self.assertEqual(sentinel_configs['chd']['brf_sar_chd']['value'], 78.53069)
         self.assertIn('cnf', sentinel_configs)
         self.assertIsInstance(sentinel_configs['cnf'], dict)
-        self.assertEqual(len(sentinel_configs['cnf']), 23)
+        self.assertEqual(len(sentinel_configs['cnf']), 24)
         self.assertEqual(sentinel_configs['cnf']['flag_cal2_correction_cnf']['value'], True)
         self.assertEqual(sentinel_configs['cnf']['N_looks_stack_cnf']['value'], 240)
         self.assertIn('cst', sentinel_configs)
@@ -115,7 +115,7 @@ def test_config_management(self):
         self.assertEqual(cryosat_configs['chd']['brf_sar_chd']['value'], 85.51521850207267)
         self.assertIn('cnf', cryosat_configs)
         self.assertIsInstance(cryosat_configs['cnf'], dict)
-        self.assertEqual(len(cryosat_configs['cnf']), 23)
+        self.assertEqual(len(cryosat_configs['cnf']), 24)
         self.assertEqual(cryosat_configs['cnf']['flag_cal2_correction_cnf']['value'], True)
         self.assertEqual(cryosat_configs['cnf']['N_looks_stack_cnf']['value'], 240)
         self.assertIn('cst', cryosat_configs)