diff --git a/CHANGELOG.md b/CHANGELOG.md index 916973713e04fefa65fd0daafd10898967964b67..76ca7d646ddf2ab51c859c7fca459ec710de15b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ # v.2.0.1 (indev) **User Facing** * Corrected spelling of inferred (#125) +ce +* Add seqtype force parameter (#131) * Add param for seqwho reference (#127) * Remove tracking param and all tracking code + **Background** * Corrected file search parameters due to name inconsistency (#129) * Re-implemented sym-link for deriva cookie into ~/.bdbag/ for bdbag fetch to use (#132) diff --git a/README.md b/README.md index 4667d8a4f557617efb43a5d298f01dc8f41c4a2d..7e5abc805b2f91b1c545b1e79e118585216be5a2 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,8 @@ To Run: * eg: `--inputBagForce test_data/bag/Q-Y5F6_inputBag_xxxxxxxx.zip` (must be the expected bag structure, this example will not work because it is a test bag) * `--fastqsForce` utilizes local fastq's instead of downloading from the data-hub (still requires accurate repRID input) * eg: `--fastqsForce 'test_data/fastq/small/Q-Y5F6_1M.R{1,2}.fastq.gz'` (note the quotes around fastq's which must me named in the correct standard [*\*.R1.fastq.gz and/or \*.R2.fastq.gz*] and in the correct order, also consider using `endsForce` if the endness doesn't match submitted value) + * `--seqtypeForce` forces the sequencing type to be mRNAseq, it bypasses a inferred mismatch or an ambiguous error + * eg: `--seqtypeForce 'mRNAseq'` * `--speciesForce` forces the species to be "Mus musculus" or "Homo sapiens", it bypasses a metadata mismatch or an ambiguous species error * eg: `--speciesForce 'Mus musculus'` * `--endsForce` forces the endness to be "se", or "pe", it bypasses a metadata mismatch error diff --git a/rna-seq.nf b/rna-seq.nf index 4fc00dfa1da9a2044013a7088c4916d5c9072851..3094d2865cf38a41b30476d66593b8bea015593d 100644 --- a/rna-seq.nf +++ b/rna-seq.nf @@ -36,6 +36,7 @@ params.endsForce = "" params.speciesForce = "" params.strandedForce = "" params.spikeForce = "" +params.seqtypeForce = "" // Parse input variables deriva = Channel @@ -73,6 +74,7 @@ endsForce = params.endsForce speciesForce = params.speciesForce strandedForce = params.strandedForce spikeForce = params.spikeForce +seqtypeForce = params.seqtypeForce email = params.email // Define fixed files and variables @@ -879,6 +881,14 @@ process seqwho { fi fi + # override seqtype if forced + if [ "${params.seqtypeForce}" == "mRNAseq" ] + then + seqtypeError=false + seqtypeError_details="" + echo -e "LOG: seqtype Inferred R1=\${seqtypeR1}; Inferred R2=\${seqtypeR2}; Forced=mRNAseq" >> ${repRID}.seqwho.log + fi + # check for species match error if [ "${speciesMeta}" != "\${speciesInfer}" ] then @@ -2070,7 +2080,7 @@ process aggrQC { ulimit -a >> ${repRID}.aggrQC.log # make run table - if [ "${params.inputBagForce}" == "" ] && [ "${params.fastqsForce}" == "" ] && [ "${params.speciesForce}" == "" ] && [ "${params.strandedForce}" == "" ] && [ "${params.spikeForce}" == "" ] + if [ "${params.inputBagForce}" == "" ] && [ "${params.fastqsForce}" == "" ] && [ "${params.seqtypeForce}" == "" ] && [ "${params.speciesForce}" == "" ] && [ "${params.strandedForce}" == "" ] && [ "${params.spikeForce}" == "" ] then input="default" else @@ -2083,6 +2093,10 @@ process aggrQC { then input=\$(echo \${input} fastq) fi + if [ "${params.seqtypeForce}" == "mRNAseq" ] + then + input=\$(echo \${input} seqtype) + fi if [ "${params.speciesForce}" != "" ] then input=\$(echo \${input} species)