diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRefWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRefWalker.java
index d1545f159..7c7d6417a 100644
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRefWalker.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsByRefWalker.java
@@ -25,7 +25,10 @@
package org.broadinstitute.sting.gatk.walkers.qc;
+import org.broad.tribble.Feature;
import org.broadinstitute.sting.commandline.Argument;
+import org.broadinstitute.sting.commandline.Input;
+import org.broadinstitute.sting.commandline.RodBinding;
import org.broadinstitute.sting.gatk.contexts.AlignmentContext;
import org.broadinstitute.sting.gatk.contexts.ReferenceContext;
import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker;
@@ -33,25 +36,55 @@ import org.broadinstitute.sting.gatk.walkers.RefWalker;
import org.broadinstitute.sting.utils.collections.ExpandingArrayList;
import org.broadinstitute.sting.utils.collections.Pair;
+import java.util.Collections;
+import java.util.List;
+
/**
- * Prints out counts of the number of reference ordered data objects are
- * each locus for debugging RefWalkers.
+ * Prints out counts of the number of reference ordered data objects encountered.
+ *
+ *
+ *
Input
+ *
+ * One or more rod files.
+ *
+ *
+ * Output
+ *
+ * Number of rods seen.
+ *
+ *
+ * Examples
+ *
+ * java -Xmx2g -jar GenomeAnalysisTK.jar \
+ * -R ref.fasta \
+ * -T CountRODsByRef \
+ * -o output.txt \
+ * --rod input.vcf
+ *
+ *
*/
-public class CountRodByRefWalker extends RefWalker, Long>> {
- @Argument(fullName = "verbose", shortName = "v", doc="If true, Countrod will print out detailed information about the rods it finds and locations", required = false)
+public class CountRODsByRefWalker extends RefWalker, Long>> {
+
+ /**
+ * One or more input rod files
+ */
+ @Input(fullName="rod", shortName = "rod", doc="Input VCF file(s)", required=false)
+ public List> rods = Collections.emptyList();
+
+ @Argument(fullName = "verbose", shortName = "v", doc="If true, this tool will print out detailed information about the rods it finds and locations", required = false)
public boolean verbose = false;
- @Argument(fullName = "showSkipped", shortName = "s", doc="If true, CountRod will print out the skippped locations", required = false)
+ @Argument(fullName = "showSkipped", shortName = "s", doc="If true, this tool will print out the skipped locations", required = false)
public boolean showSkipped = false;
- CountRodWalker crw = new CountRodWalker();
+ CountRODsWalker crw = new CountRODsWalker();
public void initialize() {
crw.verbose = verbose;
crw.showSkipped = showSkipped;
}
- public CountRodWalker.Datum map(RefMetaDataTracker tracker, ReferenceContext ref, AlignmentContext context) {
+ public CountRODsWalker.Datum map(RefMetaDataTracker tracker, ReferenceContext ref, AlignmentContext context) {
return crw.map(tracker, ref, context);
}
@@ -59,7 +92,7 @@ public class CountRodByRefWalker extends RefWalker, Long> reduce(CountRodWalker.Datum point, Pair, Long> sum) {
+ public Pair, Long> reduce(CountRODsWalker.Datum point, Pair, Long> sum) {
return crw.reduce(point, sum);
}
}
\ No newline at end of file
diff --git a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsWalker.java b/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsWalker.java
index 04d04c2c4..edbd5ff75 100644
--- a/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsWalker.java
+++ b/public/java/src/org/broadinstitute/sting/gatk/walkers/qc/CountRODsWalker.java
@@ -64,13 +64,13 @@ import java.util.*;
*
* java -Xmx2g -jar GenomeAnalysisTK.jar \
* -R ref.fasta \
- * -T CountRod \
+ * -T CountRODs \
* -o output.txt \
* --rod input.vcf
*
*
*/
-public class CountRodWalker extends RodWalker, Long>> implements TreeReducible, Long>> {
+public class CountRODsWalker extends RodWalker, Long>> implements TreeReducible, Long>> {
@Output
public PrintStream out;
@@ -80,10 +80,10 @@ public class CountRodWalker extends RodWalker> rods = Collections.emptyList();
- @Argument(fullName = "verbose", shortName = "v", doc="If true, CountRod will print out detailed information about the rods it finds and locations", required = false)
+ @Argument(fullName = "verbose", shortName = "v", doc="If true, this tool will print out detailed information about the rods it finds and locations", required = false)
public boolean verbose = false;
- @Argument(fullName = "showSkipped", shortName = "s", doc="If true, CountRod will print out the skipped locations", required = false)
+ @Argument(fullName = "showSkipped", shortName = "s", doc="If true, this tool will print out the skipped locations", required = false)
public boolean showSkipped = false;
@Override