Fixes for including duplicate reads in the locus traversal; now checks that the ref arg is provided when needed
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@459 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
parent
e842b543c9
commit
dbf2344cef
|
|
@ -251,6 +251,10 @@ public class GenomeAnalysisTK extends CommandLineProgram {
|
||||||
try {
|
try {
|
||||||
LocusWalker<?, ?> walker = (LocusWalker<?, ?>) my_walker;
|
LocusWalker<?, ?> walker = (LocusWalker<?, ?>) my_walker;
|
||||||
|
|
||||||
|
if ( REF_FILE_ARG == null )
|
||||||
|
Utils.scareUser(String.format("Locus-based traversals require a reference file but none was given"));
|
||||||
|
|
||||||
|
|
||||||
if ( INPUT_FILE == null ) {
|
if ( INPUT_FILE == null ) {
|
||||||
if ( walker.requiresReads() )
|
if ( walker.requiresReads() )
|
||||||
Utils.scareUser(String.format("Analysis %s requires reads, but none were given", Analysis_Name));
|
Utils.scareUser(String.format("Analysis %s requires reads, but none were given", Analysis_Name));
|
||||||
|
|
|
||||||
|
|
@ -275,6 +275,7 @@ public abstract class TraversalEngine {
|
||||||
TraversalStatistics.nReads,
|
TraversalStatistics.nReads,
|
||||||
(TraversalStatistics.nSkippedReads * 100.0) / TraversalStatistics.nReads));
|
(TraversalStatistics.nSkippedReads * 100.0) / TraversalStatistics.nReads));
|
||||||
logger.info(String.format(" -> %d unmapped reads", TraversalStatistics.nUnmappedReads));
|
logger.info(String.format(" -> %d unmapped reads", TraversalStatistics.nUnmappedReads));
|
||||||
|
logger.info(String.format(" -> %d duplicate reads", TraversalStatistics.nDuplicates));
|
||||||
logger.info(String.format(" -> %d non-primary reads", TraversalStatistics.nNotPrimary));
|
logger.info(String.format(" -> %d non-primary reads", TraversalStatistics.nNotPrimary));
|
||||||
logger.info(String.format(" -> %d reads with bad alignments", TraversalStatistics.nBadAlignments));
|
logger.info(String.format(" -> %d reads with bad alignments", TraversalStatistics.nBadAlignments));
|
||||||
logger.info(String.format(" -> %d reads with indels", TraversalStatistics.nSkippedIndels));
|
logger.info(String.format(" -> %d reads with indels", TraversalStatistics.nSkippedIndels));
|
||||||
|
|
@ -490,6 +491,10 @@ public abstract class TraversalEngine {
|
||||||
TraversalStatistics.nBadAlignments++;
|
TraversalStatistics.nBadAlignments++;
|
||||||
result = true;
|
result = true;
|
||||||
why = "No alignment start";
|
why = "No alignment start";
|
||||||
|
} else if (rec.getDuplicateReadFlag()) {
|
||||||
|
TraversalStatistics.nDuplicates++;
|
||||||
|
result = true;
|
||||||
|
why = "Duplicate reads";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
result = false;
|
result = false;
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ public class TraversalStatistics {
|
||||||
public static int nNotPrimary;
|
public static int nNotPrimary;
|
||||||
public static int nBadAlignments;
|
public static int nBadAlignments;
|
||||||
public static int nSkippedIndels;
|
public static int nSkippedIndels;
|
||||||
|
public static int nDuplicates;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
reset();
|
reset();
|
||||||
|
|
@ -32,5 +33,6 @@ public class TraversalStatistics {
|
||||||
nNotPrimary = 0;
|
nNotPrimary = 0;
|
||||||
nBadAlignments = 0;
|
nBadAlignments = 0;
|
||||||
nSkippedIndels = 0;
|
nSkippedIndels = 0;
|
||||||
|
nDuplicates = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue