# HG changeset patch
# User greg
# Date 1490196053 14400
# Node ID 7170b072b40a603d62c1fac46eb85000810deb6d
# Parent  7363c4e9423cb2c82aa5bd5173d07e9ba4b92e41
Uploaded

diff -r 7363c4e9423c -r 7170b072b40a macros.xml
--- a/macros.xml	Wed Mar 22 10:38:52 2017 -0400
+++ b/macros.xml	Wed Mar 22 11:20:53 2017 -0400
@@ -55,7 +55,7 @@
             </when>
         </conditional>
     </xml>
-    <xml name="cond_phylogenomic_trees">
+    <xml name="cond_phylogenomic_trees_start">
         <conditional name="phylogenetic_trees_cond">
             <param name="phylogenetic_trees" type="select" label="Set phylogenetic trees options?">
                 <option value="no" selected="true">No</option>
@@ -85,6 +85,14 @@
                 </conditional>
                 <param name="max_orthogroup_size" type="integer" value="100" min="0" label="Maximum number of sequences in orthogroup alignments" />
                 <param name="min_orthogroup_size" type="integer" value="4" min="0" label="Minimum number of sequences in orthogroup alignments" />
+    </xml>
+    <xml name="param_sequence_type">
+        <param name="sequence_type" type="select" label="Sequence type used in the phylogenetic inference (dna)">
+            <option value="protein" selected="true">Amino acid based</option>
+            <option value="dna">Nucleotide based</option>
+        </param>
+    </xml>
+    <xml name="cond_phylogenomic_trees_end">
             </when>
         </conditional>
     </xml>
@@ -120,20 +128,11 @@
             </when>
         </conditional>
     </xml>
-    <xml name="cond_multiple_codon_alignments">
-        <conditional name="multiple_codon_alignments_cond">
-            <param name="multiple_codon_alignments" type="select" label="Construct orthogroup multiple codon alignments?">
-                <option value="no" selected="True">No</option>
-                <option value="yes">Yes</option>
-            </param>
-            <when value="no" />
-            <when value="yes">
-                <param name="sequence_type" type="select" label="Sequence type used in the phylogenetic inference (dna)">
-                    <option value="protein" selected="true">Amino acid based</option>
-                    <option value="dna">Nucleotide based</option>
-                </param>
-            </when>
-        </conditional>
+    <xml name="param_multiple_codon_alignments">
+        <param name="multiple_codon_alignments" type="select" label="Construct orthogroup multiple codon alignments?">
+            <option value="no" selected="True">No</option>
+            <option value="yes">Yes</option>
+        </param>
     </xml>
     <xml name="citations">
         <citations>