Mercurial > repos > galaxyp > cardinal_data_exporter

diff data_exporter.xml @ 3:d94770c22f13 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproteomics/tools-galaxyp/tree/master/tools/cardinal commit 2c4a1a862900b4efbc30824cbcb798f835b168b2
author galaxyp
date Thu, 28 Feb 2019 09:24:07 -0500
parents e30d8b72415f
children e521b5767819
line wrap: on
line diff
--- a/data_exporter.xml	Fri Feb 15 10:17:43 2019 -0500
+++ b/data_exporter.xml	Thu Feb 28 09:24:07 2019 -0500
@@ -224,7 +224,7 @@
         #if str($tabular_annotation.load_annotation) == 'yes_annotation':
 
             colnames(annotation_input) = c("x_values", "y_values", "annotation")
-            spectra_df = merge(annotation_input,spectra_df, by=c("x_values", "y_values"))
+            spectra_df = merge(spectra_df,annotation_input, by=c("x_values", "y_values"), all.x=TRUE)
 
             ## sort columns to have spectra_names as rowname in first column
             #if str($counting_calibrants.pixel_with_calibrants) == "yes_calibrants":