Mercurial > repos > crs4 > edena

diff edena_ovl_wrapper.xml @ 2:b8c6a38530eb draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support Edena v. 3.131028 (new <version_command>, official overlapping log file, covStats output file removed, -lph and -sph options instead of -peHorizon). Use $GALAXY_SLOTS instead of $EDENA _SITE_OPTIONS. Directly call edena, remove edena_ovl_wrapper.py and edena_ass_wrapper.py . Discard stderr instead of redirecting to stdout. Do not redirect stdout to logfile. Add readme.rst .
author crs4
date Fri, 31 Jan 2014 12:08:21 -0500
parents cd6cc6d76708
children
line wrap: on
line diff
--- a/edena_ovl_wrapper.xml	Fri Oct 18 14:09:11 2013 -0400
+++ b/edena_ovl_wrapper.xml	Fri Jan 31 12:08:21 2014 -0500
@@ -1,75 +1,75 @@
-<tool id="edena_ovl_wrapper" name="Edena (overlapping)" version="0.2.2">
+<tool id="edena_ovl_wrapper" name="Edena (overlapping)" version="0.3">
   <description></description>
   <requirements>
-    <requirement type="package" version="3.130110">edena</requirement>
+    <requirement type="package" version="3.131028">edena</requirement>
   </requirements>
-  <version_command>edena -v</version_command>
-  <command interpreter="python">
-    edena_ovl_wrapper.py
-    \${EDENA_SITE_OPTIONS:---nThreads 2}
+  <version_command>edena | head -n 1</version_command>
+  <command>
+    edena
+    -nThreads \${GALAXY_SLOTS:-2}
     #if $input_selection.input == "unpaired_file"
+      -r
       #for $ui in $input_selection.unpaired_input
-        --unpaired_input=${ui.unpaired_file}
+        ${ui.unpaired_file}
       #end for
     #elif $input_selection.input == "dr_pairs"
+      -DRpairs
       #for $dpi in $input_selection.dr_pairs_input
-        --dr_pair_1=${dpi.dr_pair_1}
-        --dr_pair_2=${dpi.dr_pair_2}
+        ${dpi.dr_pair_1} ${dpi.dr_pair_2}
       #end for
     #elif $input_selection.input == "rd_pairs"
+      -RDpairs
       #for $rpi in $input_selection.rd_pairs_input
-        --rd_pair_1=${rpi.rd_pair_1}
-        --rd_pair_2=${rpi.rd_pair_2}
+        ${rpi.rd_pair_1} ${rpi.rd_pair_2}
       #end for
     #end if
     #if str($minOlap)
-      --minOlap=$minOlap
+      -M $minOlap
     #end if
     #if str($readsTruncation)
-      --readsTruncation=$readsTruncation
+      -t $readsTruncation
     #end if
-    --output=$output
-    --logfile=$logfile
+    2&gt;/dev/null ## need to discard stderr because edena writes some progress info there (e.g. "Computing overlaps >=30...")
   </command>
 
   <inputs>
     <conditional name="input_selection">
       <param name="input" type="select" label="Select input type">
         <option value="unpaired_file">Unpaired files</option>
-        <option value="dr_pairs">Direct-reverse paired-end files</option>
-        <option value="rd_pairs">Reverse-direct paired-end files</option>
+        <option value="dr_pairs">Paired-end (forward-reverse) files</option>
+        <option value="rd_pairs">Mate-pair (reverse-forward) files</option>
       </param>
 
       <when value="unpaired_file">
-        <repeat name="unpaired_input" title="Unpaired inputs (-r)" min="1">
+        <repeat name="unpaired_input" title="Unpaired input" help="(-r)" min="1">
           <param name="unpaired_file" type="data" format="fasta,fastq" label="Unpaired file" help="FASTA or FASTQ format" />
         </repeat>
       </when>
 
       <when value="dr_pairs">
-        <repeat name="dr_pairs_input" title="DR paired-end inputs (-DRpairs, -paired)" min="1">
-          <param name="dr_pair_1" type="data" format="fasta,fastq" label="DR paired-end file 1" help="FASTA or FASTQ format" />
-          <param name="dr_pair_2" type="data" format="fasta,fastq" label="DR paired-end file 2" help="FASTA or FASTQ format" />
+        <repeat name="dr_pairs_input" title="Paired-end (forward-reverse) file" help="(-DRpairs, -paired)" min="1">
+          <param name="dr_pair_1" type="data" format="fasta,fastq" label="Paired-end file 1" help="FASTA or FASTQ format" />
+          <param name="dr_pair_2" type="data" format="fasta,fastq" label="Paired-end file 2" help="FASTA or FASTQ format" />
         </repeat>
       </when>
 
       <when value="rd_pairs">
-        <repeat name="rd_pairs_input" title="RD paired-end inputs (-RDpairs, -matePairs)" min="1">
-          <param name="rd_pair_1" type="data" format="fasta,fastq" label="RD paired-end file 1" help="FASTA or FASTQ format" />
-          <param name="rd_pair_2" type="data" format="fasta,fastq" label="RD paired-end file 2" help="FASTA or FASTQ format" />
+        <repeat name="rd_pairs_input" title="Mate-pair (reverse-forward) file" help="(-RDpairs, -matePairs)" min="1">
+          <param name="rd_pair_1" type="data" format="fasta,fastq" label="Mate-pair file 1" help="FASTA or FASTQ format" />
+          <param name="rd_pair_2" type="data" format="fasta,fastq" label="Mate-pair file 2" help="FASTA or FASTQ format" />
         </repeat>
       </when>
     </conditional>
 
     <param name="minOlap" type="integer" value="" optional="true" label="Minimum overlap size to compute (-M)" help="If not specified, this value is set to half of the reads length. When the sequencing coverage is sufficient, you can increase this value which will reduce the computational time. Edena will compute the overlaps whose sizes range from this value to the reads length." />
 
-    <param name="readsTruncation" type="integer" value="" optional="true" label="3' end reads truncation (-t)" help="Use this option to truncate the 3’end of the reads such that the resulting length is the inserted value. You may consider reads truncation since it can significantly improve the assembly. Since Edena computes exact overlaps, only error free reads can take part to the assembly. Since errors are likely to occur at the 3’ ends, shortening the reads by some nucleotides may increase the number of errors-free reads in the dataset, and thus increase the assembly performance." />
+    <param name="readsTruncation" type="integer" value="" optional="true" label="3' end reads truncation (-t)" help="Use this option to truncate the 3’end of the reads to the specified length. You may consider reads truncation since it can significantly improve the assembly. Since Edena computes exact overlaps, only error free reads can take part to the assembly. Since errors are likely to occur at the 3’ ends, shortening the reads by some nucleotides may increase the number of errors-free reads in the dataset, and thus increase the assembly performance." />
 
   </inputs>
 
   <outputs>
-    <data name="logfile" format="txt" label="${tool.name} on ${on_string}: log" />
-    <data name="output" format="ovl" label="${tool.name} on ${on_string}: overlapping" />
+    <data name="logfile" format="txt" label="${tool.name} on ${on_string}: log" from_work_dir="out_overlapping.log" />
+    <data name="output" format="ovl" label="${tool.name} on ${on_string}: overlapping" from_work_dir="out.ovl" />
   </outputs>
 
   <tests>
@@ -78,7 +78,9 @@
   <help>
 **What it does**
 
-Edena is an overlaps graph based short reads assembler and is suited to Illumina GA reads. An assembly with Edena is a two step process: overlapping and assembling.
+Edena is an overlaps graph based short reads assembler and is suited to Illumina GA reads. This program requires the reads to be all the same length, as Illumina GA reads are. This is due to historical reasons and because it greatly simplifies several computational steps. 454 or Sanger reads are therefore not suited to Edena. If you provide multiple files with different read lengths, Edena will trim the 3’ end of the reads so that the reads are all the same length as the shortest reads in the file.
+
+An assembly with Edena is a two step process: overlapping and assembling.
 
 In the overlapping step, the reads files are provided to the program which computes the transitively reduced overlaps graph. This structure is then stored together with the sequence reads in the overlapping file.