diff expression_rnaseq_abbased.xml @ 5:f15cdeeba4b4 draft

planemo upload commit 4af7ac25de19ca10b1654820e909c647a2d337b2-dirty
author proteore
date Mon, 19 Mar 2018 10:07:38 -0400
parents 2f95774977ff
children c9943f867413
line wrap: on
line diff
--- a/expression_rnaseq_abbased.xml	Wed Mar 14 11:27:05 2018 -0400
+++ b/expression_rnaseq_abbased.xml	Mon Mar 19 10:07:38 2018 -0400
@@ -12,11 +12,11 @@
 
   #if $inputtype.filetype == "copy_paste": 
   
-    Rscript --vanilla $__tool_directory__/get_data_HPA_v2.R --inputtype copypaste --input '$inputtype.genelist' --header FALSE --proteinatlas $__tool_directory__/proteinatlas.csv --column c1 --select '$options.hpaparams' --output '$output'  
+    Rscript $__tool_directory__/add_expression_HPA.R --inputtype="copypaste" --input='$inputtype.genelist' --atlas="$__tool_directory__/proteinatlas.csv" --select='$options.hpaparams' --output='$output'  
 
   #else 
   
-    Rscript --vanilla $__tool_directory__/get_data_HPA_v2.R --inputtype tabfile --input '$inputtype.genelist' --header '$inputtype.header' --proteinatlas $__tool_directory__/proteinatlas.csv --column '$inputtype.column' --select '$options.hpaparams' --output '$output'  
+    Rscript $__tool_directory__/add_expression_HPA.R --inputtype="tabfile" --input='$inputtype.genelist' --header='$inputtype.header' --atlas="$__tool_directory__/proteinatlas.csv" --column='$inputtype.column' --select='$options.hpaparams' --output='$output'  
 
   #end if
    
@@ -36,23 +36,23 @@
       <param name="genelist" type="data" format="txt,tabular" label="Choose your file" help="This file must imperatively have 1 column filled with Ensembl Gene IDs (ENSG). Please use the ID_Converter tool if this is not the case."/>
       <param name="column" type="text" label="Please specify the column where are your Ensembl gene IDs (e.g : Enter c1 if ENSG ID are in column n°1)" value="c1"/> 
       <param name="header" type="select" label="Does your file have a header?" multiple="false" optional="false"> 
- 		      <option value="TRUE" selected="true">Yes</option>
-          <option value="FALSE" selected="false">No</option>
+ 		      <option value="true" selected="true">Yes</option>
+          <option value="false" selected="false">No</option>
       </param>
     </when>
   </conditional>
   <section name="options" title="RNAseq/Ab-based expression data" expanded="True">   
       <param name="hpaparams" type="select" label="Choose the information from RNAseq/ab-based data you want to add to your list (see below for details)" multiple="True" display="checkboxes"> 
           <option value="Gene" selected="true">Gene name</option>
-          <option value="Gene.description" selected="false">Gene description</option>
+          <option value="Gene description" selected="false">Gene description</option>
           <option value="Evidence">Evidence (at protein level, at transcript level or no evidence)</option>
           <option value="Antibody">Antibody reference</option>
-          <option value="RNA.tissue.category">RNA tissue category</option>
- 		  <option value="Reliability.IH">IH detection level</option>
-          <option value="Reliability.IF">IF detection level</option>
-          <option value="Subcellular.location">Subcellular location</option>
-          <option value="RNA.TS.TPM">RNA tissue specificity abundance in 'Transcript Per Million'</option>
-          <option value="TPM.max.in.non.specific">RNA non-specific tissue abundance in 'Transcript Per Million'</option>
+          <option value="RNA tissue category">RNA tissue category</option>
+ 		  <option value="Reliability (IH)">IH detection level</option>
+          <option value="Reliability (IF)">IF detection level</option>
+          <option value="Subcellular location">Subcellular location</option>
+          <option value="RNA TS TPM">RNA tissue specificity abundance in 'Transcript Per Million'</option>
+          <option value="TPM max in non-specific">RNA non-specific tissue abundance in 'Transcript Per Million'</option>
     </param>
   </section>