diff --git a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala index a92926381614fc998a7a7afe367f1cb9457b79fc..965a621a6294386b8899c70c2ff0f6691733484f 100644 --- a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala +++ b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Raxml.scala @@ -10,7 +10,7 @@ class Raxml(val root: Configurable) extends BiopetCommandLineFunction { override val defaultThreads = 4 override def versionCommand = executable + " -v" override val versionRegex = """.*version \w* .*""".r - + @Input(doc = "Input phy/fasta file", required = true) var input: File = _ @@ -28,35 +28,35 @@ class Raxml(val root: Configurable) extends BiopetCommandLineFunction { @Argument(doc = "Name of output files", required = true) var n: String = _ - + @Argument(doc = "Name of output files", required = true) var f: String = "d" @Argument(doc = "Output directory", required = false) var w: String = jobLocalDir.getAbsolutePath - + @Input(required = false) var t: File = _ - + @Input(required = false) var z: File = _ - + @Output(doc = "Output files", required = false) private var out: List[File] = Nil - + executable = config("exe", default = "raxmlHPC") override def afterGraph { super.afterGraph f match { - case "d" if b.isEmpty => out +:= getBestTree + case "d" if b.isEmpty => out +:= getBestTree case "d" if b.isDefined => out +:= getBootstrap } } - + def getBestTree: File = new File(w + File.separator + "RAxML_bestTree." + n) def getBootstrap: File = new File(w + File.separator + "RAxML_bootstrap." + n) - + def cmdLine = required(executable) + required("-m", m) + required("-s", input) + diff --git a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala index bb9575e1a2dcfb3a3403af7d23e8c0e8bab6be0e..ca9dd4ab8d8d9ac862f5f3b5400f8ca17ebd6732 100644 --- a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala +++ b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala @@ -54,12 +54,12 @@ class MarkDuplicates(val root: Configurable) extends Picard { @Output(doc = "Bam Index", required = true) private var outputIndex: File = _ - + override def afterGraph { super.afterGraph if (createIndex) outputIndex = new File(output.getAbsolutePath.stripSuffix(".bam") + ".bai") } - + override def commandLine = super.commandLine + repeat("INPUT=", input, spaceSeparated = false) + required("OUTPUT=", output, spaceSeparated = false) + diff --git a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala index 82f1fac3d6f53e586e19285aded171a5c7a9b31a..473fd11fc5b2299ef3f4fbe7e3d87e3d19259cbc 100644 --- a/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala +++ b/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/SortSam.scala @@ -18,12 +18,12 @@ class SortSam(val root: Configurable) extends Picard { @Output(doc = "Bam Index", required = true) private var outputIndex: File = _ - + override def afterGraph { super.afterGraph if (createIndex) outputIndex = new File(output.getAbsolutePath.stripSuffix(".bam") + ".bai") } - + override def commandLine = super.commandLine + required("INPUT=", input, spaceSeparated = false) + required("OUTPUT=", output, spaceSeparated = false) +