diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java index ee081949a..da05815a8 100644 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelGenotyperWalker.java @@ -9,6 +9,7 @@ import org.broadinstitute.sting.gatk.refdata.rodRefSeq; import org.broadinstitute.sting.gatk.walkers.ReadWalker; import org.broadinstitute.sting.gatk.walkers.ReadFilters; import org.broadinstitute.sting.gatk.filters.Platform454Filter; +import org.broadinstitute.sting.gatk.filters.ZeroMappingQualityReadFilter; import org.broadinstitute.sting.playground.utils.CircularArray; import org.broadinstitute.sting.utils.GenomeLoc; @@ -25,7 +26,7 @@ import java.util.List; import java.util.Set; -@ReadFilters(Platform454Filter.class) +@ReadFilters({Platform454Filter.class, ZeroMappingQualityReadFilter.class}) public class IndelGenotyperWalker extends ReadWalker { @Argument(fullName="bed", shortName="bed", doc="BED output file name", required=true) java.io.File bed_file; diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelIntervalWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelIntervalWalker.java index bb5ca3ddb..a35ac496d 100644 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelIntervalWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IndelIntervalWalker.java @@ -2,6 +2,9 @@ package org.broadinstitute.sting.playground.gatk.walkers.indels; import org.broadinstitute.sting.gatk.walkers.ReadWalker; import org.broadinstitute.sting.gatk.walkers.WalkerName; +import org.broadinstitute.sting.gatk.walkers.ReadFilters; +import org.broadinstitute.sting.gatk.filters.Platform454Filter; +import org.broadinstitute.sting.gatk.filters.ZeroMappingQualityReadFilter; import org.broadinstitute.sting.utils.cmdLine.Argument; import org.broadinstitute.sting.utils.*; import net.sf.samtools.SAMRecord; @@ -15,6 +18,7 @@ import java.util.List; // although this can easily be changed if necessary. @WalkerName("IndelIntervals") +@ReadFilters({Platform454Filter.class, ZeroMappingQualityReadFilter.class}) public class IndelIntervalWalker extends ReadWalker { @Argument(fullName="allow454Reads", shortName="454", doc="process 454 reads", required=false) boolean allow454 = false; diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalCleanerWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalCleanerWalker.java index a6e45fac1..695dbee32 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalCleanerWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalCleanerWalker.java @@ -7,6 +7,7 @@ import org.broadinstitute.sting.gatk.walkers.WalkerName; import org.broadinstitute.sting.gatk.walkers.ReadFilters; import org.broadinstitute.sting.gatk.LocusContext; import org.broadinstitute.sting.gatk.filters.Platform454Filter; +import org.broadinstitute.sting.gatk.filters.ZeroMappingQualityReadFilter; import org.broadinstitute.sting.utils.cmdLine.Argument; import org.broadinstitute.sting.playground.indels.*; @@ -17,7 +18,7 @@ import java.io.File; import java.io.FileWriter; @WalkerName("IntervalCleaner") -@ReadFilters(Platform454Filter.class) +@ReadFilters({Platform454Filter.class, ZeroMappingQualityReadFilter.class}) public class IntervalCleanerWalker extends LocusWindowWalker { @Argument(fullName="allow454Reads", shortName="454", doc="process 454 reads", required=false) boolean allow454 = false; diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalMergerWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalMergerWalker.java index f80557da2..41de072b4 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalMergerWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/IntervalMergerWalker.java @@ -26,10 +26,9 @@ package org.broadinstitute.sting.playground.gatk.walkers.indels; import net.sf.samtools.SAMRecord; import org.broadinstitute.sting.gatk.GenomeAnalysisEngine; -import org.broadinstitute.sting.gatk.walkers.ReadWalker; -import org.broadinstitute.sting.gatk.walkers.WalkerName; -import org.broadinstitute.sting.gatk.walkers.Requires; -import org.broadinstitute.sting.gatk.walkers.DataSource; +import org.broadinstitute.sting.gatk.filters.Platform454Filter; +import org.broadinstitute.sting.gatk.filters.ZeroMappingQualityReadFilter; +import org.broadinstitute.sting.gatk.walkers.*; import org.broadinstitute.sting.utils.*; import org.broadinstitute.sting.utils.cmdLine.Argument; @@ -39,6 +38,7 @@ import java.util.*; */ @WalkerName("IntervalMerger") @Requires({DataSource.READS}) +@ReadFilters({Platform454Filter.class, ZeroMappingQualityReadFilter.class}) public class IntervalMergerWalker extends ReadWalker { @Argument(fullName="intervalsToMerge", shortName="intervals", doc="Intervals to merge", required=true) diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/MismatchIntervalWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/MismatchIntervalWalker.java index 3c502a3f8..0941e0d6d 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/MismatchIntervalWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/indels/MismatchIntervalWalker.java @@ -5,13 +5,17 @@ import net.sf.samtools.*; import org.broadinstitute.sting.gatk.refdata.*; import org.broadinstitute.sting.gatk.walkers.LocusWalker; import org.broadinstitute.sting.gatk.LocusContext; +import org.broadinstitute.sting.gatk.filters.Platform454Filter; +import org.broadinstitute.sting.gatk.filters.ZeroMappingQualityReadFilter; import org.broadinstitute.sting.utils.*; import org.broadinstitute.sting.gatk.walkers.WalkerName; +import org.broadinstitute.sting.gatk.walkers.ReadFilters; import org.broadinstitute.sting.utils.cmdLine.Argument; import java.util.*; @WalkerName("MismatchIntervals") +@ReadFilters({Platform454Filter.class, ZeroMappingQualityReadFilter.class}) public class MismatchIntervalWalker extends LocusWalker, Pair, GenomeLoc>> { @Argument(fullName="windowSize", shortName="window", doc="window size for calculating entropy", required=false) int windowSize = 10;