diff --git a/src/main/java/picard/analysis/CollectWgsMetricsWithNonZeroCoverage.java b/src/main/java/picard/analysis/CollectWgsMetricsWithNonZeroCoverage.java index ac8f2003c5..97ae1a1546 100644 --- a/src/main/java/picard/analysis/CollectWgsMetricsWithNonZeroCoverage.java +++ b/src/main/java/picard/analysis/CollectWgsMetricsWithNonZeroCoverage.java @@ -104,6 +104,7 @@ public WgsMetricsWithNonZeroCoverage() { public WgsMetricsWithNonZeroCoverage(final IntervalList intervals, final Histogram highQualityDepthHistogram, + final Histogram highQualitDepthHistogramNonZero, final Histogram unfilteredDepthHistogram, final double pctExcludedByAdapter, final double pctExcludedByMapq, @@ -116,7 +117,7 @@ public WgsMetricsWithNonZeroCoverage(final IntervalList intervals, final int coverageCap, final Histogram unfilteredBaseQHistogram, final int sampleSize) { - super(intervals, highQualityDepthHistogram, unfilteredDepthHistogram, pctExcludedByAdapter, pctExcludedByMapq, pctExcludedByDupes, pctExcludedByPairing, pctExcludedByBaseq, + super(intervals, highQualityDepthHistogram, highQualitDepthHistogramNonZero, unfilteredDepthHistogram, pctExcludedByAdapter, pctExcludedByMapq, pctExcludedByDupes, pctExcludedByPairing, pctExcludedByBaseq, pctExcludedByOverlap, pctExcludedByCapping, pctTotal, coverageCap, unfilteredBaseQHistogram, sampleSize); } } @@ -170,6 +171,7 @@ protected int doWork() { @Override protected WgsMetrics generateWgsMetrics(final IntervalList intervals, final Histogram highQualityDepthHistogram, + final Histogram highQualitDepthHistogramNonZero, final Histogram unfilteredDepthHistogram, final double pctExcludedByAdapter, final double pctExcludedByMapq, @@ -207,7 +209,7 @@ protected WgsMetricsCollector getCollector(final int coverageCap, final Interval protected class WgsMetricsWithNonZeroCoverageCollector extends WgsMetricsCollector { Histogram highQualityDepthHistogram; - Histogram highQualityDepthHistogramNonZero; + Histogram highQualityDepthHistogramNonZeroFinal; public WgsMetricsWithNonZeroCoverageCollector(final CollectWgsMetricsWithNonZeroCoverage metrics, final int coverageCap, final IntervalList intervals) { @@ -222,7 +224,7 @@ public void addToMetricsFile(final MetricsFile file, final CountingFilter mapqFilter, final CountingPairedFilter pairFilter) { highQualityDepthHistogram = getDepthHistogram(); - highQualityDepthHistogramNonZero = getDepthHistogramNonZero(); + highQualityDepthHistogramNonZeroFinal = getDepthHistogramNonZero(); // calculate metrics the same way as in CollectWgsMetrics final WgsMetricsWithNonZeroCoverage metrics = (WgsMetricsWithNonZeroCoverage) getMetrics(dupeFilter, adapterFilter, mapqFilter, pairFilter); @@ -239,7 +241,7 @@ public void addToMetricsFile(final MetricsFile file, file.addMetric(metrics); file.addMetric(metricsNonZero); file.addHistogram(highQualityDepthHistogram); - file.addHistogram(highQualityDepthHistogramNonZero); + file.addHistogram(highQualityDepthHistogramNonZeroFinal); if (includeBQHistogram) { addBaseQHistogram(file); @@ -260,7 +262,7 @@ private Histogram getDepthHistogramNonZero() { } public boolean areHistogramsEmpty() { - return (highQualityDepthHistogram.isEmpty() || highQualityDepthHistogramNonZero.isEmpty()); + return (highQualityDepthHistogram.isEmpty() || highQualityDepthHistogramNonZeroFinal.isEmpty()); } } }