Mercurial > repos > greg > phylogenomics_analysis

changeset 96:ffd50876ec2b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Thu, 23 Mar 2017 09:23:49 -0400
parents 19a961b1cffa
children 7389c8a99491
files macros.xml
diffstat 1 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/macros.xml	Thu Mar 23 09:08:15 2017 -0400
+++ b/macros.xml	Thu Mar 23 09:23:49 2017 -0400
@@ -77,17 +77,11 @@
             <expand macro="options_multiple_sequence_alignments_option" />
         </param>
     </xml>
-    <xml name="cond_multiple_sequence_alignments_option_with_iterative_realignments">
-        <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">
-                <expand macro="options_multiple_sequence_alignments_option" />
-                <option value="iterative_realignments">Iterative orthogroups realignment, trimming and fitering</option>
-            </param>
-            <expand macro="whens_multiple_sequence_alignments_option_cond" />
-            <when value="iterative_realignments">
-                <param name="iterative_realignments" type="integer" value="0" min="0" label="Maximum number of iterations" help="Zero value has no affect"/>
-            </when>
-        </conditional>
+    <xml name="param_multiple_sequence_alignments_option_with_iterative_realignments">
+        <param name="multiple_sequence_alignments_option" type="select" force_select="true" label="Select method for multiple sequence alignments">
+            <expand macro="options_multiple_sequence_alignments_option" />
+            <option value="iterative_realignments">Iterative orthogroups realignment, trimming and fitering</option>
+        </param>
     </xml>
     <xml name="whens_multiple_sequence_alignments_option_cond">
         <when value="create_alignments" />
@@ -114,9 +108,11 @@
             <when value="no" />
             <when value="yes">
                 <conditional name="multiple_sequence_alignments_option_cond">
-                    <expand macro="param_multiple_sequence_alignments_option" />
+                    <expand macro="param_multiple_sequence_alignments_option_with_iterative_realignments" />
                     <expand macro="whens_multiple_sequence_alignments_option_cond" />
-                    <expand macro="cond_multiple_sequence_alignments_option_with_iterative_realignments" />
+                    <when value="iterative_realignments">
+                        <param name="iterative_realignments" type="integer" value="0" min="0" label="Maximum number of iterations" help="Zero value has no affect"/>
+                    </when>
                 </conditional>
             </when>
         </conditional>