diff --git a/R/mix.R b/R/mix.R index 6c22ce76624ead13a2aef38c8bd9e34eab11e98f..d7f0bc03240edbe54453e047b5acaa054fc2bc28 100644 --- a/R/mix.R +++ b/R/mix.R @@ -466,13 +466,12 @@ add_wd_to_mzml <- function(df,wdir) { df } -gen_sup_ftab <- function(ftab,ctab) { - df<-ctab[ftab,on=c("set","mode"),allow.cartesian=T] - setkeyv(df,cols=FTAB_KEY) - setcolorder(df,neworder = FTAB_NAMES) - df +add_wd_to_mzml <- function(fn,proj) { + wd<-basename(tools::file_path_sans_ext(fn)) + file.path(proj,wd) } + getEntryFromComp<-function(entry,id,set,mode,compTab) { ind <- which(compTab$ID %in% id & compTab$set %in% set &