changed indice formula

sen2chain/indices_functions.py

@@ -377,7 +377,7 @@ def create_raw_ireci(
         ).astype(np.float32)
         if version.parse(baseline) >= version.parse("4.0"):
             logger.info('Baseline >= 4.0 detected, changing DN calculation')
-            ireci = (((b4-1000)/10000) * (((b1-1000)/10000) - ((b2-1000)/10000)) / ((b3-1000)/10000)).astype(np.int16)
+            ireci = ((b4-1000) * ((b1-1000) - (b2-1000)) / (b3-1000)).astype(np.int16)
             ireci_masked = np.where(b1 != 0, ireci, 32767)
         else:
             logger.info('Baseline <= 4.0 detected, sticking with original DN calculation')
@@ -425,7 +425,7 @@ def create_raw_bigr(
         )  # ignore warnings when dividing by zero
         if version.parse(baseline) >= version.parse("4.0"):
             logger.info('Baseline >= 4.0 detected, changing DN calculation')
-            bigr = (((((green-1000)/10000) ** 2 + ((red-1000)/10000) ** 2) / 2) ** 0.5).astype(np.int16)
+            bigr = ((((green-1000) ** 2 + (red-1000) ** 2) / 2) ** 0.5).astype(np.int16)
             bigr_masked = np.where(red != 0, bigr, 32767)
         else:
             logger.info('Baseline <= 4.0 detected, sticking with original DN calculation')
@@ -474,7 +474,7 @@ def create_raw_birnir(
         )  # ignore warnings when dividing by zero
         if version.parse(baseline) >= version.parse("4.0"):
             logger.info('Baseline >= 4.0 detected, changing DN calculation')
-            birnir = (((((nir-1000)/10000) ** 2 + ((red-1000)/10000) ** 2) / 2) ** 0.5).astype(np.int16)
+            birnir = ((((nir-1000) ** 2 + (red-1000) ** 2) / 2) ** 0.5).astype(np.int16)
             birnir_masked = np.where(red != 0, birnir, 32767)
         else:
             logger.info('Baseline <= 4.0 detected, sticking with original DN calculation')
@@ -523,7 +523,7 @@ def create_raw_bibg(
         )  # ignore warnings when dividing by zero
         if version.parse(baseline) >= version.parse("4.0"):
             logger.info('Baseline >= 4.0 detected, changing DN calculation')
-            bibg = (((((green-1000)/10000) ** 2 + ((blue-1000)/10000) ** 2) / 2) ** 0.5).astype(np.int16)
+            bibg = ((((green-1000) ** 2 + (blue-1000) ** 2) / 2) ** 0.5).astype(np.int16)
             bibg_masked = np.where(blue != 0, bibg, 32767)
         else:
             logger.info('Baseline <= 4.0 detected, sticking with original DN calculation')
@@ -573,7 +573,7 @@ def create_raw_bi(
         )  # ignore warnings when dividing by zero
         if version.parse(baseline) >= version.parse("4.0"):
             logger.info('Baseline >= 4.0 detected, changing DN calculation')
-            bigr = (((((green-1000)/10000) ** 2 + ((red-1000)/10000) ** 2) / 2) ** 0.5).astype(np.int16)
+            bigr = ((((green-1000) ** 2 + (red-1000) ** 2) / 2) ** 0.5).astype(np.int16)
             bigr_masked = np.where(red != 0, bigr, 32767)
         else:
             logger.info('Baseline <= 4.0 detected, sticking with original DN calculation')
@@ -622,13 +622,11 @@ def create_raw_evi(
         )  # ignore warnings when dividing by zero
         if version.parse(baseline) >= version.parse("4.0"):
             logger.info('Baseline >= 4.0 detected, changing DN calculation')
-            evi = 2.5 * ((((nir-1000)/10000) / 10000 - ((red-1000)/10000) / 10000)) / (
-                        (((nir-1000)/10000) / 10000 + 6.0 * ((red-1000)/10000) / 10000 - 7.5 * ((blue-1000)/10000) / 10000) + 1).astype(np.int32)
+            evi = (2.5 * ((nir-1000)/10000 - (red-1000)/10000) / ((nir-1000)/10000 + 6.0 * (red-1000)/10000 - 7.5 * (blue-1000)/10000) + 1).astype(np.int32)
             evi_masked = np.where(red != 0, evi, 32767)
         else:
             logger.info('Baseline <= 4.0 detected, sticking with original DN calculation')
-            evi = 2.5 * ((nir / 10000 - red / 10000)) / (
-                        (nir / 10000 + 6.0 * red / 10000 - 7.5 * blue / 10000) + 1).astype(np.int32)
+            evi = (2.5 * ((nir/10000 - red/10000)) / ((nir/10000 + 6.0 * red/10000 - 7.5 * blue/10000) + 1)).astype(np.int32)
             evi_masked = np.where(red != 0, evi, 32767)