--- a/average_fst.xml	Fri Sep 28 11:57:18 2012 -0400
+++ b/average_fst.xml	Tue Oct 23 12:41:52 2012 -0400
@@ -1,8 +1,8 @@
-<tool id="gd_average_fst" name="Overall FST" version="1.0.0">
+<tool id="gd_average_fst" name="Overall FST" version="1.1.0">
   <description>: Estimate the relative fixation index between two populations</description>
 
   <command interpreter="python">
-    average_fst.py "$input" "$p1_input" "$p2_input" "$data_source.ds_choice" "$data_source.min_value" "$discard_fixed" "$biased" "$output"
+    average_fst.py "$input" "$p1_input" "$p2_input" "$data_source.ds_choice" "$data_source.min_value" "$discard_fixed" "$output"
     #if $use_randomization.ur_choice == '1'
       "$use_randomization.shuffles" "$use_randomization.p0_input"
     #else
@@ -37,11 +37,6 @@
       <option value="1" selected="true">Delete SNPs that appear fixed in the two populations</option>
     </param>
 
-    <param name="biased" type="select" label="FST estimator">
-      <option value="0" selected="true">Wright's original definition</option>
-      <option value="1">Weir's unbiased estimator</option>
-    </param>
-
     <conditional name="use_randomization">
       <param name="ur_choice" type="select" format="integer" label="Use randomization">
         <option value="0" selected="true">No</option>
@@ -67,7 +62,6 @@
       <param name="ds_choice" value="0" />
       <param name="min_value" value="3" />
       <param name="discard_fixed" value="1" />
-      <param name="biased" value="0" />
       <param name="ur_choice" value="0" />
       <output name="output" file="test_out/average_fst/average_fst.txt" />
     </test>
@@ -77,37 +71,36 @@
 
 **What it does**
 
-The user specifies a SNP table and two "populations" of individuals,
-both previously defined using the Specify Individuals tool.
-No individual can be in both populations.  Other choices are as follows.
+The user specifies a SNP table and two "populations" of individuals, both previously defined using the Galaxy tool to specify individuals from a SNP table. No individual can be in both populations. Other choices are as follows.
+
+Data source. The allele frequencies of a SNP in the two populations can be estimated either by the total number of reads of each allele, or by adding the frequencies inferred from genotypes of individuals in the populations.
+
+After specifying the data source, the user sets lower bounds on amount of data required at a SNP. For estimating the FST using read counts, the bound is the minimum count of reads of the two alleles in a population. For estimations based on genotype, the bound is the minimum reported genotype quality per individual. SMPs not meeting these lower bounds are ignored.
+
+The user specifies whether SNPs where both populations appear to be fixed for the same allele should be retained or discarded.
 
-Data source.  The allele frequencies of a SNP in the two populations can be
-estimated either by the total number of reads of each allele, or by adding
-the frequencies inferred from genotypes of individuals in the populations.
+Finally, the user decides whether to use randomizations. If so, then the user specifies how many randomly generated population pairs (retaining the numbers of individuals of the originals) to generate, as well as the "population" of additional individuals (not in the first two populations) that can be used in the randomization process.
 
-After specifying the data source, the user sets lower bounds on amount
-of data required at a SNP.  For estimating the Fst using read counts,
-the bound is the minimum count of reads of the two alleles in a population.
-For estimations based on genotype, the bound is the minimum reported genotype
-quality per individual.  SNPs not meeting these lower bounds are ignored.
+The program prints the following measures of FST for the two populations.
+1. The formulation by Sewall Wright (average over FSTs for all SNPs).
+2. The Weir-Cockerham estimator (average over FSTs for all SNPs).
+3. The Reich-Patterson estimator (average over FSTs for all SNPs).
+4. The population-based Reich-Patterson estimator.
 
-The user specifies whether SNPs where both populations appear to be fixed
-for the same allele should be retained or discarded.
+If randomizations were requested, it prints a summary for each of the four definitions of FST that includes the maximum and average value, and the highest-scoring population pair (if any scored higher than the two user-specified populations).
+
+References:
 
-The user chooses which definition of Fst to use: Wright's original definition
-or Weir's unbiased estimator.
+Sewall Wright (1951) The genetical structure of populations. Ann Eugen 15:323-354.
+
+B. S. Weir and C. Clark Cockerham (1984) Estimating F-statistics for the analysis of population structure. Evolution 38:1358-1370.
 
-Finally, the user decides whether to use randomizations.  If so, then the
-user specifies how many randomly generated population pairs (retaining
-the numbers of individuals of the originals) to generate, as well as the
-"population" of additional individuals (not in the first two populations)
-that can be used in the randomization process.
+Weir, B.S. 1996. Population substructure. Genetic data analysis II, pp. 161-173. Sinauer Associates, Sundand, MA.
+
+David Reich, Kumarasamy Thangaraj, Nick Patterson, Alkes L. Price, and Lalji Singh (2009) Reconstructing Indian population history. Nature 461:489-494, especially Supplement 2.  
 
-The program prints the average Fst for the original populations and the
-number of SNPs used to compute it.  If randomizations were requested,
-it prints the average Fst for each randomly generated population pair,
-ending with a summary that includes the maximum and average value, and the
-highest-scoring population pair.
+Their effectiveness for computing FSTs when there are many SNPs but few individuals is discussed in the followoing paper.
 
+Eva-Maria Willing, Christine Dreyer, Cock van Oosterhout (2012) Estimates of genetic differentiation measured by FST do not necessarily require large sample sizes when using many SNP markers. PLoS One 7:e42649.
   </help>
 </tool>