Skip to content
Snippets Groups Projects
Unverified Commit 76308acf authored by Ruben Vorderman's avatar Ruben Vorderman Committed by GitHub
Browse files

Merge branch 'develop' into BIOWDL-19

parents 5050e041 f3b6fa09
No related branches found
No related tags found
1 merge request!37Add samplesheet structs
...@@ -15,6 +15,7 @@ task BaseCounter { ...@@ -15,6 +15,7 @@ task BaseCounter {
} }
Int mem = ceil(select_first([memory, 4.0])) Int mem = ceil(select_first([memory, 4.0]))
String toolCommand = if defined(toolJar) String toolCommand = if defined(toolJar)
then "java -Xmx" + mem + "G -jar " +toolJar then "java -Xmx" + mem + "G -jar " +toolJar
else "biopet-basecounter -Xmx" + mem + "G" else "biopet-basecounter -Xmx" + mem + "G"
...@@ -135,6 +136,7 @@ task FastqSplitter { ...@@ -135,6 +136,7 @@ task FastqSplitter {
} }
Int mem = ceil(select_first([memory, 4.0])) Int mem = ceil(select_first([memory, 4.0]))
String toolCommand = if defined(toolJar) String toolCommand = if defined(toolJar)
then "java -Xmx" + mem + "G -jar " +toolJar then "java -Xmx" + mem + "G -jar " +toolJar
else "biopet-fastqsplitter -Xmx" + mem + "G" else "biopet-fastqsplitter -Xmx" + mem + "G"
...@@ -216,6 +218,7 @@ task SampleConfig { ...@@ -216,6 +218,7 @@ task SampleConfig {
String? readgroup String? readgroup
String? jsonOutputPath String? jsonOutputPath
String? tsvOutputPath String? tsvOutputPath
Float? memory Float? memory
Float? memoryMultiplier Float? memoryMultiplier
} }
...@@ -331,6 +334,9 @@ task ValidateAnnotation { ...@@ -331,6 +334,9 @@ task ValidateAnnotation {
File? refRefflat File? refRefflat
File? gtfFile File? gtfFile
File refFasta File refFasta
File refFastaIndex
File refDict
Float? memory Float? memory
Float? memoryMultiplier Float? memoryMultiplier
} }
...@@ -398,7 +404,10 @@ task ValidateVcf { ...@@ -398,7 +404,10 @@ task ValidateVcf {
String? preCommand String? preCommand
File? toolJar File? toolJar
File vcfFile File vcfFile
File vcfIndex
File refFasta File refFasta
File refFastaIndex
File refDict
Float? memory Float? memory
Float? memoryMultiplier Float? memoryMultiplier
......
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