diff --git a/workflow/rna-seq.nf b/workflow/rna-seq.nf old mode 100755 new mode 100644 index d68852ca21afeb15d1343d862fa6ad50850434f4..a49495840afdaf163ee94d0d2c478aa898f78da5 --- a/workflow/rna-seq.nf +++ b/workflow/rna-seq.nf @@ -13,7 +13,7 @@ params.deriva = "${baseDir}/../test_data/auth/credential.json" params.bdbag = "${baseDir}/../test_data/auth/cookies.txt" //params.repRID = "16-1ZX4" params.repRID = "Q-Y5JA" -params.refMuVersion = "38.p6.vM22" +params.refMoVersion = "38.p6.vM22" params.refHuVersion = "38.p12.v31" params.outDir = "${baseDir}/../output" @@ -25,8 +25,7 @@ bdbag = Channel .fromPath(params.bdbag) .ifEmpty { exit 1, "deriva cookie file for bdbag not found: ${params.bdbag}" } repRID = params.repRID -refVersion = params.refVersion -refMuVersion = params.refMuVersion +refMoVersion = params.refMoVersion refHuVersion = params.refHuVersion outDir = params.outDir logsDir = "${outDir}/Logs" @@ -194,9 +193,11 @@ stranded.into { } spike.into{ spike_getRef + spike_rseqc } species.into { species_getRef + species_rseqc } /* @@ -207,10 +208,6 @@ process getRef { publishDir "${logsDir}", mode: "copy", pattern: "*.getRef.err" input: - val referenceBase - val refVersion - val refMuVersion - val refHuVersion val spike_getRef val species_getRef @@ -223,13 +220,13 @@ process getRef { ulimit -a >>${repRID}.getRef.err export https_proxy=\${http_proxy} - # retreive appropriate reference from S3 bucket + # run set the reference name if [ "${species_getRef}" == "Mus musculus" ] then - references=\$(echo ${referenceBase}/mouse/GRCm${refMuVersion}) + references=\$(echo ${referenceBase}/GRCm${refMoVersion}) elif [ '${species_getRef}' == "Homo sapiens" ] then - references=\$(echo ${referenceBase}/human/GRCh${refHuVersion}) + references=\$(echo ${referenceBase}/GRCh${refHuVersion}) else exit 1 fi @@ -240,8 +237,17 @@ process getRef { then reference=\$(echo \${references}/) fi - #aws s3 cp "\${references}" ./ --recursive >>${repRID}.getRef.err - cp "\${references}" ./ --recursive >>${repRID}.getRef.err + + # retreive appropriate reference appropriate location + if [ ${referenceBase} == "s3://bicf-references" ] + then + aws s3 cp "\${references}" /hisat2 ./ --recursive >>${repRID}.getRef.err + aws s3 cp "\${references}" /bed ./ --recursive >>${repRID}.getRef.err + elif [ ${referenceBase} == "/project/BICF/BICF_Core/shared/gudmap/references" ] + then + cp -R "\${references}"/hisat2 ./ >>${repRID}.getRef.err + cp -R "\${references}"/bed ./ >>${repRID}.getRef.err + fi """ } @@ -277,6 +283,11 @@ process trimData { """ } +reference.into { + reference_alignData + reference_rseqc +} + /* * alignData: aligns the reads to a reference database */ @@ -288,7 +299,7 @@ process alignData { val endsManual_alignData val stranded_alignData path fastq from fastqs_trimmed - path reference + path reference_alignData output: path ("${repRID}.sorted.bam") into rawBam