Merge branch 'dev'

jbferet · Feb 8, 2024 · 568d132 · 568d132
2 parents 2be80e5 + 1397fae
commit 568d132
Show file tree

Hide file tree

Showing 4 changed files with 450 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: prospect
 Title: PROSPECT leaf radiative transfer model and inversion routines
-Version: 1.6.2
+Version: 1.7.0
 Authors@R: c(person(given = "Jean-Baptiste", 
 					    family = "Feret", 
 					    email = "jb.feret@teledetection.fr", 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# prospect v1.7.0
+## fix
+- corrected inaccurate accounting for N when computing bNm1
+
 # prospect v1.6.2
 ## fix
 - fixed wrong merge for correction of JOSS paper

diff --git a/R/Lib_PROSPECT.R b/R/Lib_PROSPECT.R
@@ -113,7 +113,7 @@ PROSPECT <- function(SpecPROSPECT = NULL, Input_PROSPECT = NULL,
   a <- (1 + rq - tq + D) / (2 * r)
   b <- (1 - rq + tq + D) / (2 * t)
 
-  bNm1 <- b**(N - 1)
+  bNm1 <- b**(Input_PROSPECT$N - 1)
   bN2 <- bNm1**2
   a2 <- a**2
   denom <- a2 * bN2 - 1