--- a/dunovo.xml	Fri Mar 23 22:26:23 2018 -0400
+++ b/dunovo.xml	Fri Jun 01 17:55:23 2018 -0400
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
-<tool id="dunovo" name="Du Novo: Make consensus reads" version="2.14">
+<tool id="dunovo" name="Du Novo: Make consensus reads" version="2.15">
   <description>from duplex sequencing alignments</description>
   <requirements>
-    <requirement type="package" version="2.14">dunovo</requirement>
+    <requirement type="package" version="2.15">dunovo</requirement>
     <!-- TODO: require Python 2.7 -->
   </requirements>
   <version_command>make-consensi.py --version</version_command>
   <command detect_errors="exit_code">
-    make-consensi.py --galaxy $phone --processes \${GALAXY_SLOTS:-1} --min-reads $min_reads --qual $qual_thres --qual-format $qual_format --cons-thres $cons_thres --min-cons-reads $min_cons_reads '$input' --dcs1 '$dcs1' --dcs2 '$dcs2'
+    make-consensi.py --galaxy $phone --processes \${GALAXY_SLOTS:-1}
+    #if $out_format.type == 'fastq':
+      --fastq-out $out_format.qual
+    #end if
+    --qual $qual_thres --qual-format $qual_format --min-reads $min_reads --cons-thres $cons_thres --min-cons-reads $min_cons_reads '$input' --dcs1 '$dcs1' --dcs2 '$dcs2'
     #if $keep_sscs:
       --sscs1 '$sscs1' --sscs2 '$sscs2'
     #end if
@@ -15,8 +19,17 @@
   <inputs>
     <param name="input" type="data" format="tabular" label="Aligned input reads" />
     <param name="min_reads" type="integer" value="3" min="1" label="Minimum reads for a consensus" help="This many reads are necessary to form a single-strand consensus sequence. Families smaller than this will be skipped."/>
-    <param name="cons_thres" type="float" value="0.5" min="0.5" max="1.0" label="Consensus % threshold" help="The consensus base must be present in more than this fraction of the reads, or &quot;N&quot; will be used."/>
-    <param name="min_cons_reads" type="integer" value="0" min="0" label="Minimum number of reads for a consensus base." help="If no base at the position appears in at least this many reads, &quot;N&quot; will be used."/>
+    <param name="cons_thres" type="float" value="0.5" min="0.5" max="1.0" label="Consensus % threshold" help="The consensus base must be present in more than this fraction of the reads, or &quot;N&quot; will be used instead."/>
+    <param name="min_cons_reads" type="integer" value="0" min="0" label="Minimum number of reads for a consensus base." help="The consensus base must be present in more than this absolute number of reads, or &quot;N&quot; will be used instead."/>
+    <conditional name="out_format">
+      <param name="type" type="select" label="Output format">
+        <option value="fasta" selected="true">FASTA</option>
+        <option value="fastq">FASTQ</option>
+      </param>
+      <when value="fastq">
+        <param name="qual" type="integer" value="40" min="0" max="93" label="Output PHRED score" help="There is currently no way to output a meaningful quality score for consensus bases. You'll have to specify an artificial one, which will be given to every base. A good value is 40, the maximum score normally output by sequencers. This means the bases won't be inadvertently filtered out by some downstream tool."/>
+      </when>
+    </conditional>
     <param name="qual_thres" type="integer" value="25" min="1" label="Minimum base quality" help="Bases with a PHRED score less than this will not be counted in the consensus making."/>
     <param name="qual_format" type="select" label="FASTQ format" help="Solexa should also work for Illumina 1.3+ and 1.5+, and Sanger should work for Illumina 1.8+">
       <option value="sanger" selected="true">Sanger (PHRED 0 = &quot;!&quot;)</option>
@@ -26,13 +39,31 @@
     <param name="phone" type="boolean" truevalue="--phone-home" falsevalue="" checked="False" label="Send usage data" help="Report helpful usage data to the developer, to better understand the use cases and performance of the tool. The only data which will be recorded is the name and version of the tool, the size of the input data, the number of processes used, the time and memory taken to process it, and the IP address of the machine running it. Also, if the tool fails, it will report the name of the exception thrown and the line of code it occurred in. The parameters and input/output dataset names are not sent. All the reporting and recording code is available at https://github.com/NickSto/ET."/>
   </inputs>
   <outputs>
-    <data name="dcs1" format="fasta" label="$tool.name on $on_string (mate 1)"/>
-    <data name="dcs2" format="fasta" label="$tool.name on $on_string (mate 2)"/>
-    <data name="sscs1" format="fasta" label="$tool.name on $on_string (SSCS mate 1)">
+    <data name="dcs1" label="$tool.name on $on_string (mate 1)">
+      <change_format>
+        <when input="out_format.type" value="fasta" format="fasta"/>
+        <when input="out_format.type" value="fastq" format="fastq"/>
+      </change_format>
+    </data>
+    <data name="dcs2" label="$tool.name on $on_string (mate 2)">
+      <change_format>
+        <when input="out_format.type" value="fasta" format="fasta"/>
+        <when input="out_format.type" value="fastq" format="fastq"/>
+      </change_format>
+    </data>
+    <data name="sscs1" label="$tool.name on $on_string (SSCS mate 1)">
       <filter>keep_sscs</filter>
+      <change_format>
+        <when input="out_format.type" value="fasta" format="fasta"/>
+        <when input="out_format.type" value="fastq" format="fastq"/>
+      </change_format>
     </data>
-    <data name="sscs2" format="fasta" label="$tool.name on $on_string (SSCS mate 2)">
+    <data name="sscs2" label="$tool.name on $on_string (SSCS mate 2)">
       <filter>keep_sscs</filter>
+      <change_format>
+        <when input="out_format.type" value="fasta" format="fasta"/>
+        <when input="out_format.type" value="fastq" format="fastq"/>
+      </change_format>
     </data>
   </outputs>
   <tests>