Skip to content

Commit

Permalink
Freeze for CRAN submission
Browse files Browse the repository at this point in the history
  • Loading branch information
RLumSK committed May 19, 2015
1 parent 8a4552d commit 99a53aa
Show file tree
Hide file tree
Showing 16 changed files with 109 additions and 34 deletions.
6 changes: 6 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Changes in version 0.4.4 (19th, May 2015):
• Add support for ‘...’ argument for ‘calc_OSLLxTxRatio()’
arguments ‘background.count.distribution’ and ‘sigmab’.

• ‘Analyse_SAR.OSLdata()’

• Add support for ‘...’ argument for ‘calc_OSLLxTxRatio()’
arguments ‘background.count.distribution’ and ‘sigmab’
similar as done for the function ‘analyse_SAR.CWOSL()’.

• ‘calc_OSLLxTxRatio()’

• 'LxTx.Error' could become negative, which is not
Expand Down
60 changes: 51 additions & 9 deletions R/Analyse_SAR.OSLdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
#'
#' @param cex.global \link{numeric} (with default): global scaling factor.
#'
#' #' @param \dots further arguments that will be passed to the function
#' \code{\link{calc_OSLLxTxRatio}} (supported: \code{background.count.distribution} and \code{sigmab})
#'
#' @return A plot (optional) and \link{list} is returned containing the
#' following elements: \item{LnLxTnTx}{\link{data.frame} of all calculated
#' Lx/Tx values including signal, background counts and the dose points.}
Expand All @@ -77,6 +80,8 @@
#' \item{SARParameters}{\link{data.frame} of additional measurement parameters
#' obtained from the BIN file, e.g. preheat or read temperature (not valid for
#' all types of measurements).}
#'
#'
#' @note Rejection criteria are calculated but not considered during the
#' analysis to discard values.\cr\cr
#'
Expand All @@ -86,7 +91,11 @@
#'
#' \bold{The development of this function will not be continued. We recommend
#' to use the function \link{analyse_SAR.CWOSL} or instead.}
#' @section Function version: 0.2.15
#'
#'
#' @section Function version: 0.2.16
#'
#'
#' @author Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne
#' (France), Margret C. Fuchs, TU Bergakademie Freiberg
#' (Germany)
Expand Down Expand Up @@ -137,7 +146,8 @@ Analyse_SAR.OSLdata <- function(
log = "",
output.plot = FALSE,
output.plot.single = FALSE,
cex.global = 1
cex.global = 1,
...
){

##============================================================================##
Expand Down Expand Up @@ -174,6 +184,23 @@ Analyse_SAR.OSLdata <- function(
"Dose",
"Background")}


# Deal with extra arguments ----------------------------------------------------

##deal with addition arguments
extraArgs <- list(...)

background.count.distribution <-
if ("background.count.distribution" %in% names(extraArgs)) {
extraArgs$background.count.distribution
} else
{
"non-poisson"
}

sigmab <- if("sigmab" %in% names(extraArgs)) {extraArgs$sigmab} else
{NULL}

##============================================================================##
##CALCULATIONS
##============================================================================##
Expand Down Expand Up @@ -237,18 +264,33 @@ Analyse_SAR.OSLdata <- function(
##(3) calculate Lx/Tx ratios
for(k in 1:length(LnLxTnTx.curves[1,])){
if(exists("LnLxTnTx")==FALSE){
LnLxTnTx<-get_RLum.Results(calc_OSLLxTxRatio(as.data.frame(LnLxTnTx.curves[1,k]),
as.data.frame(LnLxTnTx.curves[2,k]),
signal.integral,background.integral))
LnLxTnTx <-
get_RLum.Results(
calc_OSLLxTxRatio(
as.data.frame(LnLxTnTx.curves[1,k]),
as.data.frame(LnLxTnTx.curves[2,k]),
signal.integral,background.integral,
background.count.distribution = background.count.distribution,
sigmab = sigmab
)
)

}else{
LnLxTnTx<-rbind(LnLxTnTx,get_RLum.Results(calc_OSLLxTxRatio(as.data.frame(LnLxTnTx.curves[1,k]),
as.data.frame(LnLxTnTx.curves[2,k]),
signal.integral,background.integral)))
LnLxTnTx <-
rbind(LnLxTnTx,get_RLum.Results(
calc_OSLLxTxRatio(
as.data.frame(LnLxTnTx.curves[1,k]),
as.data.frame(LnLxTnTx.curves[2,k]),
signal.integral,background.integral,
background.count.distribution = background.count.distribution,
sigmab = sigmab
)
))
}
}

##finally combine to data.frame including the record ID for further analysis
LnLxTnTx<-cbind(LnLxTnTx,LnLx.curveID,TnTx.curveID)
LnLxTnTx <- cbind(LnLxTnTx,LnLx.curveID,TnTx.curveID)

##(4.1) set info concerning the kind of regeneration points

Expand Down
6 changes: 4 additions & 2 deletions R/analyse_SAR.CWOSL.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#' The function performs an analysis for a standard SAR protocol measurements
#' introduced by Murray and Wintle (2000) with CW-OSL curves. For the
#' calculation of the Lx/Tx value the function \link{calc_OSLLxTxRatio} is
#' used. \cr\cr
#' used. For \bold{changing the way the Lx/Tx error is calculated} use the argument
#' \code{background.count.distribution} and \code{sigmab}, which will be passed to the function
#' \link{calc_OSLLxTxRatio}.\cr\cr
#'
#' \bold{Working with IRSL data}\cr\cr
#'
Expand Down Expand Up @@ -287,7 +289,7 @@ object!")
extraArgs$background.count.distribution
} else
{
"poisson"
"non-poisson"
}

sigmab <- if("sigmab" %in% names(extraArgs)) {extraArgs$sigmab} else
Expand Down
7 changes: 6 additions & 1 deletion R/calc_OSLLxTxRatio.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
#' \code{non-poisson}\cr \deqn{rse(\mu_{S}) \approx \sqrt(Y_{0} + Y_{1}/k^2 +
#' \sigma^2(1+1/k))/Y_{0} - Y_{1}/k}
#'
#' \bold{Please note that when using the early background subtraction method in combination with the
#' 'non-poisson' distribution argument, the corresponding Lx/Tx error may considerably increase due
#' to a high sigmab value. Please check whether this is valid for your data set and if necessary
#' consider to provide an own sigmab value using the corresponding argument \code{sigmab}.}
#'
#' @param Lx.data \code{\linkS4class{RLum.Data.Curve}} or \link{data.frame}
#' (\bold{required}): requires a CW-OSL shine down curve (x = time, y = counts)
#'
Expand Down Expand Up @@ -289,7 +294,7 @@ calc_OSLLxTxRatio <- function(

##(c.2) estimate relative standard error for a non-poisson distribution
if(background.count.distribution != "non-poisson"){
warning("Unknown value for background.count.distribution. A non-poisson distribution is assumed!")}
warning("Unknown method for background.count.distribution. A non-poisson distribution is assumed!")}

LnLx.relError <- sqrt(Y.0 + Y.1/k^2 + sigmab.LnLx*(1+1/k))/
(Y.0 - Y.1/k)
Expand Down
Binary file modified RLum.BuildResults/Luminescence-Ex.pdf
Binary file not shown.
Binary file modified RLum.BuildResults/Luminescence-TimingExamples.0.4.4.pdf
Binary file not shown.
Binary file modified RLum.BuildResults/Luminescence-manual.pdf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"slide.trend.corr",NA,"dots","output.plot",NA,NA,NA,NA,NA,NA,NA,NA,"plot",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"output.path","fit.trace",NA,NA,NA,NA,NA,NA,"summary.pos","par.local","output.plotExtended","dots","bw","legend.pos","dots",NA,NA,NA,"dots",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
"slide.show.density",NA,NA,"output.plot.single",NA,NA,NA,NA,NA,NA,NA,NA,"dots",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"output.terminal","fit.advanced",NA,NA,NA,NA,NA,NA,"legend","na.rm","output.plotExtended.single",NA,"output","stats",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
"plot",NA,NA,"cex.global",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"output.terminalAdvanced","fit.calcError",NA,NA,NA,NA,NA,NA,"legend.pos","dots","cex.global",NA,"dots","rug",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
"xlab.unit",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"plot","bg.subtraction",NA,NA,NA,NA,NA,NA,"stats",NA,"dots",NA,NA,"plot.ratio",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
"xlab.unit",NA,NA,"dots",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"plot","bg.subtraction",NA,NA,NA,NA,NA,NA,"stats",NA,"dots",NA,NA,"plot.ratio",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
"legend.pos",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"dots","output.path",NA,NA,NA,NA,NA,NA,"rug",NA,NA,NA,NA,"bar.col",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
"dots",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"output.terminal",NA,NA,NA,NA,NA,NA,"kde",NA,NA,NA,NA,"y.ticks",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,"output.terminaladvanced",NA,NA,NA,NA,NA,NA,"hist",NA,NA,NA,NA,"grid.col",NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA,NA
Expand Down
6 changes: 3 additions & 3 deletions RLum.BuildResults/Luminescence_0.4.4-Functions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
","<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France)<br /> R Luminescence Package Team"
"analyse_pIRIRSequence","Analyse post-IR IRSL sequences","<br /> The function performs an analysis of post-IR IRSL sequences including curve<br /> fitting on RLum.Analysis objects.<br />","0.1.4","2015-04-30","11:47:40
","<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France)<br /> R Luminescence Package Team"
"analyse_SAR.CWOSL","Analyse SAR CW-OSL measurements","<br /> The function performs a SAR CW-OSL analysis on an<br /> RLum.Analysis object including growth curve fitting.<br />","0.5.3","2015-05-10","15:12:52
"analyse_SAR.CWOSL","Analyse SAR CW-OSL measurements","<br /> The function performs a SAR CW-OSL analysis on an<br /> RLum.Analysis object including growth curve fitting.<br />","0.5.3","2015-05-19","16:05:34
","<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France)<br /> R Luminescence Package Team"
"Analyse_SAR.OSLdata","Analyse SAR CW-OSL measurements.","<br /> The function analyses SAR CW-OSL curve data and provides a summary of the<br /> measured data for every position. The output of the function is optimised<br /> for SAR OSL measurements on quartz.<br />","0.2.15","2015-05-10","15:12:52
"Analyse_SAR.OSLdata","Analyse SAR CW-OSL measurements.","<br /> The function analyses SAR CW-OSL curve data and provides a summary of the<br /> measured data for every position. The output of the function is optimised<br /> for SAR OSL measurements on quartz.<br />","0.2.16","2015-05-19","16:13:07
","<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France), Margret C. Fuchs, TU Bergakademie Freiberg<br /> (Germany)<br /> R Luminescence Package Team"
"analyse_SAR.TL","Analyse SAR TL measurements","<br /> The function performs a SAR TL analysis on a<br /> RLum.Analysis object including growth curve fitting.<br />","0.1.4","2015-04-30","11:49:25
","<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br /> R Luminescence Package Team"
Expand Down Expand Up @@ -36,7 +36,7 @@
","<br /> Christoph Burow, University of Cologne (Germany) Based on a<br /> rewritten S script of Rex Galbraith, 2010 <br /> R Luminescence Package Team"
"calc_MinDose","Apply the (un-)logged minimum age model (MAM) after Galbraith et al. (1999)<br /> to a given De distribution","<br /> Function to fit the (un-)logged three or four parameter minimum dose model<br /> (MAM-3/4) to De data.<br />","0.4.1","2015-04-30","11:53:53
","<br /> Christoph Burow, University of Cologne (Germany) Based on a<br /> rewritten S script of Rex Galbraith, 2010 The bootstrap approach is<br /> based on a rewritten MATLAB script of Alastair Cunningham. Alastair<br /> Cunningham is thanked for his help in implementing and cross-checking the<br /> code.<br /> R Luminescence Package Team"
"calc_OSLLxTxRatio","Calculate Lx/Tx ratio for CW-OSL curves","<br /> Calculate Lx/Tx ratios from a given set of CW-OSL curves.<br />","0.5.1","2015-05-10","15:12:52
"calc_OSLLxTxRatio","Calculate Lx/Tx ratio for CW-OSL curves","<br /> Calculate Lx/Tx ratios from a given set of CW-OSL curves.<br />","0.5.1","2015-05-19","16:03:06
","<br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France)<br /> R Luminescence Package Team"
"calc_SourceDoseRate","Calculation of the source dose rate via the date of measurement","<br /> Calculating the dose rate of the irradiation source via the date of<br /> measurement based on: source calibration date, source dose rate, dose rate<br /> error. The function returns a data.frame that provides the input argument<br /> dose_rate for the function Second2Gray .<br />","0.1","2015-04-30","11:54:25
","<br /> Margret C. Fuchs, AWI Potsdam (Germany), Sebastian Kreutzer,<br /> IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)<br /> R Luminescence Package Team"
Expand Down
8 changes: 4 additions & 4 deletions RLum.BuildResults/Luminescence_0.4.4-Functions.tex
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% latex table generated in R 3.3.0 by xtable 1.7-4 package
% Mon May 18 11:01:15 2015
% Tue May 19 16:22:14 2015
\begin{table}[ht]
\centering
\begin{tabular}{rlllllll}
Expand All @@ -10,9 +10,9 @@
& $<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne$<$br /$>$ (France)$<$br /$>$ R Luminescence Package Team \\
2 & analyse\_pIRIRSequence & Analyse post-IR IRSL sequences & $<$br /$>$ The function performs an analysis of post-IR IRSL sequences including curve$<$br /$>$ fitting on RLum.Analysis objects.$<$br /$>$ & 0.1.4 & 2015-04-30 & 11:47:40
& $<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne$<$br /$>$ (France)$<$br /$>$ R Luminescence Package Team \\
3 & analyse\_SAR.CWOSL & Analyse SAR CW-OSL measurements & $<$br /$>$ The function performs a SAR CW-OSL analysis on an$<$br /$>$ RLum.Analysis object including growth curve fitting.$<$br /$>$ & 0.5.3 & 2015-05-10 & 15:12:52
3 & analyse\_SAR.CWOSL & Analyse SAR CW-OSL measurements & $<$br /$>$ The function performs a SAR CW-OSL analysis on an$<$br /$>$ RLum.Analysis object including growth curve fitting.$<$br /$>$ & 0.5.3 & 2015-05-19 & 16:05:34
& $<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne$<$br /$>$ (France)$<$br /$>$ R Luminescence Package Team \\
4 & Analyse\_SAR.OSLdata & Analyse SAR CW-OSL measurements. & $<$br /$>$ The function analyses SAR CW-OSL curve data and provides a summary of the$<$br /$>$ measured data for every position. The output of the function is optimised$<$br /$>$ for SAR OSL measurements on quartz.$<$br /$>$ & 0.2.15 & 2015-05-10 & 15:12:52
4 & Analyse\_SAR.OSLdata & Analyse SAR CW-OSL measurements. & $<$br /$>$ The function analyses SAR CW-OSL curve data and provides a summary of the$<$br /$>$ measured data for every position. The output of the function is optimised$<$br /$>$ for SAR OSL measurements on quartz.$<$br /$>$ & 0.2.16 & 2015-05-19 & 16:13:07
& $<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne$<$br /$>$ (France), Margret C. Fuchs, TU Bergakademie Freiberg$<$br /$>$ (Germany)$<$br /$>$ R Luminescence Package Team \\
5 & analyse\_SAR.TL & Analyse SAR TL measurements & $<$br /$>$ The function performs a SAR TL analysis on a$<$br /$>$ RLum.Analysis object including growth curve fitting.$<$br /$>$ & 0.1.4 & 2015-04-30 & 11:49:25
& $<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)$<$br /$>$ R Luminescence Package Team \\
Expand Down Expand Up @@ -43,7 +43,7 @@
& $<$br /$>$ Christoph Burow, University of Cologne (Germany) Based on a$<$br /$>$ rewritten S script of Rex Galbraith, 2010 $<$br /$>$ R Luminescence Package Team \\
19 & calc\_MinDose & Apply the (un-)logged minimum age model (MAM) after Galbraith et al. (1999)$<$br /$>$ to a given De distribution & $<$br /$>$ Function to fit the (un-)logged three or four parameter minimum dose model$<$br /$>$ (MAM-3/4) to De data.$<$br /$>$ & 0.4.1 & 2015-04-30 & 11:53:53
& $<$br /$>$ Christoph Burow, University of Cologne (Germany) Based on a$<$br /$>$ rewritten S script of Rex Galbraith, 2010 The bootstrap approach is$<$br /$>$ based on a rewritten MATLAB script of Alastair Cunningham. Alastair$<$br /$>$ Cunningham is thanked for his help in implementing and cross-checking the$<$br /$>$ code.$<$br /$>$ R Luminescence Package Team \\
20 & calc\_OSLLxTxRatio & Calculate Lx/Tx ratio for CW-OSL curves & $<$br /$>$ Calculate Lx/Tx ratios from a given set of CW-OSL curves.$<$br /$>$ & 0.5.1 & 2015-05-10 & 15:12:52
20 & calc\_OSLLxTxRatio & Calculate Lx/Tx ratio for CW-OSL curves & $<$br /$>$ Calculate Lx/Tx ratios from a given set of CW-OSL curves.$<$br /$>$ & 0.5.1 & 2015-05-19 & 16:03:06
& $<$br /$>$ Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne$<$br /$>$ (France)$<$br /$>$ R Luminescence Package Team \\
21 & calc\_SourceDoseRate & Calculation of the source dose rate via the date of measurement & $<$br /$>$ Calculating the dose rate of the irradiation source via the date of$<$br /$>$ measurement based on: source calibration date, source dose rate, dose rate$<$br /$>$ error. The function returns a data.frame that provides the input argument$<$br /$>$ dose\_rate for the function Second2Gray .$<$br /$>$ & 0.1 & 2015-04-30 & 11:54:25
& $<$br /$>$ Margret C. Fuchs, AWI Potsdam (Germany), Sebastian Kreutzer,$<$br /$>$ IRAMAT-CRP2A, Universite Bordeaux Montaigne (France)$<$br /$>$ R Luminescence Package Team \\
Expand Down
14 changes: 7 additions & 7 deletions RLum.BuildScripts/Luminescence_0.4.4-Functions.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ <h4 align="center"> [version: 0.4.4 ]</h4>
</td>
<td class=cellinside>0.5.3
</td>
<td class=cellinside>2015-05-10
<td class=cellinside>2015-05-19
</td>
<td class=cellinside>15:12:52
<td class=cellinside>16:05:34

</td>
<td class=cellinside><br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France)<br /> R Luminescence Package Team
Expand All @@ -118,11 +118,11 @@ <h4 align="center"> [version: 0.4.4 ]</h4>
</td>
<td class=cellinside><br /> The function analyses SAR CW-OSL curve data and provides a summary of the<br /> measured data for every position. The output of the function is optimised<br /> for SAR OSL measurements on quartz.<br />
</td>
<td class=cellinside>0.2.15
<td class=cellinside>0.2.16
</td>
<td class=cellinside>2015-05-10
<td class=cellinside>2015-05-19
</td>
<td class=cellinside>15:12:52
<td class=cellinside>16:13:07

</td>
<td class=cellinside><br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France), Margret C. Fuchs, TU Bergakademie Freiberg<br /> (Germany)<br /> R Luminescence Package Team
Expand Down Expand Up @@ -423,9 +423,9 @@ <h4 align="center"> [version: 0.4.4 ]</h4>
</td>
<td class=cellinside>0.5.1
</td>
<td class=cellinside>2015-05-10
<td class=cellinside>2015-05-19
</td>
<td class=cellinside>15:12:52
<td class=cellinside>16:03:06

</td>
<td class=cellinside><br /> Sebastian Kreutzer, IRAMAT-CRP2A, Universite Bordeaux Montaigne<br /> (France)<br /> R Luminescence Package Team
Expand Down
8 changes: 8 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@

}

\item \code{Analyse_SAR.OSLdata()}

\itemize{
\item Add support for \code{...} argument for \code{calc_OSLLxTxRatio()} arguments
\code{background.count.distribution} and \code{sigmab} similar as done for the function \code{analyse_SAR.CWOSL()}.

}

\item \code{calc_OSLLxTxRatio()}

\itemize{
Expand Down
11 changes: 8 additions & 3 deletions man/Analyse_SAR.OSLdata.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Analyse_SAR.OSLdata(input.data, signal.integral, background.integral, position,
run, set, dtype, keep.SEL = FALSE,
info.measurement = "unkown measurement", log = "", output.plot = FALSE,
output.plot.single = FALSE, cex.global = 1)
output.plot.single = FALSE, cex.global = 1, ...)
}
\arguments{
\item{input.data}{\link{Risoe.BINfileData-class} (\bold{required}): input
Expand Down Expand Up @@ -57,7 +57,12 @@ logarithmic and "xy" or "yx" if both axes are to be logarithmic. See
(\code{TRUE/FALSE}) to allow for plotting the results in single plot
windows. Requires \code{output.plot = TRUE}.}

\item{cex.global}{\link{numeric} (with default): global scaling factor.}
\item{cex.global}{\link{numeric} (with default): global scaling factor.

#'}

\item{\dots}{further arguments that will be passed to the function
\code{\link{calc_OSLLxTxRatio}} (supported: \code{background.count.distribution} and \code{sigmab})}
}
\value{
A plot (optional) and \link{list} is returned containing the
Expand Down Expand Up @@ -103,7 +108,7 @@ consider using the functions \code{\link{analyse_SAR.CWOSL}} or
to use the function \link{analyse_SAR.CWOSL} or instead.}
}
\section{Function version}{
0.2.15 (2015-05-10 15:12:52)
0.2.16 (2015-05-19 16:13:07)
}
\examples{
##load data
Expand Down
Loading

0 comments on commit 99a53aa

Please sign in to comment.