Mercurial > repos > tomnl > cameradims
changeset 5:c8db1946f37d draft
planemo upload for repository https://github.com/computational-metabolomics/dma-tools-galaxy commit 578fd07833b93847193666c11744ba0bca1aaf57-dirty
| author | tomnl |
|---|---|
| date | Thu, 03 May 2018 06:59:15 -0400 |
| parents | ba45716d676d |
| children | 2cb6fbcfdad5 |
| files | cameradims.R cameradims.xml |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cameradims.R Thu May 03 06:43:30 2018 -0400 +++ b/cameradims.R Thu May 03 06:59:15 2018 -0400 @@ -81,12 +81,16 @@ if (opt$rule_type=='extended_large'){ + + rule_sep=',' opt$rule_type <- 'user' if(opt$polarity=='pos'){ - opt$rule_path <- read.csv(system.file("rules", "CAMERA_rules_PosFinal_PlusLi.csv", package = "cameraDIMS"), header=TRUE) + opt$rule_path <- system.file("rules", "CAMERA_rules_PosFinal_PlusLi.csv", package = "cameraDIMS") }else{ - opt$rule_path <- read.csv(system.file("rules", "CAMERA_rules_NegFinal_PlusLi.csv", package = "cameraDIMS"), header=TRUE) + opt$rule_path <- system.file("rules", "CAMERA_rules_NegFinal_PlusLi.csv", package = "cameraDIMS") } +}else{ + rule_sep='\t' } cameraOut <- cameraDIMS(data=df, @@ -94,7 +98,7 @@ params_adduct=paramadduct, rule_type=opt$rule_type, rule_pth=opt$rule_path, - rule_sep='\t', + rule_sep=rule_sep, rule_export=rule_export)
--- a/cameradims.xml Thu May 03 06:43:30 2018 -0400 +++ b/cameradims.xml Thu May 03 06:59:15 2018 -0400 @@ -1,4 +1,4 @@ -<tool id="cameradims" name="CAMERA_DIMS" version="0.1.16"> +<tool id="cameradims" name="CAMERA_DIMS" version="0.1.17"> <description>Modification of the R package CAMERA to work on DIMS data</description> <requirements> <requirement type="package" version="3.4.1">R</requirement>