# HG changeset patch
# User greg
# Date 1490272255 14400
# Node ID 6c1cfd0be856ab92baaad91300823d4bbe384830
# Parent  0fc75cdc686aee621a9481c56650c548e2ab9ff3
Uploaded

diff -r 0fc75cdc686a -r 6c1cfd0be856 macros.xml
--- a/macros.xml	Thu Mar 23 08:19:44 2017 -0400
+++ b/macros.xml	Thu Mar 23 08:30:55 2017 -0400
@@ -61,25 +61,34 @@
             </when>
         </conditional>
     </xml>
+    <xml name="param_multiple_sequence_alignments">
+        <param name="multiple_sequence_alignments" type="select" label="Set multiple sequence alignments options?">
+            <option value="no" selected="true">No</option>
+            <option value="yes">Yes</option>
+        </param>
+    </xml>
+    <xml name="param_multiple_sequence_alignments_option">
+        <param name="multiple_sequence_alignments_option" type="select" force_select="true" label="Select method for multiple sequence alignments">
+            <option value="create_alignments">Create orthogroup protein multiple sequence alignments including scaffold backbone proteins (MAFFT algorithm)</option>
+            <option value="add_alignments">Add unaligned orthogroup proteins to scaffold backbone multiple sequence alignments (MAFFT algorithm)</option>
+            <option value="pasta_alignments">Create orthogroup protein multiple sequence alignments including scaffold backbone proteins (PASTA algorithm)</option>
+        </param>
+    </xml>
+    <xml name="whens_multiple_sequence_alignments_option_cond">
+        <when value="create_alignments" />
+        <when value="add_alignments" />
+        <when value="pasta_alignments">
+            <param name="pasta_iter_limit" type="integer" value="3" min="0" label="Maximum number of iterations that the PASTA algorithm will execute" />
+        </when>
+    </xml>
     <xml name="cond_multiple_sequence_alignments">
         <conditional name="multiple_sequence_alignments_cond">
-            <param name="multiple_sequence_alignments" type="select" label="Set multiple sequence alignments options?">
-                <option value="no" selected="true">No</option>
-                <option value="yes">Yes</option>
-            </param>
+            <expand macro="param_multiple_sequence_alignments" />
             <when value="no" />
             <when value="yes">
                 <conditional name="multiple_sequence_alignments_option_cond">
-                    <param name="multiple_sequence_alignments_option" type="select" force_select="true" label="Select method for multiple sequence alignments">
-                        <option value="create_alignments">Create orthogroup protein multiple sequence alignments including scaffold backbone proteins (MAFFT algorithm)</option>
-                        <option value="add_alignments">Add unaligned orthogroup proteins to scaffold backbone multiple sequence alignments (MAFFT algorithm)</option>
-                        <option value="pasta_alignments">Create orthogroup protein multiple sequence alignments including scaffold backbone proteins (PASTA algorithm)</option>
-                    </param>
-                    <when value="create_alignments" />
-                    <when value="add_alignments" />
-                    <when value="pasta_alignments">
-                        <param name="pasta_iter_limit" type="integer" value="3" min="0" label="Maximum number of iterations that the PASTA algorithm will execute" />
-                    </when>
+                    <expand macro="whens_multiple_sequence_alignments_option_cond" />
+                    <expand macro="param_multiple_sequence_alignments_option" />
                 </conditional>
             </when>
         </conditional>