diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/CreateSequenomMask.java b/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/CreateSequenomMask.java index 9593880cc..19c272bbf 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/CreateSequenomMask.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/CreateSequenomMask.java @@ -6,6 +6,7 @@ import org.broadinstitute.sting.gatk.contexts.ReferenceContext; import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker; import org.broadinstitute.sting.gatk.walkers.RodWalker; import org.broadinstitute.sting.commandline.Output; +import org.broadinstitute.sting.utils.GenomeLoc; import java.io.PrintStream; @@ -25,7 +26,8 @@ public class CreateSequenomMask extends RodWalker { int result = 0; for ( VariantContext vc : tracker.getAllVariantContexts(ref) ) { if ( vc.isSNP() ) { - out.println(context.getLocation()); + GenomeLoc loc = context.getLocation(); + out.println(loc.getContig() + "\t" + (loc.getStart()-1) + "\t" + loc.getStop()); result = 1; break; } diff --git a/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/PickSequenomProbes.java b/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/PickSequenomProbes.java index f9bc74d7d..466184da6 100755 --- a/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/PickSequenomProbes.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/PickSequenomProbes.java @@ -26,6 +26,7 @@ package org.broadinstitute.sting.gatk.walkers.sequenom; import net.sf.samtools.util.CloseableIterator; +import org.broad.tribble.bed.BEDCodec; import org.broad.tribble.dbsnp.DbSNPCodec; import org.broad.tribble.util.variantcontext.Allele; import org.broad.tribble.util.variantcontext.VariantContext; @@ -44,6 +45,7 @@ import org.broadinstitute.sting.utils.GenomeLocParser; import org.broadinstitute.sting.commandline.Argument; import org.broadinstitute.sting.commandline.Output; +import java.io.File; import java.util.*; import java.io.PrintStream; @@ -88,19 +90,18 @@ public class PickSequenomProbes extends RodWalker { if ( SNP_MASK != null ) { logger.info("Loading SNP mask... "); ReferenceOrderedData snp_mask; - if ( SNP_MASK.contains(DbSNPHelper.STANDARD_DBSNP_TRACK_NAME)) { + //if ( SNP_MASK.contains(DbSNPHelper.STANDARD_DBSNP_TRACK_NAME)) { RMDTrackBuilder builder = new RMDTrackBuilder(getToolkit().getReferenceDataSource().getReference().getSequenceDictionary(),getToolkit().getGenomeLocParser(),getToolkit().getArguments().unsafe); - RMDTrack track = builder.createInstanceOfTrack(DbSNPCodec.class,new java.io.File(SNP_MASK)); + RMDTrack track = builder.createInstanceOfTrack(BEDCodec.class, new File(SNP_MASK)); snpMaskIterator = new SeekableRODIterator(track.getHeader(), track.getSequenceDictionary(), getToolkit().getReferenceDataSource().getReference().getSequenceDictionary(), getToolkit().getGenomeLocParser(), track.getIterator()); - - } else { - // TODO: fix me when Plink is back - throw new IllegalArgumentException("We currently do not support other snp_mask tracks (like Plink)"); - } + //} else { + // // TODO: fix me when Plink is back + // throw new IllegalArgumentException("We currently do not support other snp_mask tracks (like Plink)"); + //} } VCs = new VariantCollection();