diff averageFragSpectra.R @ 15:70257c77ea04 draft default tip

planemo upload for repository https://github.com/computational-metabolomics/mspurity-galaxy commit cb903cd93f9378cfb5eeb68512a54178dcea7bbc
author tomnl
date Wed, 27 Nov 2019 12:34:20 +0000
parents df2efceff4cd
children
line wrap: on
line diff
--- a/averageFragSpectra.R	Fri Sep 27 09:19:17 2019 -0400
+++ b/averageFragSpectra.R	Wed Nov 27 12:34:20 2019 +0000
@@ -144,14 +144,18 @@
   } else{
     colnames(av_spectra)[1] <- 'grpid'
     av_spectra$grpid <- names(pa@av_spectra)[av_spectra$grpid]
-
-    colnames(av_spectra)[2] <- 'fileid'
-    av_spectra$avid <- 1:nrow(av_spectra)
+    
+    if((length(pa@av_intra_params)>0) || (length(pa@av_inter_params)>0) ){
+        # Add some extra info (only required if av_intra or av_inter performed)
+        colnames(av_spectra)[2] <- 'fileid'
+        av_spectra$avid <- 1:nrow(av_spectra)
+        
+        filenames <- sapply(av_spectra$fileid, function(x) names(pa@fileList)[as.integer(x)])
+        # filenames_galaxy <- sapply(av_spectra$fileid, function(x) basename(pa@fileList[as.integer(x)]))
+        
+        av_spectra = as.data.frame(append(av_spectra, list(filename = filenames), after=2))
+    }
 
-    filenames <- sapply(av_spectra$fileid, function(x) names(pa@fileList)[as.integer(x)])
-    # filenames_galaxy <- sapply(av_spectra$fileid, function(x) basename(pa@fileList[as.integer(x)]))
-
-    av_spectra = as.data.frame(append(av_spectra, list(filename = filenames), after=2))
 
     print(head(av_spectra))
     write.table(av_spectra, opt$out_peaklist, row.names=FALSE, sep='\t')