diff --git a/public/basty/src/main/scala/nl/lumc/sasc/biopet/pipelines/basty/BastyTrait.scala b/public/basty/src/main/scala/nl/lumc/sasc/biopet/pipelines/basty/BastyTrait.scala index 8aea30f2cb0ed1e19c51edc70813bb5d6945434e..d931860744eff28c2e730071af614ab37a0dfb11 100644 --- a/public/basty/src/main/scala/nl/lumc/sasc/biopet/pipelines/basty/BastyTrait.scala +++ b/public/basty/src/main/scala/nl/lumc/sasc/biopet/pipelines/basty/BastyTrait.scala @@ -179,7 +179,7 @@ trait BastyTrait extends MultiSampleQScript { snpsOnly: Boolean = false): FastaOutput = { val bastyGenerateFasta = new BastyGenerateFasta(this) bastyGenerateFasta.outputName = if (outputName != null) outputName else sampleName - bastyGenerateFasta.inputVcf = shiva.variantcalling.get.finalFile + bastyGenerateFasta.inputVcf = shiva.variantCalling.get.finalFile if (shiva.samples.contains(sampleName)) { bastyGenerateFasta.bamFile = shiva.samples(sampleName).preProcessBam.get } diff --git a/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaSvCalling.scala b/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaSvCalling.scala index 8bf0abaca03f4f08e89dfc86de3d8e09a1707943..c235866389194c2305abcda4e2d04bdef4de04b8 100644 --- a/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaSvCalling.scala +++ b/public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaSvCalling.scala @@ -44,7 +44,7 @@ class ShivaSvCalling(val root: Configurable) extends QScript with SummaryQScript protected var inputBams: Map[String, File] = Map() - protected def addBamFile(file: File, sampleId: Option[String] = None): Unit = { + def addBamFile(file: File, sampleId: Option[String] = None): Unit = { sampleId match { case Some(sample) => inputBams += sample -> file case _ if !file.exists() => throw new IllegalArgumentException("Bam file does not exits: " + file) 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 d742df034e8acaa69b671732ab30895bcf41850b..f0a51e582549afee42e332105ad0e727d6785965 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 @@ -270,13 +270,19 @@ trait ShivaTrait extends MultiSampleQScript with SummaryQScript with Reference { } } - lazy val variantcalling = if (config("multisample_variantcalling", default = true).asBoolean) { + lazy val variantCalling = if (config("multisample_variantcalling", default = true).asBoolean) { Some(makeVariantcalling(multisample = true)) } else None + lazy val svCalling = if (config("sv_calling", default = false).asBoolean) { + val svCalling = new ShivaSvCalling(this) + samples.foreach(x => x._2.preProcessBam.foreach(bam => svCalling.addBamFile(bam, Some(x._1)))) + Some(svCalling) + } else None + /** This will add the mutisample variantcalling */ def addMultiSampleJobs(): Unit = { - variantcalling.foreach(vc => { + variantCalling.foreach(vc => { vc.outputDir = new File(outputDir, "variantcalling") vc.inputBams = samples.flatMap(_._2.preProcessBam).toList vc.init()