Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addition of method to filter features based on quality assessment #713

Merged
merged 16 commits into from
Feb 1, 2024
7 changes: 4 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: xcms
Version: 4.1.6
Version: 4.1.7
Title: LC-MS and GC-MS Data Analysis
Description: Framework for processing and visualization of chromatographically
separated and single-spectra mass spectral data. Imports from AIA/ANDI NetCDF,
Expand Down Expand Up @@ -62,7 +62,8 @@ Imports:
Spectra (>= 1.13.2),
progress,
multtest,
jsonlite
jsonlite,
MetaboCoreUtils (>= 1.11.2)
philouail marked this conversation as resolved.
Show resolved Hide resolved
Suggests:
BiocStyle,
caTools,
Expand All @@ -76,7 +77,6 @@ Suggests:
MALDIquant,
pheatmap,
MsBackendMgf,
MetaboCoreUtils,
signal
Enhances:
Rgraphviz,
Expand Down Expand Up @@ -127,6 +127,7 @@ Collate:
'init.R'
'loadXcmsData.R'
'matchpeaks.R'
'method-filterFeatures.R'
'methods-Chromatogram.R'
'methods-IO.R'
'methods-MChromatograms.R'
Expand Down
13 changes: 12 additions & 1 deletion NAMESPACE
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ importFrom("utils", "capture.output", "data")
import("methods")
importMethodsFrom("ProtGenerics", "peaks", "chromatogram", "writeMSData",
"polarity<-", "centroided", "isCentroided", "peaks<-",
"isolationWindowTargetMz", "quantify", "bin", "spectrapply")
"isolationWindowTargetMz", "quantify", "bin", "spectrapply", "filterFeatures")
importClassesFrom("ProtGenerics", "Param")
importFrom("BiocGenerics", "updateObject", "fileName", "subset",
"dirname", "dirname<-")
Expand Down Expand Up @@ -35,6 +35,9 @@ importFrom("S4Vectors", "split", "Rle", "DataFrame", "SimpleList", "List",
importMethodsFrom("S4Vectors", "as.matrix", "mcols", "mcols<-",
"extractROWS", "findMatches")
importFrom("SummarizedExperiment", "SummarizedExperiment")
importFrom("SummarizedExperiment", "rowData")
importFrom("SummarizedExperiment", "rowData<-")
importFrom("SummarizedExperiment", "assay")
importFrom("MsCoreUtils", "rbindFill", "closest", "i2index", "sumi", "between",
"maxi", "breaks_ppm")

Expand Down Expand Up @@ -594,3 +597,11 @@ importFrom("jsonlite", "serializeJSON", "write_json", "unserializeJSON",
export("RDataParam")
export("PlainTextParam")
exportMethods("storeResults")

## filtering features things
importFrom("MetaboCoreUtils", "rowRsd", "rowDratio", "rowPercentMissing",
"rowBlank")
export("RsdFilter")
export("DratioFilter")
export("PercentMissingFilter")
export("BlankFlag")
4 changes: 3 additions & 1 deletion R/DataClasses.R
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ setClass("xcmsPeaks", contains = "matrix")
.PROCSTEP.PEAK.FILLING <- "Missing peak filling"
.PROCSTEP.CALIBRATION <- "Calibration"
.PROCSTEP.FEATURE.GROUPING <- "Feature grouping"
.PROCSTEP.FEATURE.FILTERING <- "Feature filtering"
.PROCSTEPS <- c(
.PROCSTEP.UNKNOWN,
.PROCSTEP.PEAK.DETECTION,
Expand All @@ -198,7 +199,8 @@ setClass("xcmsPeaks", contains = "matrix")
.PROCSTEP.RTIME.CORRECTION,
.PROCSTEP.PEAK.FILLING,
.PROCSTEP.CALIBRATION,
.PROCSTEP.FEATURE.GROUPING
.PROCSTEP.FEATURE.GROUPING,
.PROCSTEP.FEATURE.FILTERING
)

############################################################
Expand Down
Loading
Loading