diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/fasta/FastaAlternateReferenceWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/fasta/FastaAlternateReferenceWalker.java index b9e71ac83..f6d1dee5d 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/fasta/FastaAlternateReferenceWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/fasta/FastaAlternateReferenceWalker.java @@ -18,14 +18,18 @@ public class FastaAlternateReferenceWalker extends RefWalker map(RefMetaDataTracker rodData, ReferenceContext ref, AlignmentContext context) { + String refBase = String.valueOf(ref.getBase()); + if ( deletionBasesRemaining > 0 ) { deletionBasesRemaining--; - return new Pair(context.getLocation(), ""); + return new Pair(context.getLocation(), (SEQUENOM ? (deletionBasesRemaining == 0 ? refBase.concat("]") : refBase) : "")); } Iterator rods = rodData.getAllRods().iterator(); @@ -39,19 +43,16 @@ public class FastaAlternateReferenceWalker extends RefWalker(context.getLocation(), String.valueOf(ref.getBase())); + return new Pair(context.getLocation(), (SEQUENOM ? refBase.concat("[-/") : refBase)); } else if ( variant.isInsertion() ) { - return new Pair(context.getLocation(), String.valueOf(ref.getBase()).concat(variant.getAltBasesFWD())); + return new Pair(context.getLocation(), (SEQUENOM ? refBase.concat("[+/"+variant.getAltBasesFWD()+"]") : refBase.concat(variant.getAltBasesFWD()))); } else if ( variant.isSNP() ) { - if ( MASK_SNPS ) - return new Pair(context.getLocation(), "N"); - else - return new Pair(context.getLocation(), variant.getAltBasesFWD()); + return new Pair(context.getLocation(), (SEQUENOM || MASK_SNPS ? "N" : variant.getAltBasesFWD())); } } // if we got here then we're just ref - return new Pair(context.getLocation(), String.valueOf(ref.getBase())); + return new Pair(context.getLocation(), refBase); } public Pair reduceInit() {