aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--R/endpoints.R8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b3cf00f2..5b455706 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,9 @@
* R/mkinresplot.R: Make it possible to specify xlim
* R/geometric_mean.R, man/geometric_mean.Rd: Add geometric mean
function
- * R/mkinfit.R, man/mkinfit.Rd: Calculate additional (pseudo)-DT50
- values for FOMC, DFOP, HS and SFORB
+ * R/endpoints.R, man/endpoints.Rd: Calculate additional (pseudo)-DT50
+ values for FOMC, DFOP, HS and SFORB. Avoid calculation of formation
+ fractions from rate constants when they are directly fitted
2014-05-20 Johannes Ranke <jranke@uni-bremen.de> for mkin (0.9-28)
diff --git a/R/endpoints.R b/R/endpoints.R
index 5150b4bd..0bd20ea7 100644
--- a/R/endpoints.R
+++ b/R/endpoints.R
@@ -32,9 +32,11 @@ endpoints <- function(fit) {
k_tot = sum(parms.all[k_names])
DT50 = log(2)/k_tot
DT90 = log(10)/k_tot
- for (k_name in k_names)
- {
- ep$ff[[sub("k_", "", k_name)]] = parms.all[[k_name]] / k_tot
+ if (fit$mkinmod$use_of_ff == "min") {
+ for (k_name in k_names)
+ {
+ ep$ff[[sub("k_", "", k_name)]] = parms.all[[k_name]] / k_tot
+ }
}
}
if (type == "FOMC") {

Contact - Imprint