Commit 071dca28 authored by Peter van 't Hof's avatar Peter van 't Hof Committed by GitHub

Merge branch 'develop' into Fix-BIOPET-479

parents 1825f7be 42e2ffe3
...@@ -105,8 +105,6 @@ class Shiva(val parent: Configurable) extends QScript with MultisampleMappingTra ...@@ -105,8 +105,6 @@ class Shiva(val parent: Configurable) extends QScript with MultisampleMappingTra
override def keepFinalBamfile: Boolean = super.keepFinalBamfile && !useIndelRealigner && !useBaseRecalibration override def keepFinalBamfile: Boolean = super.keepFinalBamfile && !useIndelRealigner && !useBaseRecalibration
override def bamFile: Option[Mapping#File] = mapping.map(_.mergedBamFile)
override def preProcessBam: Option[Mapping#File] = if (useIndelRealigner && usePrintReads && useBaseRecalibration) override def preProcessBam: Option[Mapping#File] = if (useIndelRealigner && usePrintReads && useBaseRecalibration)
bamFile.map(swapExt(libDir, _, ".bam", ".realign.baserecal.bam")) bamFile.map(swapExt(libDir, _, ".bam", ".realign.baserecal.bam"))
else if (useIndelRealigner) bamFile.map(swapExt(libDir, _, ".bam", ".realign.bam")) else if (useIndelRealigner) bamFile.map(swapExt(libDir, _, ".bam", ".realign.bam"))
...@@ -189,7 +187,7 @@ class Shiva(val parent: Configurable) extends QScript with MultisampleMappingTra ...@@ -189,7 +187,7 @@ class Shiva(val parent: Configurable) extends QScript with MultisampleMappingTra
Some(makeVariantcalling(multisample = false, sample = Some(sampleId))) Some(makeVariantcalling(multisample = false, sample = Some(sampleId)))
} else None } else None
override def keepMergedFiles: Boolean = config("keep_merged_files", default = !useIndelRealigner) override def keepMergedFiles: Boolean = config("keep_merged_files", default = !useIndelRealigner || (libraries.size == 1))
lazy val useIndelRealigner: Boolean = config("use_indel_realigner", default = true) lazy val useIndelRealigner: Boolean = config("use_indel_realigner", default = true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment