From feef7146a86b0e1b733b6df1df1420dd11101474 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Thu, 13 Sep 2018 23:44:42 +0200
Subject: Enable new error model in gmkin

Also improve the irls fitting of the error model and add a test
for FOCUS_2006_C where the second component of the error model is zero
---
 man/mkinfit.Rd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'man/mkinfit.Rd')

diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd
index 3b0ddbea..00d7eb47 100644
--- a/man/mkinfit.Rd
+++ b/man/mkinfit.Rd
@@ -31,7 +31,7 @@ mkinfit(mkinmod, observed,
   transform_rates = TRUE,
   transform_fractions = TRUE,
   plot = FALSE, quiet = FALSE, err = NULL,
-  weight = c("none", "std", "mean", "tc"),
+  weight = c("none", "manual", "std", "mean", "tc"),
   tc = c(sigma_low = 0.5, rsd_high = 0.07),
   scaleVar = FALSE,
   atol = 1e-8, rtol = 1e-10, n.outtimes = 100,
@@ -179,7 +179,8 @@ mkinfit(mkinmod, observed,
   \item{weight}{
     only if \code{err}=\code{NULL}: how to weight the residuals, one of "none",
     "std", "mean", see details of \code{\link{modCost}}, or "tc" for the
-    two component error model.
+    two component error model. The option "manual" is available for 
+    the case that \code{err}!=\code{NULL}, but it is not necessary to specify it.
   }
   \item{tc}{The two components of the error model as used for (initial)
     weighting}.
-- 
cgit v1.2.1