Merge branch 'master' of ssh://nickel.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable

This commit is contained in:
Ryan Poplin 2012-02-06 11:10:38 -05:00
commit 096c23a473
1 changed files with 14 additions and 15 deletions

View File

@ -71,8 +71,8 @@ public class KeepAFSpectrumFrequencySelector extends FrequencyModeSelector {
// recompute AF,AC,AN based on genotypes: // recompute AF,AC,AN based on genotypes:
// todo - - maybe too inefficient?? // todo - - maybe too inefficient??
VariantContextUtils.calculateChromosomeCounts(vc, attributes, false); VariantContextUtils.calculateChromosomeCounts(vc, attributes, false);
afArray = new double[] {Double.valueOf((String)attributes.get(VCFConstants.ALLELE_FREQUENCY_KEY))}; }
} else {
// sites-only vc or we explicitly tell to ignore genotypes; we trust the AF field if present // sites-only vc or we explicitly tell to ignore genotypes; we trust the AF field if present
if ( vc.hasAttribute(VCFConstants.ALLELE_FREQUENCY_KEY) ) { if ( vc.hasAttribute(VCFConstants.ALLELE_FREQUENCY_KEY) ) {
String afo = vc.getAttributeAsString(VCFConstants.ALLELE_FREQUENCY_KEY, null); String afo = vc.getAttributeAsString(VCFConstants.ALLELE_FREQUENCY_KEY, null);
@ -90,7 +90,6 @@ public class KeepAFSpectrumFrequencySelector extends FrequencyModeSelector {
else else
afArray = new double[] {Double.valueOf(afo)}; afArray = new double[] {Double.valueOf(afo)};
} }
}
if (afArray == null ) if (afArray == null )