diff --git a/public/bammetrics/src/main/scala/nl/lumc/sasc/biopet/pipelines/bammetrics/BamMetrics.scala b/public/bammetrics/src/main/scala/nl/lumc/sasc/biopet/pipelines/bammetrics/BamMetrics.scala index 86519c3984fc337253bcccfef2987674ef4a7fb9..6d2f519aa61b3c1da262c694d5e16e54a913c582 100644 --- a/public/bammetrics/src/main/scala/nl/lumc/sasc/biopet/pipelines/bammetrics/BamMetrics.scala +++ b/public/bammetrics/src/main/scala/nl/lumc/sasc/biopet/pipelines/bammetrics/BamMetrics.scala @@ -88,8 +88,9 @@ class BamMetrics(val root: Configurable) extends QScript with SummaryQScript wit for (bedFile <- bedFiles) { //TODO: Add target jobs to summary - val targetDir = new File(outputDir, bedFile.getName.stripSuffix(".bed")) - val targetInterval = BedToInterval(this, bedFile, inputBam, targetDir) + val targetDir = bedFile.getParentFile + val targetFile = new File(outputDir, bedFile.getName.stripSuffix(".bed") + ".interval") + val targetInterval = BedToInterval(this, bedFile, inputBam, targetFile) add(targetInterval, true) add(CalculateHsMetrics(this, inputBam, if (baitIntervalFile != null) baitIntervalFile else targetInterval.output, targetInterval.output, targetDir)) diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/bedtools/BedtoolsCoverage.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/bedtools/BedtoolsCoverage.scala index 9a4e43f41d51dcac0bb9fa6d4221f68bcb33dc01..caab2715ee7d859f809adcbf770b52e24818783e 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/bedtools/BedtoolsCoverage.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/bedtools/BedtoolsCoverage.scala @@ -46,6 +46,8 @@ class BedtoolsCoverage(val root: Configurable) extends Bedtools { if (input.getName.endsWith(".bam")) inputTag = "-abam" } + override val defaultVmem = "6G" + /** Returns command to execute */ def cmdLine = required(executable) + required("coverage") + required(inputTag, input) + diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/BedToInterval.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/BedToInterval.scala index 187c8e816c3797d0fa6b0108ebf310d495eed8b5..55b13c542ee0c6f90a05f334a0c6b7d9fcc72228 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/BedToInterval.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/BedToInterval.scala @@ -43,14 +43,6 @@ class BedToInterval(val root: Configurable) extends BiopetJavaCommandLineFunctio } object BedToInterval extends ToolCommand { - def apply(root: Configurable, inputBed: File, inputBam: File, outputDir: String): BedToInterval = { - val bedToInterval = new BedToInterval(root) - bedToInterval.input = inputBed - bedToInterval.bamFile = inputBam - bedToInterval.output = new File(outputDir, inputBed.getName.stripSuffix(".bed") + ".interval") - return bedToInterval - } - def apply(root: Configurable, inputBed: File, inputBam: File, output: File): BedToInterval = { val bedToInterval = new BedToInterval(root) bedToInterval.input = inputBed diff --git a/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaTrait.scala b/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaTrait.scala index f0f2c69af15c22417eaa37bd823e0195b2bc92b4..d98b0115751aa9ce1efa3427f1ccc415a40a244c 100644 --- a/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaTrait.scala +++ b/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaTrait.scala @@ -219,7 +219,7 @@ trait ShivaTrait extends MultiSampleQScript with SummaryQScript { val md = new MarkDuplicates(qscript) md.input = input md.output = new File(sampleDir, sampleId + ".dedup.bam") - md.outputMetrics = new File(sampleDir, sampleId + ".dedup.bam") + md.outputMetrics = new File(sampleDir, sampleId + ".dedup.metrics") md.isIntermediate = isIntermediate add(md) addSummarizable(md, "mark_duplicates")