Skip to content
Snippets Groups Projects
Commit 30fe43b7 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

- Fixed output file for star

parent bb158f36
No related branches found
No related tags found
No related merge requests found
...@@ -88,7 +88,7 @@ class Mapping(private var globalConfig: Config) extends QScript { ...@@ -88,7 +88,7 @@ class Mapping(private var globalConfig: Config) extends QScript {
bamFile = addSortSam(List(bwaCommand.output), swapExt(outputDir,bwaCommand.output,".sam",".bam"), outputDir) bamFile = addSortSam(List(bwaCommand.output), swapExt(outputDir,bwaCommand.output,".sam",".bam"), outputDir)
} else if (aligner == "star") { } else if (aligner == "star") {
val starCommand = new Star(config) { R1 = fastq_R1; if (paired) R2 = fastq_R2; this.outputDir = qscript.outputDir + "star/" ; val starCommand = new Star(config) { R1 = fastq_R1; if (paired) R2 = fastq_R2; this.outputDir = qscript.outputDir + "star/" ;
outputSam = new File(this.outputDir + "/star_output.sam") } outputSam = new File(this.outputDir + "/Aligned.out.sam") }
add(starCommand) add(starCommand)
bamFile = addAddOrReplaceReadGroups(List(starCommand.outputSam), swapExt(outputDir,starCommand.outputSam,".sam",".bam"), outputDir) bamFile = addAddOrReplaceReadGroups(List(starCommand.outputSam), swapExt(outputDir,starCommand.outputSam,".sam",".bam"), outputDir)
} }
...@@ -98,12 +98,12 @@ class Mapping(private var globalConfig: Config) extends QScript { ...@@ -98,12 +98,12 @@ class Mapping(private var globalConfig: Config) extends QScript {
def addSortSam(inputSam:List[File], outputFile:File, dir:String) : File = { def addSortSam(inputSam:List[File], outputFile:File, dir:String) : File = {
val sortSam = new SortSam { val sortSam = new SortSam {
input = inputSam this.input = inputSam
createIndex = true this.createIndex = true
output = outputFile this.output = outputFile
memoryLimit = 2 this.memoryLimit = 2
nCoresRequest = 2 this.nCoresRequest = 2
jobResourceRequests :+= "h_vmem=4G" this.jobResourceRequests :+= "h_vmem=4G"
} }
add(sortSam) add(sortSam)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment