From b2992f4350f5785b324b2d99bc8fe8f594695950 Mon Sep 17 00:00:00 2001
From: SPeillet <peillet.seb@protonmail.com>
Date: Thu, 13 Jun 2019 12:32:41 +0200
Subject: [PATCH] ENH:B05 management in computeFeatures
---
computeFeatures.py | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/computeFeatures.py b/computeFeatures.py
index 86ac9e6..e9c1231 100644
--- a/computeFeatures.py
+++ b/computeFeatures.py
@@ -390,15 +390,25 @@ def VenusTHEIA_getExpressions(feat, cfg):
warnings.warn("No NDWI produced on Venus, invalid or non present B04 or B11.")
if 'BRI' in feat:
- if cfg['b01'].isdigit() and cfg['b02'].isdigit() and cfg['b03'].isdigit() and cfg['b04'].isdigit() and cfg['b05'].isdigit() and cfg['b06'].isdigit() and cfg['b07'].isdigit() and cfg['b08'].isdigit() and cfg['b09'].isdigit() and cfg['b10'].isdigit() and cfg['b11'].isdigit() and cfg['b12'].isdigit():
- expr[feat.index('BRI')] = 'sqrt( im1b' + cfg['b01'] + ' * im1b' + cfg['b01'] + ' + im1b' + cfg['b02'] + ' * im1b' + cfg[
- 'b02'] + ' + im1b' + cfg['b03'] + ' * im1b' + cfg['b03'] + ' + im1b' + cfg[
- 'b04'] + ' * im1b' + cfg['b04'] + ' + im1b' + cfg['b05'] + ' * im1b' + cfg[
- 'b05'] + ' + im1b' + cfg['b06'] + ' * im1b' + cfg['b06'] + ' + im1b' + cfg[
- 'b07'] + ' * im1b' + cfg['b07'] + ' + im1b' + cfg['b08'] + ' * im1b' + cfg[
- 'b08'] + ' + im1b' + cfg['b09'] + ' * im1b' + cfg['b09'] + ' + im1b' + cfg[
- 'b10'] + ' * im1b' + cfg['b10'] + ' + im1b' + cfg['b11'] + ' * im1b' + cfg[
- 'b11'] + ' + im1b' + cfg['b12'] + ' * im1b' + cfg['b12'] + ' )'
+ if cfg['b01'].isdigit() and cfg['b02'].isdigit() and cfg['b03'].isdigit() and cfg['b04'].isdigit() and cfg['b06'].isdigit() and cfg['b07'].isdigit() and cfg['b08'].isdigit() and cfg['b09'].isdigit() and cfg['b10'].isdigit() and cfg['b11'].isdigit() and cfg['b12'].isdigit():
+ if 'B05' in feat:
+ expr[feat.index('BRI')] = 'sqrt( im1b' + cfg['b01'] + ' * im1b' + cfg['b01'] + ' + im1b' + cfg['b02'] + ' * im1b' + cfg[
+ 'b02'] + ' + im1b' + cfg['b03'] + ' * im1b' + cfg['b03'] + ' + im1b' + cfg[
+ 'b04'] + ' * im1b' + cfg['b04'] + ' + im1b' + cfg['b05'] + ' * im1b' + cfg[
+ 'b05'] + ' + im1b' + cfg['b06'] + ' * im1b' + cfg['b06'] + ' + im1b' + cfg[
+ 'b07'] + ' * im1b' + cfg['b07'] + ' + im1b' + cfg['b08'] + ' * im1b' + cfg[
+ 'b08'] + ' + im1b' + cfg['b09'] + ' * im1b' + cfg['b09'] + ' + im1b' + cfg[
+ 'b10'] + ' * im1b' + cfg['b10'] + ' + im1b' + cfg['b11'] + ' * im1b' + cfg[
+ 'b11'] + ' + im1b' + cfg['b12'] + ' * im1b' + cfg['b12'] + ' )'
+ else :
+ expr[feat.index('BRI')] = 'sqrt( im1b' + cfg['b01'] + ' * im1b' + cfg['b01'] + ' + im1b' + cfg['b02'] + ' * im1b' + cfg[
+ 'b02'] + ' + im1b' + cfg['b03'] + ' * im1b' + cfg['b03'] + ' + im1b' + cfg[
+ 'b04'] + ' * im1b' + cfg['b04'] + ' + im1b' + cfg['b06'] + ' * im1b' + cfg[
+ 'b06'] + ' + im1b' + cfg['b07'] + ' * im1b' + cfg['b07'] + ' + im1b' + cfg[
+ 'b08'] + ' * im1b' + cfg['b08'] + ' + im1b' + cfg['b09'] + ' * im1b' + cfg[
+ 'b09'] + ' + im1b' + cfg['b10'] + ' * im1b' + cfg['b10'] + ' + im1b' + cfg[
+ 'b11'] + ' * im1b' + cfg['b11'] + ' + im1b' + cfg['b12'] + ' * im1b' + cfg[
+ 'b12'] + ' )'
else:
warnings.warn("No BRI produced on Venus, at least one invalid or non present band among B01-B12.")
--
GitLab