diff --git a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/ApplyRecalibration.scala b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/ApplyRecalibration.scala
index 8728b6c651824e340556222cb60ef52d7fd9ab0a..ccdce3411d3df623657b3cd2a14415cf67f7b134 100644
--- a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/ApplyRecalibration.scala
+++ b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/ApplyRecalibration.scala
@@ -11,8 +11,8 @@ import nl.lumc.sasc.biopet.core.config.Configurable
class ApplyRecalibration(val root: Configurable) extends org.broadinstitute.gatk.queue.extensions.gatk.ApplyRecalibration with GatkGeneral {
scatterCount = config("scattercount", default = 0)
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
nt = Option(getThreads(3))
memoryLimit = Option(nt.getOrElse(1) * 2)
diff --git a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/BaseRecalibrator.scala b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/BaseRecalibrator.scala
index c07a2a66c363fe9623ad35225e9f76eb45aa67a4..e6cc3aaf64790aea8198f60d57d75df4c47082f1 100644
--- a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/BaseRecalibrator.scala
+++ b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/BaseRecalibrator.scala
@@ -22,7 +22,7 @@ object BaseRecalibrator {
val br = new BaseRecalibrator(root)
br.input_file :+= input
br.out = output
- br.afterGraph
+ br.beforeGraph
return br
}
}
\ No newline at end of file
diff --git a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/HaplotypeCaller.scala b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/HaplotypeCaller.scala
index b8f4ea4efa3ea8cfed563c2b82651c0001b794f7..18b4f06414cdfa4b1fb781de46fbf43cbf15fc78 100644
--- a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/HaplotypeCaller.scala
+++ b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/HaplotypeCaller.scala
@@ -35,8 +35,8 @@ class HaplotypeCaller(val root: Configurable) extends org.broadinstitute.gatk.qu
stand_emit_conf = config("stand_emit_conf", default = 0)
}
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
if (bamOutput != null && nct.getOrElse(1) > 1) {
threads = 1
logger.warn("BamOutput is on, nct/threads is forced to set on 1, this option is only for debug")
diff --git a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/UnifiedGenotyper.scala b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/UnifiedGenotyper.scala
index 26936df755a3d25aa41f78e0c2b568920b93e585..684c2123a56be28ef3a327ad3102d05bb808033a 100644
--- a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/UnifiedGenotyper.scala
+++ b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/UnifiedGenotyper.scala
@@ -8,8 +8,8 @@ package nl.lumc.sasc.biopet.extensions.gatk
import nl.lumc.sasc.biopet.core.config.Configurable
class UnifiedGenotyper(val root: Configurable) extends org.broadinstitute.gatk.queue.extensions.gatk.UnifiedGenotyper with GatkGeneral {
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
genotype_likelihoods_model = org.broadinstitute.gatk.tools.walkers.genotyper.GenotypeLikelihoodsCalculationModel.Model.BOTH
if (config.contains("scattercount")) scatterCount = config("scattercount")
diff --git a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/VariantEval.scala b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/VariantEval.scala
index c7956cab19dde275c322f3196eafe4ddce60800f..a9d252fde235f347c16ac3ea1d6b7e346c3214ff 100644
--- a/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/VariantEval.scala
+++ b/protected/biopet-gatk-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/gatk/VariantEval.scala
@@ -9,8 +9,8 @@ import java.io.File
import nl.lumc.sasc.biopet.core.config.Configurable
class VariantEval(val root: Configurable) extends org.broadinstitute.gatk.queue.extensions.gatk.VariantEval with GatkGeneral {
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
}
}
@@ -21,7 +21,7 @@ object VariantEval {
vareval.eval = Seq(sample)
vareval.comp = Seq(compareWith)
vareval.out = output
- vareval.afterGraph
+ vareval.beforeGraph
return vareval
}
@@ -35,7 +35,7 @@ object VariantEval {
vareval.ST = ST
vareval.noEV = true
vareval.EV = EV
- vareval.afterGraph
+ vareval.beforeGraph
return vareval
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala
index 905b3a715d3a6a863cefc71d74339f5757281727..f0c2f37c65a429e93f7fbdefd2441e56ddf66f10 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala
@@ -51,15 +51,14 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab
* Can overr
* ide this method. This is executed after the script is done en queue starts to generate the graph
*/
- protected[core] def afterGraph {}
- //TODO: function need rename to beforeGraph
+ protected[core] def beforeGraph {}
/**
* Set default output file, threads and vmem for current job
*/
override def freezeFieldValues() {
checkExecutable
- afterGraph
+ beforeGraph
if (jobOutputFile == null) jobOutputFile = new File(firstOutput.getParent + "/." + firstOutput.getName + "." + configName + ".out")
if (threads == 0) threads = getThreads(defaultThreads)
@@ -126,7 +125,7 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab
addJobReportBinding("cores", nCoresRequest match {
case Some(n) if n > 0 => n
- case _ => 1
+ case _ => 1
})
addJobReportBinding("version", getVersion)
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala
index 8f479ae97605a1ef4a2ef8aca51e291975c18f0d..b0657e369afa46d75ccbe2b387f42944a490ae92 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala
@@ -37,8 +37,8 @@ trait BiopetJavaCommandLineFunction extends JavaCommandLineFunction with BiopetC
/**
* Sets memory limit
*/
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
memoryLimit = config("memory_limit")
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
index 8b6b0a6f59d26fe96489d536be3074f606fe6170..807555d60031f4359e1285f7354f12fa6e204428 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
@@ -72,7 +72,7 @@ trait BiopetQScript extends Configurable with GatkLogging {
for (function <- functions) function match {
case f: BiopetCommandLineFunctionTrait => {
f.checkExecutable
- f.afterGraph
+ f.beforeGraph
f.commandLine
}
case _ =>
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala
index 7bda8792544eea2d863ab06192b51b55ae900077..8edf474e792eb2dbca0934cb37aba9bfc9a9ab29 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Fastqc.scala
@@ -48,7 +48,7 @@ class Fastqc(val root: Configurable) extends BiopetCommandLineFunction {
override def versionCommand = executable + " --version"
override val defaultThreads = 4
- override def afterGraph {
+ override def beforeGraph {
this.checkExecutable
val fastqcDir = new File(executable).getParent
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala
index 1d7b45ec9617091a457f073e4110ff5e01932e24..9913254953607dd1542b70ebbf49d2a2dacdd429 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala
@@ -64,10 +64,10 @@ class Raxml(val root: Configurable) extends BiopetCommandLineFunction {
var executableNonThreads: String = config("exe", default = "raxmlHPC")
var executableThreads: Option[String] = config("exe_pthreads")
- override def afterGraph {
+ override def beforeGraph {
if (threads == 0) threads = getThreads(defaultThreads)
executable = if (threads > 1 && executableThreads.isDefined) executableThreads.get else executableNonThreads
- super.afterGraph
+ super.beforeGraph
out +:= getInfoFile
f match {
case "d" if b.isEmpty => {
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/RunGubbins.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/RunGubbins.scala
index e732c1023de5f713f4c21ed366da68eddc825285..a041f5dc760543bc0377edc5678299c81ec042c2 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/RunGubbins.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/RunGubbins.scala
@@ -47,8 +47,8 @@ class RunGubbins(val root: Configurable) extends BiopetCommandLineFunction {
var verbose: Boolean = config("verbose", default = false)
var noCleanup: Boolean = config("no_cleanup", default = false)
- override def afterGraph: Unit = {
- super.afterGraph
+ override def beforeGraph: Unit = {
+ super.beforeGraph
jobLocalDir = new File(outputDirectory)
if (prefix.isEmpty) prefix = Some(fastafile.getName)
val out: List[String] = List(".recombination_predictions.embl",
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Sickle.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Sickle.scala
index 5056c70abc0e122fac0b95862f3443faaa48b5c7..abc517962b8302456b333c1f6b6aafe7fdd35a9b 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Sickle.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Sickle.scala
@@ -53,7 +53,7 @@ class Sickle(val root: Configurable) extends BiopetCommandLineFunction {
override val versionRegex = """sickle version (.*)""".r
override def versionCommand = executable + " --version"
- override def afterGraph {
+ override def beforeGraph {
if (qualityType.isEmpty) qualityType = Some(defaultQualityType)
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Star.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Star.scala
index f8e337649c911aee6a5bbf794979a044f2b608a3..42a2908258393780c96a51c1919d6ddd127d42a4 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Star.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Star.scala
@@ -62,7 +62,7 @@ class Star(val root: Configurable) extends BiopetCommandLineFunction {
override val defaultVmem = "6G"
override val defaultThreads = 8
- override def afterGraph() {
+ override def beforeGraph() {
if (outFileNamePrefix != null && !outFileNamePrefix.endsWith(".")) outFileNamePrefix += "."
val prefix = if (outFileNamePrefix != null) outputDir + outFileNamePrefix else outputDir
if (runmode == null) {
@@ -103,7 +103,7 @@ object Star {
star.outputDir = outputDir
star.isIntermediate = isIntermediate
star.deps = deps
- star.afterGraph
+ star.beforeGraph
return star
}
@@ -111,20 +111,20 @@ object Star {
val starCommand_pass1 = Star(configurable, R1, if (R2 != null) R2 else null, new File(outputDir, "aln-pass1"))
starCommand_pass1.isIntermediate = isIntermediate
starCommand_pass1.deps = deps
- starCommand_pass1.afterGraph
+ starCommand_pass1.beforeGraph
val starCommand_reindex = new Star(configurable)
starCommand_reindex.sjdbFileChrStartEnd = starCommand_pass1.outputTab
starCommand_reindex.outputDir = new File(outputDir, "re-index")
starCommand_reindex.runmode = "genomeGenerate"
starCommand_reindex.isIntermediate = isIntermediate
- starCommand_reindex.afterGraph
+ starCommand_reindex.beforeGraph
val starCommand_pass2 = Star(configurable, R1, if (R2 != null) R2 else null, new File(outputDir, "aln-pass2"))
starCommand_pass2.genomeDir = starCommand_reindex.outputDir
starCommand_pass2.isIntermediate = isIntermediate
starCommand_pass2.deps = deps
- starCommand_pass2.afterGraph
+ starCommand_pass2.beforeGraph
return (starCommand_pass2.outputSam, List(starCommand_pass1, starCommand_reindex, starCommand_pass2))
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/TopHat.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/TopHat.scala
index 98ee6de521d499710e186bb2c196d9d471c6aa5d..ce86a1ed9bd1e8d1afa04867887be2f21cf6231b 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/TopHat.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/TopHat.scala
@@ -64,7 +64,7 @@ class TopHat(val root: Configurable) extends BiopetCommandLineFunction {
override def versionCommand = executable + " --version"
- override def afterGraph() {
+ override def beforeGraph() {
if (!outputDir.endsWith("/")) outputDir += "/"
output = new File(outputDir + "accepted_hits.bam")
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/conifer/ConiferExport.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/conifer/ConiferExport.scala
index 02c0f09584206770965e67e6afc32765f9997a3f..c7b8169538e02b907a1e142e08b09e763e6fb2d9 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/conifer/ConiferExport.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/conifer/ConiferExport.scala
@@ -28,7 +28,7 @@ class ConiferExport(val root: Configurable) extends Conifer {
@Output(doc = "Output <sample>.svdzrpkm.bed", shortName = "out", required = true)
var output: File = _
- override def afterGraph {
+ override def beforeGraph {
this.checkExecutable
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala
index 8037616834ecd4de02e9949883b75d20b45c7347..d3f4e6cccc3d5bff518477dd240130daa5581b46 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala
@@ -44,8 +44,8 @@ class IGVToolsCount(val root: Configurable) extends IGVTools {
var pairs: Boolean = config("pairs", default = false)
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
if (!input.exists()) throw new FileNotFoundException("Input bam is required for IGVToolsCount")
if (!wig.isEmpty && !wig.get.getAbsolutePath.endsWith(".wig")) throw new IllegalArgumentException("Wiggle file should have a .wig file-extension")
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala
index e6a9c48e925949bdd413a9aca79afbb7e28b91d7..8224fd4713f00d47511156459b02f5b733e1deda 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala
@@ -55,7 +55,7 @@ class Macs2CallPeak(val root: Configurable) extends Macs2 {
var broadcutoff: Option[Int] = config("broadcutoff")
var callsummits: Boolean = config("callsummits", default = false)
- override def afterGraph: Unit = {
+ override def beforeGraph: Unit = {
if (name.isEmpty) throw new IllegalArgumentException("Name is not defined")
if (outputdir == null) throw new IllegalArgumentException("Outputdir is not defined")
output_narrow = new File(outputdir + name.get + ".narrowPeak")
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectGcBiasMetrics.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectGcBiasMetrics.scala
index 8d1b2c45e81df8569e1f1d5873ef4b19aec71864..86198d2a344489a62b546f5d9c0dd4a8234c929a 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectGcBiasMetrics.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectGcBiasMetrics.scala
@@ -49,7 +49,7 @@ class CollectGcBiasMetrics(val root: Configurable) extends Picard {
@Argument(doc = "IS_BISULFITE_SEQUENCED", required = false)
var isBisulfiteSequinced: Option[Boolean] = config("isbisulfitesequinced")
- override def afterGraph {
+ override def beforeGraph {
if (outputChart == null) outputChart = new File(output + ".pdf")
//require(reference.exists)
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectInsertSizeMetrics.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectInsertSizeMetrics.scala
index 77ceb0e588f6933e59863c2899be06aec320793d..9b1777677a9567d8e88d21f44ec7f913e45341b5 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectInsertSizeMetrics.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectInsertSizeMetrics.scala
@@ -54,7 +54,7 @@ class CollectInsertSizeMetrics(val root: Configurable) extends Picard {
@Argument(doc = "HISTOGRAM_WIDTH", required = false)
var histogramWidth: Option[Int] = config("histogramWidth")
- override def afterGraph {
+ override def beforeGraph {
if (outputHistogram == null) outputHistogram = new File(output + ".pdf")
//require(reference.exists)
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala
index 6df04c12ccb0ad1ca1c4853dac940ec3a304d043..181494ae12235f2fc95bade2098a9d313f6309b8 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala
@@ -70,8 +70,8 @@ class MarkDuplicates(val root: Configurable) extends Picard {
@Output(doc = "Bam Index", required = true)
private var outputIndex: File = _
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
if (createIndex) outputIndex = new File(output.getAbsolutePath.stripSuffix(".bam") + ".bai")
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala
index 56cfec1dd668c5a4c3bb349276e0fcf25729a040..ef7ec250d5de2bd88c36e48af157ae29bce0a3b0 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala
@@ -34,8 +34,8 @@ class SortSam(val root: Configurable) extends Picard {
@Output(doc = "Bam Index", required = true)
private var outputIndex: File = _
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
if (createIndex) outputIndex = new File(output.getAbsolutePath.stripSuffix(".bam") + ".bai")
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala
index c431aa0dac3a5a5a39c8ab676a704ac3645a4ad9..3eec803c8dab66d824a86a71f794d691ebde2ba6 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala
@@ -49,8 +49,8 @@ class MergeAlleles(val root: Configurable) extends BiopetJavaCommandLineFunction
override val defaultVmem = "8G"
memoryLimit = Option(4)
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
if (output.getName.endsWith(".gz")) outputIndex = new File(output.getAbsolutePath + ".tbi")
if (output.getName.endsWith(".vcf")) outputIndex = new File(output.getAbsolutePath + ".idx")
}
diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MpileupToVcf.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MpileupToVcf.scala
index ae21c34e4b820ebfb0b33e3b033196e03a58ef6e..3e9743fb16e7c1d9228307a22ca950ee8f18eb0d 100644
--- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MpileupToVcf.scala
+++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MpileupToVcf.scala
@@ -54,8 +54,8 @@ class MpileupToVcf(val root: Configurable) extends BiopetJavaCommandLineFunction
override def defaults = ConfigUtils.mergeMaps(Map("samtoolsmpileup" -> Map("disable_baq" -> true, "min_map_quality" -> 1)),
super.defaults)
- override def afterGraph {
- super.afterGraph
+ override def beforeGraph {
+ super.beforeGraph
val samtoolsMpileup = new SamtoolsMpileup(this)
}
diff --git a/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Fastqc.scala b/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Fastqc.scala
index bf63f0415c5cdfa96928f11f2241db3e012f3a69..1bd5b1df7ed9608cb2198e5db2f6456b56752115 100644
--- a/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Fastqc.scala
+++ b/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Fastqc.scala
@@ -173,7 +173,7 @@ object Fastqc {
if (filename.endsWith(".fastq")) filename = filename.substring(0, filename.size - 6)
//if (filename.endsWith(".fq")) filename = filename.substring(0,filename.size - 3)
fastqcCommand.output = new File(outDir, "/" + filename + "_fastqc.zip")
- fastqcCommand.afterGraph
+ fastqcCommand.beforeGraph
fastqcCommand
}
}
diff --git a/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/SeqtkSeq.scala b/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/SeqtkSeq.scala
index 05236e13cacae24e5b5dffb408e1aa01b1c297e4..03144feee45b395504864abfadff03e50713429d 100644
--- a/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/SeqtkSeq.scala
+++ b/public/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/SeqtkSeq.scala
@@ -38,7 +38,7 @@ class SeqtkSeq(root: Configurable) extends nl.lumc.sasc.biopet.extensions.seqtk.
}
}
- override def afterGraph {
+ override def beforeGraph {
if (fastqc != null) deps ::= fastqc.output
}