# HG changeset patch
# User greg
# Date 1503680437 14400
# Node ID 45a5d26453c32eec354be9abe674bc4ab3fde197
# Parent  4dfc191c7e4e0f56b01a2023dbd790664fb6e333
Uploaded

diff -r 4dfc191c7e4e -r 45a5d26453c3 gene_family_phylogeny_builder.xml
--- a/gene_family_phylogeny_builder.xml	Thu Aug 24 13:33:23 2017 -0400
+++ b/gene_family_phylogeny_builder.xml	Fri Aug 25 13:00:37 2017 -0400
@@ -59,7 +59,6 @@
 --min_orthogroup_size $min_orthogroup_size
 --max_orthogroup_size $max_orthogroup_size
 --num_threads \${GALAXY_SLOTS:-4}
-#set output_pttree_dir = $output_pttree_dir_cond.output_pttree_dir
 #if str($output_pttree_dir) == 'yes':
     --output_tree '$output_tree'
     --output_tree_dir '$output_tree.files_path'
@@ -133,21 +132,17 @@
         </conditional>
         <param name="max_orthogroup_size" type="integer" value="100" min="4" label="Maximum orthogroup size" />
         <param name="min_orthogroup_size" type="integer" value="4" min="4" label="Minimum orthogroup size" />
-        <conditional name="output_pttree_dir_cond">
-            <param name="output_pttree_dir" type="select" label="Output additional directory of phylogenetic tree files?">
-                <option value="no" selected="true">No</option>
-                <option value="yes">Yes</option>
-            </param>
-            <when value="no" />
-            <when value="yes" />
-        </conditional>
+        <param name="output_pttree_dir" type="select" label="Output additional directory of phylogenetic tree files?">
+            <option value="no" selected="true">No</option>
+            <option value="yes">Yes</option>
+        </param>
     </inputs>
     <outputs>
         <collection name="tree" type="list" label="${tool.name} (phylogenetic trees, dataset collection) on ${on_string}">
             <discover_datasets pattern="__name__" directory="geneFamilyPhylogenies_dir/orthogroups_tree" format="nhx" />
         </collection>
         <data name="output_tree" format="pttree" label="${tool.name} (phylogenetic trees, directory) on ${on_string}">
-            <filter>output_pttree_dir_cond['output_pttree_dir'] == 'yes'</filter>
+            <filter>output_pttree_dir == 'yes'</filter>
         </data>
         <data name="output_phylip" format="ptphylip" label="${tool.name} (orthogroup phylip multiple sequence alignments) on ${on_string}">
             <filter>tree_inference_cond['tree_inference'] == 'raxml'</filter>