zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolving merge conflicts

This commit is contained in:
Eric Banks 2011-08-15 12:28:05 -04:00
parent ca9bb841c3 9ddbfdcb9f
commit 3d56bbf087
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/java/src/org/broadinstitute/sting/gatk/walkers/fasta/FastaAlternateReferenceWalker.java
View File

@ -66,8 +66,10 @@ public class FastaAlternateReferenceWalker extends FastaReferenceWalker {
String refBase = String.valueOf((char)ref.getBase()); String refBase = String.valueOf((char)ref.getBase());
// Check to see if we have a called snp // Check to see if we have a called snp
for ( VariantContext vc : tracker.getValues(VariantContext.class) ) { for ( VariantContext vc : tracker.getValues(variants) ) {
if ( ! vc.getSource().equals(snpmask.getName())) { if ( vc.isFiltered() )
continue;
if ( vc.isDeletion()) { if ( vc.isDeletion()) {
deletionBasesRemaining = vc.getReference().length(); deletionBasesRemaining = vc.getReference().length();
// delete the next n bases, not this one // delete the next n bases, not this one
@ -78,7 +80,6 @@ public class FastaAlternateReferenceWalker extends FastaReferenceWalker {
return new Pair<GenomeLoc, String>(context.getLocation(), vc.getAlternateAllele(0).toString()); return new Pair<GenomeLoc, String>(context.getLocation(), vc.getAlternateAllele(0).toString());
} }
} }
}
// if we don't have a called site, and we have a mask at this site, mask it // if we don't have a called site, and we have a mask at this site, mask it
for ( VariantContext vc : tracker.getValues(snpmask) ) { for ( VariantContext vc : tracker.getValues(snpmask) ) {