Browse Source

Fix bug: boolean

master
YaqingLiu 4 years ago
parent
commit
70c5f1c79e
5 changed files with 18 additions and 18 deletions
  1. +4
    -4
      defaults
  2. +2
    -2
      tasks/TNscope.wdl
  3. +2
    -2
      tasks/TNseq.wdl
  4. +2
    -2
      tasks/bcftools.wdl
  5. +8
    -8
      workflow.wdl

+ 4
- 4
defaults View File

"bcftools_docker": "registry.cn-shanghai.aliyuncs.com/pgx-docker-registry/bcftools:v1.9", "bcftools_docker": "registry.cn-shanghai.aliyuncs.com/pgx-docker-registry/bcftools:v1.9",
"database": "oss://pgx-reference-data/annovar_hg38/", "database": "oss://pgx-reference-data/annovar_hg38/",
"regions": "oss://pgx-reference-data/reference/wes_bedfiles/agilent_v6/SureSelect_Human_All_Exon_V6_r2.bed", "regions": "oss://pgx-reference-data/reference/wes_bedfiles/agilent_v6/SureSelect_Human_All_Exon_V6_r2.bed",
"set_pon": true,
"set_pon": "true",
"cosmic_vcf": "CosmicCodingMuts.hg38.v91.vcf", "cosmic_vcf": "CosmicCodingMuts.hg38.v91.vcf",
"cosmic_dir": "oss://pgx-reference-data/reference/cosmic/", "cosmic_dir": "oss://pgx-reference-data/reference/cosmic/",
"disk_size": "200", "disk_size": "200",
"cluster_config": "OnDemand bcs.a2.3xlarge img-ubuntu-vpc", "cluster_config": "OnDemand bcs.a2.3xlarge img-ubuntu-vpc",
"set_annovar": true,
"set_vcf2maf": true,
"germline": false
"set_annovar": "true",
"set_vcf2maf": "true",
"germline": "false"
} }

+ 2
- 2
tasks/TNscope.wdl View File

String dbsnp String dbsnp
String disk_size String disk_size
Boolean set_pon
String set_pon
String? cosmic_vcf String? cosmic_vcf
File? cosmic_dir File? cosmic_dir
File? pon_vcf File? pon_vcf
String pon_command = if set_pon then "--pon /cromwell_root/tmp/PON/$(basename ${pon_vcf}) --cosmic /cromwell_root/tmp/PON/${cosmic_vcf}" else ""
String pon_command = if (set_pon == "true") then "--pon /cromwell_root/tmp/PON/$(basename ${pon_vcf}) --cosmic /cromwell_root/tmp/PON/${cosmic_vcf}" else ""
Boolean TN = if defined(corealigner_bam) then true else false Boolean TN = if defined(corealigner_bam) then true else false
command <<< command <<<

+ 2
- 2
tasks/TNseq.wdl View File

String dbsnp String dbsnp
String disk_size String disk_size
Boolean set_pon
String set_pon
String? cosmic_vcf String? cosmic_vcf
File? cosmic_dir File? cosmic_dir
File? pon_vcf File? pon_vcf
String pon_command = if set_pon then "--pon /cromwell_root/tmp/PON/$(basename ${pon_vcf}) --cosmic /cromwell_root/tmp/PON/${cosmic_vcf}" else ""
String pon_command = if (set_pon == "true") then "--pon /cromwell_root/tmp/PON/$(basename ${pon_vcf}) --cosmic /cromwell_root/tmp/PON/${cosmic_vcf}" else ""
Boolean TN = if defined(corealigner_bam) then true else false Boolean TN = if defined(corealigner_bam) then true else false
command <<< command <<<

+ 2
- 2
tasks/bcftools.wdl View File

String docker String docker
String cluster_config String cluster_config
String disk_size String disk_size
Boolean set_pon
String set_pon




command <<< command <<<
set -o pipefail set -o pipefail
set -e set -e
if ${set_pon} ; then
if [ ${set_pon} == "true" ] ; then
mkdir -p /cromwell_root/tmp/bcftools/ mkdir -p /cromwell_root/tmp/bcftools/
for i in ${sep=" " pon_vcf} for i in ${sep=" " pon_vcf}
do do

+ 8
- 8
workflow.wdl View File

String disk_size String disk_size
String cluster_config String cluster_config


Boolean set_pon
String set_pon
File? pon_vcf File? pon_vcf
File? cosmic_dir File? cosmic_dir
String? cosmic_vcf String? cosmic_vcf


Boolean set_annovar
String set_annovar
File? database File? database
Boolean set_vcf2maf
Boolean germline
String set_vcf2maf
String germline




call mapping.mapping as mapping { call mapping.mapping as mapping {
cluster_config=cluster_config cluster_config=cluster_config
} }


if (set_pon && type == "normal") {
if (set_pon == "true" && type == "normal") {
call PON.PON as PON { call PON.PON as PON {
input: input:
SENTIEON_INSTALL_DIR=SENTIEON_INSTALL_DIR, SENTIEON_INSTALL_DIR=SENTIEON_INSTALL_DIR,
} }
} }


if (germline) {
if (germline == "true") {
call Haplotyper.Haplotyper as Haplotyper { call Haplotyper.Haplotyper as Haplotyper {
input: input:
SENTIEON_INSTALL_DIR=SENTIEON_INSTALL_DIR, SENTIEON_INSTALL_DIR=SENTIEON_INSTALL_DIR,
} }
} }


if (set_annovar && defined(TNscope.TNscope_vcf) && defined(TNseq.TNseq_vcf)){
if (set_annovar == "true" && defined(TNscope.TNscope_vcf) && defined(TNseq.TNseq_vcf)){
call annovar.annovar as annovar { call annovar.annovar as annovar {
input: input:
docker=annovar_docker, docker=annovar_docker,
disk_size=disk_size disk_size=disk_size
} }


if (set_vcf2maf){
if (set_vcf2maf == "true"){
call vcf2maf.vcf2maf as vcf2maf { call vcf2maf.vcf2maf as vcf2maf {
input: input:
docker=maftools_docker, docker=maftools_docker,

Loading…
Cancel
Save