Merge branch 'develop' into specadjust-mods

Author: davidfrantz

README.md

@@ -2,7 +2,7 @@
 
 **Framework for Operational Radiometric Correction for Environmental monitoring**
 
-**Version 3.7.1-develop**
+**Version 3.7.2-develop**
 
 ![FORCE Logo](/images/force.png)
 

docs/source/history/v3.rst

@@ -1,5 +1,28 @@
 .. _v3:
 
+FORCE v. 3.7.2
+--------------
+
+Release: 20.10.2021
+
+* **FORCE L2PS**
+
+  * ESA made major changes in their Sentinel-2 products, which will become effective as of October 26, 2021.
+    Specifically, ESA introduced additive scaling factors to convert the DNs to TOA reflectance.
+    Older FORCE versions will fail!
+    Update to FORCE >= 3.7.2!
+    Thanks to Vincent Schut and Patrick Griffiths for the heads-up!
+
+* **General changes**
+
+  * Docker containers will only be published to Docker Hub, if working in the original repository.
+    This solves failed GitHub Actions for users that have forked the repository.
+    Thanks to Florian Katerndahl for implementing a fix!
+
+* **New Program**
+
+  * There is now a new program ``force-cube-init``, which can generate a ``datacube-definition.prj`` file without needing to process Level 2 data.
+
 
 FORCE v. 3.7.1
 --------------

docs/source/index.rst

@@ -5,7 +5,7 @@ FORCE documentation
 
 **FORCE: Framework for Operational Radiometric Correction for Environmental monitoring**
 
-**Version 3.7.1-develop**
+**Version 3.7.2-develop**
 
 `Download from Github <https://github.com/davidfrantz/force>`_.
 

src/cross-level/_version-cl.h

@@ -32,7 +32,7 @@ Version number
 extern "C" {
 #endif
 
-#define _VERSION_ "3.7.1-develop"
+#define _VERSION_ "3.7.2-develop"
 
 #ifdef __cplusplus
 }

src/cross-level/string-cl.c

@@ -50,3 +50,39 @@ void copy_string(char *dst, size_t size, const char *src){
   return;
 }
 
+
+int char_to_int(const char *src, int *val){
+long int temp_val;
+char *temp;
+errno = 0;
+
+
+  temp_val = strtol(src, &temp, 0);
+
+  if (temp == src || *temp != '\0' || errno == ERANGE){
+    return FAILURE;}
+
+  if (temp_val < INT_MIN ||
+      temp_val > INT_MAX){
+    return FAILURE;}
+
+  *val = (int)temp_val;
+  return SUCCESS;
+}
+
+
+int char_to_float(const char *src, float *val){
+float temp_val;
+char *temp;
+errno = 0;
+
+
+  temp_val = strtof(src, &temp);
+
+  if (temp == src || *temp != '\0' || errno == ERANGE){
+    return FAILURE;}
+
+  *val = (float)temp_val;
+  return SUCCESS;
+}
+

src/cross-level/string-cl.h

@@ -31,13 +31,18 @@ String handling header
 #include <stdio.h>    // core input and output functions
 #include <stdlib.h>   // standard general utilities library
 #include <string.h>   // string handling functions
+#include <limits.h>   // macro constants of the integer types
+#include <errno.h>    // error numbers
 
+#include "../cross-level/const-cl.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 void copy_string(char *dst, size_t size, const char *src);
+int char_to_int(const char *src, int *val);
+int char_to_float(const char *src, float *val);
 
 #ifdef __cplusplus
 }

src/lower-level/meta-ll.c

@@ -334,8 +334,6 @@ GDALDatasetH fp_;
 
 
         meta->cal = allocate_calibration(nb);
-        //alloc((void**)&meta->cal, nb, sizeof(cal_t));
-        //for (b=0; b<nb; b++) init_calib(&meta->cal[b]);
 
 
         // set start of Relative Spectral Response Array
@@ -736,8 +734,6 @@ int svgrid = 5000;
         for (b=0; b<nb; b++) set_brick_sensor(DN, b, sensor);
 
         meta->cal = allocate_calibration(nb);
-        //alloc((void**)&meta->cal, nb, sizeof(cal_t));
-        //for (b=0; b<nb; b++) init_calib(&meta->cal[b]);
 
         // set start of Relative Spectral Response Array
         if (strcmp(sensor, "SEN2A") == 0){
@@ -883,6 +879,25 @@ int svgrid = 5000;
           tokenptr = strtok(NULL, separator);
         }
 
+      // additive scaling factor (since baseline 4.0)
+      } else if (strcmp(tag, "RADIO_ADD_OFFSET") == 0){
+        // re-init to 0 to be compatible with older baselines
+        for (b=0; b<nb; b++){
+           if (meta->cal[b].radd == meta->cal[b].fill) meta->cal[b].radd = 0;
+        }
+        b = -1;
+        while (strcmp(tokenptr, "/RADIO_ADD_OFFSET") != 0){
+          if (b < 0){
+            char_to_int(tokenptr, &b);
+          } else if (b >= 0 || b < nb){
+            char_to_float(tokenptr, &meta->cal[b].radd);
+          }
+          tag = tokenptr;
+          tokenptr = strtok(NULL, separator);
+        }
+        #ifdef FORCE_DEBUG
+        if (b >= 0) printf("additive scaling factor for band %d: %f\n", b, meta->cal[b].radd);
+        #endif
       }
 
       // in case tag (key words) is not the first word in a line

src/lower-level/read-ll.c

@@ -395,11 +395,11 @@ float dn_scale, toa_scale;
       dn_scale  = get_brick_scale(DN,  b);
       toa_scale = get_brick_scale(TOA, b);
 
-      #pragma omp parallel shared(b, nc, dn_scale, toa_scale, dn_, toa_) default(none) 
+      #pragma omp parallel shared(b, nc, dn_scale, toa_scale, dn_, toa_, meta) default(none) 
       {
 
         #pragma omp for schedule(static)
-        for (p=0; p<nc; p++) toa_[b][p] = dn_[b][p]/dn_scale*toa_scale;
+        for (p=0; p<nc; p++) toa_[b][p] = (dn_[b][p] + meta->cal[b].radd) / dn_scale*toa_scale;
 
       }