Skip to content
Snippets Groups Projects
Commit ea68c577 authored by Todor Kondic's avatar Todor Kondic
Browse files

FIX: mb prep for combined

* mix.R(p.sw,v): Update. Attach a suitable name (that has an extension
  that can be stripped) to the combined object.
parent 1a183ad6
No related branches found
No related tags found
No related merge requests found
...@@ -212,7 +212,9 @@ v<-function(fn_data,stgs_alist,wd,fn_cmpd_list,mode,readMethod="mzR",archdir="ar ...@@ -212,7 +212,9 @@ v<-function(fn_data,stgs_alist,wd,fn_cmpd_list,mode,readMethod="mzR",archdir="ar
no_drama_mkdir(combdir) no_drama_mkdir(combdir)
no_drama_mkdir(archdir) no_drama_mkdir(archdir)
fn_arch<-file.path(archdir,"archive") fn_arch<-file.path(archdir,"archive")
RMassBank::msmsWorkflow(zz, steps=8, mode=mode, archivename = fn_arch) res<-RMassBank::msmsWorkflow(zz, steps=8, mode=mode, archivename = fn_arch)
names(res)<-paste(combdir,".yml",sep='') #Clearly a hack.
res
} else { } else {
z<-f(fn_data,stgs_alist,wd,fn_cmpd_list,mode,readMethod=readMethod,archdir=archdir,lastStep=lastStep) z<-f(fn_data,stgs_alist,wd,fn_cmpd_list,mode,readMethod=readMethod,archdir=archdir,lastStep=lastStep)
names(z)<-basename(fn_data) names(z)<-basename(fn_data)
...@@ -258,7 +260,9 @@ p.sw<-function(fn_data,stgs_alist,wd,fn_cmpd_list,mode,readMethod="mzR",archdir= ...@@ -258,7 +260,9 @@ p.sw<-function(fn_data,stgs_alist,wd,fn_cmpd_list,mode,readMethod="mzR",archdir=
no_drama_mkdir(combdir) no_drama_mkdir(combdir)
no_drama_mkdir(archdir) no_drama_mkdir(archdir)
fn_arch<-file.path(archdir,"archive") fn_arch<-file.path(archdir,"archive")
RMassBank::msmsWorkflow(zz, steps=8, mode=mode, archivename = fn_arch) res<-RMassBank::msmsWorkflow(zz, steps=8, mode=mode, archivename = fn_arch)
names(res)<-paste(combdir,".yml",sep='') #Clearly a hack.
res
} else { } else {
z<-parallel::clusterMap(cl,fnocomb,fn_data,stgs_alist,wd) z<-parallel::clusterMap(cl,fnocomb,fn_data,stgs_alist,wd)
names(z)<-basename(fn_data) names(z)<-basename(fn_data)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment