diff --git a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Breakdancer.scala b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Breakdancer.scala index f44ec38c91e33f6eac073c2d1726b06bf6fde701..8d63e1b6bbd0956c964fe23e131e8f44a4bba0f4 100644 --- a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Breakdancer.scala +++ b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Breakdancer.scala @@ -33,7 +33,7 @@ class Breakdancer(val root: Configurable) extends SvCaller { val bdcfg = BreakdancerConfig(this, bamFile, new File(breakdancerSampleDir, sample + ".breakdancer.cfg")) val breakdancer = BreakdancerCaller(this, bdcfg.output, new File(breakdancerSampleDir, sample + ".breakdancer.tsv")) val bdvcf = BreakdancerVCF(this, breakdancer.output, new File(breakdancerSampleDir, sample + ".breakdancer.vcf"), - sample = sample + "_bd") + sample = sample + sampleNameSuffix) val compressedVCF = new SortVcf(this) compressedVCF.input = bdvcf.output diff --git a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Clever.scala b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Clever.scala index 3c5dc47bcf747e9630d7d40d5608b4dd1670d7f6..992eb6d716f0074a6a86ba96b7c1494d90529607 100644 --- a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Clever.scala +++ b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Clever.scala @@ -33,7 +33,7 @@ class Clever(val root: Configurable) extends SvCaller { val cleverVCF = new CleverFixVCF(this) cleverVCF.input = clever.outputvcf cleverVCF.output = new File(cleverDir, s".${sample}.clever.vcf") - cleverVCF.sampleName = sample + "_cl" + cleverVCF.sampleName = sample + sampleNameSuffix cleverVCF.isIntermediate = true add(cleverVCF) diff --git a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Pindel.scala b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Pindel.scala index c83ee46b7ee50cfb6ace76d29b4eef6880282beb..cae8db5665b323b2dfabc6421c4b5fa0686021a0 100644 --- a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Pindel.scala +++ b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/Pindel.scala @@ -40,7 +40,7 @@ class Pindel(val root: Configurable) extends SvCaller { val configFile: File = new File(pindelDir, sample + ".pindel.cfg") val cfg = new PindelConfig(this) cfg.input = bamFile - cfg.sampleName = sample + "_pd" // pindel suffix + cfg.sampleName = sample + sampleNameSuffix cfg.output = configFile add(cfg) diff --git a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/SvCaller.scala b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/SvCaller.scala index 14fea623b201618076f56e9a72c0bc813efe199e..fbc3bfedda4c9cb23767d05234c5224c63305991 100644 --- a/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/SvCaller.scala +++ b/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/svcallers/SvCaller.scala @@ -30,6 +30,8 @@ trait SvCaller extends QScript with BiopetQScript with Reference { var inputBams: Map[String, File] = Map.empty + val sampleNameSuffix: String = config("samplename_suffix", default="") + def outputVCF(sample: String): Option[File] = { outputVCFs.get(sample) match { case Some(file) => Some(file)