Skip to content

Commit

Permalink
Merge pull request #58 from fgcz/master
Browse files Browse the repository at this point in the history
Use @inheritParams v1.7.9
  • Loading branch information
cpanse authored Mar 12, 2023
2 parents 8da2bd2 + ec59e6a commit b14db4f
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 21 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: rawrr
Type: Package
Title: Direct Access to Orbitrap Data and Beyond
Version: 1.7.8
Version: 1.7.9
Authors@R: c(person("Christian", "Panse",
email = "cp@fgcz.ethz.ch",
role = c("aut", "cre"),
Expand Down
20 changes: 7 additions & 13 deletions R/rawrr.R
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ is.rawrrSpectrumSet <- function(x){

#' read file header Information
#'
#' @param rawfile the name of the Thermo Fisher Scietific raw file
#' @description The function extracts meta information from a given rawfile.
#' @param rawfile the name of the raw file containing the mass spectrometry data from the Thermo Fisher Scientific instrument.
#' @description This function extracts the meta information from a given raw file.
#' @author Tobias Kockmann and Christian Panse 2018, 2019, 2020.
#' @references Thermo Fisher Scientific's NewRawfileReader C# code snippets
#' \url{https://planetorbitrap.com/rawfilereader}.
Expand Down Expand Up @@ -221,7 +221,7 @@ readFileHeader <- function(rawfile){
# readIndex-----
#' Read scan index
#'
#' @param rawfile the name of the Thermo Fisher Scientific raw file.
#' @inheritParams readFileHeader
#' @param tmpdir defines the directory used to store temporary data generated by
#' the .NET assembly \code{rawrr.exe}. The default uses \code{tempdir()}.
#'
Expand Down Expand Up @@ -279,11 +279,9 @@ readIndex <- function(rawfile, tmpdir=tempdir()){

#' derive scans number which match a specified filter
#'
#' @param rawfile the name of the Thermo Fisher Scietific raw file
#' @inheritParams readIndex
#' @param filter scan filter string, e.g., \code{ms} or \code{ms2}
#' @param precision mass precision, default is 10.
#' @param tmpdir defines the directory used to store temporary data generated by
#' the .NET assembly \code{rawrr.exe}. The default uses \code{tempdir()}.
#'
#' @return a vecntor of integer values.
filter <- function(rawfile, filter = "ms", precision = 10, tmpdir=tempdir()){
Expand Down Expand Up @@ -466,10 +464,8 @@ sampleFilePath <- function(){
#' @description The function derives spectra of a given raw file and a given
#' vector of scan numbers.
#'
#' @param rawfile the name of the Thermo Fisher Scientific raw file.
#' @inheritParams readIndex
#' @param scan a vector of requested scan numbers.
#' @param tmpdir defines the directory used to store temporary data generated by
#' the .NET assembly \code{rawrr.exe}. The default uses \code{tempdir()}.
#' @param validate boolean default is \code{FALSE}.
#' @param mode if \code{mode = "barebone"} only mZ, intensity, pepmass, rtinseconds
#' and charge state is returned. As default mode is \code{""}.
Expand Down Expand Up @@ -665,7 +661,7 @@ Please check the debug files:\n\t%s\n\t%s\nand the System Requirements",
# readChromatogram ---------
#' Extracts chromatographic data from a raw file.
#'
#' @param rawfile the file name.
#' @inheritParams readFileHeader
#' @param mass a vector of mass values iff \code{type = 'xic'}.
#' @param tol mass tolerance in ppm iff \code{type = 'xic'}.
#' @param filter defines the scan filter, default is \code{filter="ms"} if a
Expand Down Expand Up @@ -1423,11 +1419,9 @@ auc.rawrrChromatogram <- function(x){
# readTrailer ---------
#' Read and extract scan trailer from TFS raw files.
#'
#' @param rawfile the name of the Thermo Fisher Scientific raw file.
#' @inheritParams readIndex
#' @param label if NULL; the function scans for all available labels.
#' @param verbose print message of temp files; default is \code{FALSE}.
#' @param tmpdir defines the directory used to store temporary data generated by
#' the .NET assembly \code{rawrr.exe}. The default uses \code{tempdir()}.
#'
#' @return an vector of trailers or values of a given trailer. Of note,
#' the values are usually returned as a character.
Expand Down
2 changes: 1 addition & 1 deletion man/filter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/readChromatogram.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/readFileHeader.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/readIndex.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/readSpectrum.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/readTrailer.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b14db4f

Please sign in to comment.