Mercurial > repos > greg > gene_family_phylogeny_builder

changeset 29:3d78d366dfcc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Fri, 12 May 2017 14:14:19 -0400
parents 62fe699992a5
children 2de4563e70cf
files gene_family_phylogeny_builder.xml
diffstat 1 files changed, 19 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gene_family_phylogeny_builder.xml	Fri May 12 14:13:56 2017 -0400
+++ b/gene_family_phylogeny_builder.xml	Fri May 12 14:14:19 2017 -0400
@@ -60,6 +60,11 @@
             --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'
+            #end if
         ]]>
     </command>
     <inputs>
@@ -130,14 +135,25 @@
         </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>
     </inputs>
     <outputs>
+        <collection name="tree" type="list" label="GeneFamilyPhylogenyBuilder 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="GeneFamilyPhylogenyBuilder phylogenetic trees (directory) on ${on_string}">
+            <filter>output_pttree_dir_cond['output_pttree_dir'] == 'yes'</filter>
+        </data>
         <data name="output_phylip" format="ptphylip" label="GeneFamilyPhylogenyBuilder orthogroup phylip multiple sequence alignments on ${on_string}">
             <filter>tree_inference_cond['tree_inference'] == 'raxml'</filter>
         </data>
-        <collection name="tree" type="list" label="GeneFamilyPhylogenyBuilder phylogenetic trees on ${on_string}">
-            <discover_datasets pattern="__name__" directory="geneFamilyPhylogenies_dir/orthogroups_tree" format="nhx" />
-        </collection>
     </outputs>
     <tests>
         <test>