Skip to content
Snippets Groups Projects
Commit 95b19cd5 authored by Ruben Vorderman's avatar Ruben Vorderman
Browse files

Merge branch 'BIOWDL-471' of https://github.com/biowdl/tasks into BIOWDL-471

parents 88a1d405 c36bae77
No related branches found
No related tags found
No related merge requests found
......@@ -19,7 +19,10 @@ version 4.0.0-develop
Perl wrapper for FastQC. This has the advantage that memory and threads can
be set independently. A rather high maximum heap size of 1750MB (Xmx1750M)
was set, as OOM errors occurred frequently on some fastqs.
+ Added bcftools stats task.
+ STAR: Add options regarding alignment score (regarding read length as well)
for tweaking when processing rRNA depleted samples.
+ TALON: Update `minimumIdentity` to correct type (float, was integer)
& set new default according to developers (0.8, was 0).
+ Added GATK VariantEval task.
+ Added a log output for STAR.
+ Added report output to Hisat2.
......
......@@ -243,7 +243,7 @@ task YamlToJson {
parameter_meta {
yaml: {description: "The YAML file to convert.", category: "required"}
outputJson: {description: "The location the output JSON file should be written to.", category: "advanced"}
memory: {description: "The maximum aount of memroy the job will need.", category: "advanced"}
memory: {description: "The maximum amount of memory the job will need.", category: "advanced"}
timeMinutes: {description: "The maximum amount of time the job will run in minutes.", category: "advanced"}
dockerImage: {description: "The docker image used for this task. Changing this may result in errors which the developers may choose not to address.",
category: "advanced"}
......
......@@ -95,6 +95,10 @@ task Star {
String outFileNamePrefix
String outSAMtype = "BAM SortedByCoordinate"
String readFilesCommand = "zcat"
Int? outFilterScoreMin
Float? outFilterScoreMinOverLread
Int? outFilterMatchNmin
Float? outFilterMatchNminOverLread
String? outStd
String? twopassMode = "Basic"
Array[String]? outSAMattrRGline
......@@ -124,6 +128,10 @@ task Star {
--genomeDir ~{sub(indexFiles[0], basename(indexFiles[0]), "")} \
--outSAMtype ~{outSAMtype} \
--readFilesCommand ~{readFilesCommand} \
~{"--outFilterScoreMin " + outFilterScoreMin} \
~{"--outFilterScoreMinOverLread " + outFilterScoreMinOverLread} \
~{"--outFilterMatchNmin " + outFilterMatchNmin} \
~{"--outFilterMatchNminOverLread " + outFilterMatchNminOverLread} \
~{"--outSAMunmapped " + outSAMunmapped} \
~{"--runThreadN " + runThreadN} \
~{"--outStd " + outStd} \
......@@ -151,6 +159,10 @@ task Star {
outFileNamePrefix: {description: "The prefix for the output files. May include directories.", category: "required"}
outSAMtype: {description: "The type of alignment file to be produced. Currently only `BAM SortedByCoordinate` is supported.", category: "advanced"}
readFilesCommand: {description: "Equivalent to star's `--readFilesCommand` option.", category: "advanced"}
outFilterScoreMin: {description: "Equivalent to star's `--outFilterScoreMin` option.", category: "advanced"}
outFilterScoreMinOverLread: {description: "Equivalent to star's `--outFilterScoreMinOverLread` option.", category: "advanced"}
outFilterMatchNmin: {description: "Equivalent to star's `--outFilterMatchNmin` option.", category: "advanced"}
outFilterMatchNminOverLread: {description: "Equivalent to star's `--outFilterMatchNminOverLread` option.", category: "advanced"}
outStd: {description: "Equivalent to star's `--outStd` option.", category: "advanced"}
twopassMode: {description: "Equivalent to star's `--twopassMode` option.", category: "advanced"}
outSAMattrRGline: {description: "The readgroup lines for the fastq pairs given (in the same order as the fastq files).", category: "common"}
......@@ -159,8 +171,7 @@ task Star {
runThreadN: {description: "The number of threads to use.", category: "advanced"}
memory: {description: "The amount of memory this job will use.", category: "advanced"}
timeMinutes: {description: "The maximum amount of time the job will run in minutes.", category: "advanced"}
dockerImage: {description: "The docker image used for this task. Changing this may result in errors which the developers may choose not to address.",
category: "advanced"}
dockerImage: {description: "The docker image used for this task. Changing this may result in errors which the developers may choose not to address.", category: "advanced"}
}
}
......
......@@ -380,7 +380,7 @@ task Talon {
File databaseFile
String genomeBuild
Float minimumCoverage = 0.9
Int minimumIdentity = 0
Float minimumIdentity = 0.8
String outputPrefix
Int cores = 4
......
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