diff --git a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java index 168fe0d09..dff984e25 100644 --- a/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java +++ b/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisTK.java @@ -98,7 +98,7 @@ public class GenomeAnalysisTK extends CommandLineProgram { protected void setupArgs() { m_parser.addRequiredArg("input_file", "I", "SAM or BAM file", "INPUT_FILE"); m_parser.addOptionalArg("maximum_reads", "M", "Maximum number of reads to process before exiting", "MAX_READS_ARG"); - m_parser.addOptionalArg("validation_strictness", "S", "How strict should we be with validation", "STRICTNESS_ARG"); + m_parser.addOptionalArg("validation_strictness", "S", "How strict should we be with validation (lenient|silent|strict)", "STRICTNESS_ARG"); m_parser.addOptionalArg("reference_sequence", "R", "Reference sequence file", "REF_FILE_ARG"); m_parser.addOptionalArg("genome_region", "L", "Genome region to operation on: from chr:start-end", "REGION_STR"); m_parser.addRequiredArg("analysis_type", "T", "Type of analysis to run", "Analysis_Name"); diff --git a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java index 2284b0a84..2c07987e8 100755 --- a/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java +++ b/java/src/org/broadinstitute/sting/playground/gatk/walkers/AlleleFrequencyWalker.java @@ -18,7 +18,7 @@ import java.io.PrintStream; public class AlleleFrequencyWalker extends LocusWalker { @Argument public int N; - @Argument public int DOWNSAMPLE; + @Argument(required=false,defaultValue="0") public int DOWNSAMPLE; @Argument public String GFF_OUTPUT_FILE; protected static Logger logger = Logger.getLogger(AlleleFrequencyWalker.class); @@ -32,6 +32,18 @@ public class AlleleFrequencyWalker extends LocusWalker reads = context.getReads(); + for (int i = 0; i < reads.size(); i++) + { + String cigar = reads.get(i).getCigarString(); + System.out.println("DEBUG " + cigar); + } + } + */ + logger.debug(String.format("In alleleFrequnecy walker: N=%d, d=%d", N, DOWNSAMPLE)); if ((DOWNSAMPLE != 0) && (DOWNSAMPLE < bases.length())) @@ -99,7 +111,8 @@ public class AlleleFrequencyWalker extends LocusWalker