# HG changeset patch
# User greg
# Date 1508945445 14400
# Node ID eef0f4704dca4b5485fef4300727206aada589e7
# Parent  24774c743d3162f5b4870a091b4f49c83e3ad24b
Uploaded

diff -r 24774c743d31 -r eef0f4704dca gene_family_phylogeny_builder.xml
--- a/gene_family_phylogeny_builder.xml	Thu Oct 19 08:01:43 2017 -0400
+++ b/gene_family_phylogeny_builder.xml	Wed Oct 25 11:30:45 2017 -0400
@@ -42,6 +42,7 @@
 --min_orthogroup_size $min_orthogroup_size
 --max_orthogroup_size $max_orthogroup_size
 --num_threads \${GALAXY_SLOTS:-4}
+&>proc.log
     ]]></command>
     <inputs>
         <param name="input" format="fasta" type="data_collection" collection_type="list" label="Proteins orthogroup alignments" />
@@ -86,9 +87,7 @@
                     <element name="3722.faa.aln" value="3722.faa.aln"/>
                 </collection>
             </param>
-            <param name="tree_inference" value="raxml"/>
-            <param name="scaffold" value="22Gv1.1"/>
-            <param name="method" value="orthomcl"/>
+            <param name="tree_inference" value="fasttree"/>
             <output_collection name="tree" type="list">
                 <element name="3722.faa.aln.tree" file="3722.faa.aln.tree" ftype="nhx"/>
             </output_collection>
@@ -104,10 +103,11 @@
 **Required options**
 
  * **Orthogroup alignments** - orthogroup alignment fasta files produced by the GeneFamilyAligner tool selected from your history.  Depending on how the GeneFamilyAligner tool was executed, these could either be pre-processed alignments, trimmed alignments or both trimmed and filtered alignments.
- * **Gene family scaffold** - one of the PlantTribes gene family scaffolds installed into Galaxy by the PlantTribes Scaffold Download Data Manager tool.
- * **Protein clustering method** - gene family scaffold protein clustering method as described in the AssemblyPostProcessor tool.
  * **Phylogenetic inference method** - method for estimating orthogroup maximum likelihood (ML) phylogenetic trees.  PlantTribes estimates ML phylogenetic trees using either RAxML or FastTree algorithms.
 
+  - **Gene family scaffold** - one of the PlantTribes gene family scaffolds installed into Galaxy by the PlantTribes Scaffold Download Data Manager tool.  This is used only if RAxML is selected as the phylogenetic inference method.
+  - **Protein clustering method** - gene family scaffold protein clustering method as described in the AssemblyPostProcessor tool.    This is used only if RAxML is selected as the phylogenetic inference method.
+
 **Other options**
 
  * **Rooting order configuration** - select 'Yes' to enable selection of a rooting order configuration file for RAxML.  Scaffold configuration templates (.rootingOrder.config) of how to customize the RAxML ML tree rooting order can be found in the scaffold data installed into Galaxy via the PlantTribes Scaffolds Download Data Manager tool, and is also available at the PlantTribes GitHub `repository`_.  Phylogenetic tree rooting order settings shown in these templates are used as defaults if 'No' is selected.