Skip to content
Snippets Groups Projects
Commit 7728d8fc authored by Gervaise Henry's avatar Gervaise Henry :cowboy:
Browse files

Try double [ on if or

parent fd646d53
Branches
Tags
2 merge requests!58Develop,!56Resolve "Detect error in inferMetadata for tracking"
Pipeline #8823 passed with stages
in 4 minutes and 7 seconds
...@@ -505,7 +505,7 @@ readLengthInfer_fl.splitCsv(sep: ",", header: false).separate( ...@@ -505,7 +505,7 @@ readLengthInfer_fl.splitCsv(sep: ",", header: false).separate(
readLengthInfer readLengthInfer
) )
// Replicate infered read length for multiple process inputs // Replicate inferred read length for multiple process inputs
readLengthInfer.into { readLengthInfer.into {
readLengthInfer_aggrQC readLengthInfer_aggrQC
readLengthInfer_uploadQC readLengthInfer_uploadQC
...@@ -761,7 +761,7 @@ process inferMetadata { ...@@ -761,7 +761,7 @@ process inferMetadata {
# infer experimental setting from dedup bam # infer experimental setting from dedup bam
echo -e "LOG: infer experimental setting from dedup bam" >> ${repRID}.inferMetadata.log echo -e "LOG: infer experimental setting from dedup bam" >> ${repRID}.inferMetadata.log
infer_experiment.py -r "\${bed}" -i "\${bam}" 1>> ${repRID}.infer_experiment.txt infer_experiment.py -r "\${bed}" -i "\${bam}" 1>> ${repRID}.infer_experiment.txt
echo -e "LOG: infered" >> ${repRID}.inferMetadata.log echo -e "LOG: inferred" >> ${repRID}.inferMetadata.log
ended=`bash ${script_inferMeta} endness ${repRID}.infer_experiment.txt` ended=`bash ${script_inferMeta} endness ${repRID}.infer_experiment.txt`
fail=`bash ${script_inferMeta} fail ${repRID}.infer_experiment.txt` fail=`bash ${script_inferMeta} fail ${repRID}.infer_experiment.txt`
...@@ -789,7 +789,7 @@ process inferMetadata { ...@@ -789,7 +789,7 @@ process inferMetadata {
fi fi
echo -e "LOG: stradedness set to: \${stranded}" >> ${repRID}.inferMetadata.log echo -e "LOG: stradedness set to: \${stranded}" >> ${repRID}.inferMetadata.log
# write infered metadata to file # write inferred metadata to file
echo "\${ends},\${stranded},\${spike},\${species},\${align_ercc},\${align_hu},\${align_mo},\${percentF},\${percentR},\${fail}" 1>> infer.csv echo "\${ends},\${stranded},\${spike},\${species},\${align_ercc},\${align_hu},\${align_mo},\${percentF},\${percentR},\${fail}" 1>> infer.csv
""" """
} }
...@@ -853,7 +853,7 @@ speciesInfer.into { ...@@ -853,7 +853,7 @@ speciesInfer.into {
} }
/* /*
* checkMetadata: checks the submitted metada against infered * checkMetadata: checks the submitted metada against inferred
*/ */
process checkMetadata { process checkMetadata {
tag "${repRID}" tag "${repRID}"
...@@ -878,15 +878,15 @@ process checkMetadata { ...@@ -878,15 +878,15 @@ process checkMetadata {
ulimit -a >> ${repRID}.checkMetadata.log ulimit -a >> ${repRID}.checkMetadata.log
pipelineError=false pipelineError=false
# check if submitted metadata matches infered # check if submitted metadata matches inferred
if [ "${endsMeta}" != "${endsInfer}" ] if [ "${endsMeta}" != "${endsInfer}" ]
then then
pipelineError=true pipelineError=true
pipelineError_ends=true pipelineError_ends=true
echo -e "LOG: ends do not match: Submitted=${endsMeta}; Infered=${endsInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: ends do not match: Submitted=${endsMeta}; Inferred=${endsInfer}" >> ${repRID}.checkMetadata.log
else else
pipelineError_ends=false pipelineError_ends=false
echo -e "LOG: ends matches: Submitted=${endsMeta}; Infered=${endsInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: ends matches: Submitted=${endsMeta}; Inferred=${endsInfer}" >> ${repRID}.checkMetadata.log
fi fi
if [ "${strandedMeta}" != "${strandedInfer}" ] if [ "${strandedMeta}" != "${strandedInfer}" ]
then then
...@@ -894,39 +894,39 @@ process checkMetadata { ...@@ -894,39 +894,39 @@ process checkMetadata {
pipelineError_stranded=true pipelineError_stranded=true
if [ "${strandedMeta}" == "stranded" ] if [ "${strandedMeta}" == "stranded" ]
then then
if [ "${strandedInfer}" == "forward"] | [ "${strandedInfer}" == "reverse" ] if [[ "${strandedInfer}" == "forward" ]] || [[ "${strandedInfer}" == "reverse" ]]
then then
pipelineError=false pipelineError=false
pipelineError_stranded=false pipelineError_stranded=false
echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Inferred=${strandedInfer}" >> ${repRID}.checkMetadata.log
else else
echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Inferred=${strandedInfer}" >> ${repRID}.checkMetadata.log
fi fi
else else
echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Inferred=${strandedInfer}" >> ${repRID}.checkMetadata.log
fi fi
else else
pipelineError=false pipelineError=false
pipelineError_stranded=false pipelineError_stranded=false
echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Inferred=${strandedInfer}" >> ${repRID}.checkMetadata.log
fi fi
if [ "${spikeMeta}" != "${spikeInfer}" ] if [ "${spikeMeta}" != "${spikeInfer}" ]
then then
pipelineError=true pipelineError=true
pipelineError_spike=true pipelineError_spike=true
echo -e "LOG: spike does not match: Submitted=${spikeMeta}; Infered=${spikeInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: spike does not match: Submitted=${spikeMeta}; Inferred=${spikeInfer}" >> ${repRID}.checkMetadata.log
else else
pipelineError_spike=false pipelineError_spike=false
echo -e "LOG: stranded matches: Submitted=${spikeMeta}; Infered=${spikeInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: stranded matches: Submitted=${spikeMeta}; Inferred=${spikeInfer}" >> ${repRID}.checkMetadata.log
fi fi
if [ "${speciesMeta}" != "${speciesInfer}" ] if [ "${speciesMeta}" != "${speciesInfer}" ]
then then
pipelineError=true pipelineError=true
pipelineError_species=true pipelineError_species=true
echo -e "LOG: species does not match: Submitted=${speciesMeta}; Infered=${speciesInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: species does not match: Submitted=${speciesMeta}; Inferred=${speciesInfer}" >> ${repRID}.checkMetadata.log
else else
pipelineError_species=false pipelineError_species=false
echo -e "LOG: species matches: Submitted=${speciesMeta}; Infered=${speciesInfer}" >> ${repRID}.checkMetadata.log echo -e "LOG: species matches: Submitted=${speciesMeta}; Inferred=${speciesInfer}" >> ${repRID}.checkMetadata.log
fi fi
# create dummy output bag rid if failure # create dummy output bag rid if failure
...@@ -1454,7 +1454,7 @@ assignedReadsInfer_fl.splitCsv(sep: ",", header: false).separate( ...@@ -1454,7 +1454,7 @@ assignedReadsInfer_fl.splitCsv(sep: ",", header: false).separate(
assignedReadsInfer assignedReadsInfer
) )
// Replicate infered assigned reads for multiple process inputs // Replicate inferred assigned reads for multiple process inputs
assignedReadsInfer.into { assignedReadsInfer.into {
assignedReadsInfer_aggrQC assignedReadsInfer_aggrQC
assignedReadsInfer_uploadQC assignedReadsInfer_uploadQC
...@@ -1499,7 +1499,7 @@ rawReadsInfer_fl.splitCsv(sep: ",", header: false).separate( ...@@ -1499,7 +1499,7 @@ rawReadsInfer_fl.splitCsv(sep: ",", header: false).separate(
rawReadsInfer rawReadsInfer
) )
// Replicate infered raw reads for multiple process inputs // Replicate inferred raw reads for multiple process inputs
rawReadsInfer.into { rawReadsInfer.into {
rawReadsInfer_aggrQC rawReadsInfer_aggrQC
rawReadsInfer_uploadQC rawReadsInfer_uploadQC
...@@ -1654,9 +1654,9 @@ process aggrQC { ...@@ -1654,9 +1654,9 @@ process aggrQC {
echo -e "Submitter\t${speciesM}\t${endsM}\t${strandedM}\t${spikeM}\t-\t-\t'${readLengthM}'\t-" >> metadata.tsv echo -e "Submitter\t${speciesM}\t${endsM}\t${strandedM}\t${spikeM}\t-\t-\t'${readLengthM}'\t-" >> metadata.tsv
if [ "${params.speciesForce}" == "" ] if [ "${params.speciesForce}" == "" ]
then then
echo -e "Infered\t${speciesI}\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv echo -e "Inferred\t${speciesI}\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv
else else
echo -e "Infered\t${speciesI} (FORCED)\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv echo -e "Inferred\t${speciesI} (FORCED)\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv
fi fi
echo -e "Measured\t-\t${endsManual}\t-\t-\t'${rawReadsI}'\t'${assignedReadsI}'\t'${readLengthI}'\t'${tinMedI}'" >> metadata.tsv echo -e "Measured\t-\t${endsManual}\t-\t-\t'${rawReadsI}'\t'${assignedReadsI}'\t'${readLengthI}'\t'${tinMedI}'" >> metadata.tsv
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment