diff xcms_fillpeaks.r @ 42:a98dbb09fed1 draft

planemo upload for repository https://github.com/workflow4metabolomics/xcms commit f0d42bca2f34c58c04b55e5990058d479c0ae639
author lecorguille
date Fri, 08 Feb 2019 10:03:17 -0500
parents a3e80894efd3
children eeade1310758
line wrap: on
line diff
--- a/xcms_fillpeaks.r	Fri Nov 09 15:32:33 2018 -0500
+++ b/xcms_fillpeaks.r	Fri Feb 08 10:03:17 2019 -0500
@@ -12,7 +12,6 @@
 #Import the different functions
 source_local <- function(fname){ argv <- commandArgs(trailingOnly=FALSE); base_dir <- dirname(substring(argv[grep("--file=", argv)], 8)); source(paste(base_dir, fname, sep="/")) }
 source_local("lib.r")
-source_local("lib-xcms3.x.x.r")
 
 pkgs <- c("xcms","batch")
 loadAndDisplayPackages(pkgs)
@@ -67,7 +66,6 @@
 
 cat("\n\n")
 
-
 # ----- MAIN PROCESSING INFO -----
 cat("\tMAIN PROCESSING INFO\n")
 
@@ -80,6 +78,10 @@
 
 fillChromPeaksParam <- do.call(paste0(method,"Param"), args)
 print(fillChromPeaksParam)
+
+# back compatibility between xcms-3.0.0 and xcms-3.5.2
+xdata <- updateObject(xdata)
+
 xdata <- fillChromPeaks(xdata, param=fillChromPeaksParam)
 
 if (exists("intval")) {