Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
RNA-seq
Manage
Activity
Members
Labels
Plan
Issues
12
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
GUDMAP_RBK
RNA-seq
Commits
7728d8fc
Commit
7728d8fc
authored
4 years ago
by
Gervaise Henry
Browse files
Options
Downloads
Patches
Plain Diff
Try double [ on if or
parent
fd646d53
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!58
Develop
,
!56
Resolve "Detect error in inferMetadata for tracking"
Pipeline
#8823
passed with stages
in 4 minutes and 7 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
workflow/rna-seq.nf
+20
-20
20 additions, 20 deletions
workflow/rna-seq.nf
with
20 additions
and
20 deletions
workflow/rna-seq.nf
+
20
−
20
View file @
7728d8fc
...
...
@@ -505,7 +505,7 @@ readLengthInfer_fl.splitCsv(sep: ",", header: false).separate(
readLengthInfer
)
// Replicate infered read length for multiple process inputs
// Replicate infer
r
ed read length for multiple process inputs
readLengthInfer.into {
readLengthInfer_aggrQC
readLengthInfer_uploadQC
...
...
@@ -761,7 +761,7 @@ process inferMetadata {
# infer experimental setting from dedup bam
echo -e "LOG: infer experimental setting from dedup bam" >> ${repRID}.inferMetadata.log
infer_experiment.py -r "\${bed}" -i "\${bam}" 1>> ${repRID}.infer_experiment.txt
echo -e "LOG: infered" >> ${repRID}.inferMetadata.log
echo -e "LOG: infer
r
ed" >> ${repRID}.inferMetadata.log
ended=`bash ${script_inferMeta} endness ${repRID}.infer_experiment.txt`
fail=`bash ${script_inferMeta} fail ${repRID}.infer_experiment.txt`
...
...
@@ -789,7 +789,7 @@ process inferMetadata {
fi
echo -e "LOG: stradedness set to: \${stranded}" >> ${repRID}.inferMetadata.log
# write infered metadata to file
# write infer
r
ed metadata to file
echo "\${ends},\${stranded},\${spike},\${species},\${align_ercc},\${align_hu},\${align_mo},\${percentF},\${percentR},\${fail}" 1>> infer.csv
"""
}
...
...
@@ -853,7 +853,7 @@ speciesInfer.into {
}
/*
* checkMetadata: checks the submitted metada against infered
* checkMetadata: checks the submitted metada against infer
r
ed
*/
process checkMetadata {
tag "${repRID}"
...
...
@@ -878,15 +878,15 @@ process checkMetadata {
ulimit -a >> ${repRID}.checkMetadata.log
pipelineError=false
# check if submitted metadata matches infered
# check if submitted metadata matches infer
r
ed
if [ "${endsMeta}" != "${endsInfer}" ]
then
pipelineError=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}; Infer
r
ed=${endsInfer}" >> ${repRID}.checkMetadata.log
else
pipelineError_ends=false
echo -e "LOG: ends matches: Submitted=${endsMeta}; Infered=${endsInfer}" >> ${repRID}.checkMetadata.log
echo -e "LOG: ends matches: Submitted=${endsMeta}; Infer
r
ed=${endsInfer}" >> ${repRID}.checkMetadata.log
fi
if [ "${strandedMeta}" != "${strandedInfer}" ]
then
...
...
@@ -894,39 +894,39 @@ process checkMetadata {
pipelineError_stranded=true
if [ "${strandedMeta}" == "stranded" ]
then
if [ "${strandedInfer}" == "forward"] |
[ "${strandedInfer}" == "reverse" ]
if [
[
"${strandedInfer}" == "forward"
]
] |
| [
[ "${strandedInfer}" == "reverse" ]
]
then
pipelineError=false
pipelineError_stranded=false
echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log
echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Infer
r
ed=${strandedInfer}" >> ${repRID}.checkMetadata.log
else
echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log
echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Infer
r
ed=${strandedInfer}" >> ${repRID}.checkMetadata.log
fi
else
echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log
echo -e "LOG: stranded does not match: Submitted=${strandedMeta}; Infer
r
ed=${strandedInfer}" >> ${repRID}.checkMetadata.log
fi
else
pipelineError=false
pipelineError_stranded=false
echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Infered=${strandedInfer}" >> ${repRID}.checkMetadata.log
echo -e "LOG: stranded matches: Submitted=${strandedMeta}; Infer
r
ed=${strandedInfer}" >> ${repRID}.checkMetadata.log
fi
if [ "${spikeMeta}" != "${spikeInfer}" ]
then
pipelineError=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}; Infer
r
ed=${spikeInfer}" >> ${repRID}.checkMetadata.log
else
pipelineError_spike=false
echo -e "LOG: stranded matches: Submitted=${spikeMeta}; Infered=${spikeInfer}" >> ${repRID}.checkMetadata.log
echo -e "LOG: stranded matches: Submitted=${spikeMeta}; Infer
r
ed=${spikeInfer}" >> ${repRID}.checkMetadata.log
fi
if [ "${speciesMeta}" != "${speciesInfer}" ]
then
pipelineError=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}; Infer
r
ed=${speciesInfer}" >> ${repRID}.checkMetadata.log
else
pipelineError_species=false
echo -e "LOG: species matches: Submitted=${speciesMeta}; Infered=${speciesInfer}" >> ${repRID}.checkMetadata.log
echo -e "LOG: species matches: Submitted=${speciesMeta}; Infer
r
ed=${speciesInfer}" >> ${repRID}.checkMetadata.log
fi
# create dummy output bag rid if failure
...
...
@@ -1454,7 +1454,7 @@ assignedReadsInfer_fl.splitCsv(sep: ",", header: false).separate(
assignedReadsInfer
)
// Replicate infered assigned reads for multiple process inputs
// Replicate infer
r
ed assigned reads for multiple process inputs
assignedReadsInfer.into {
assignedReadsInfer_aggrQC
assignedReadsInfer_uploadQC
...
...
@@ -1499,7 +1499,7 @@ rawReadsInfer_fl.splitCsv(sep: ",", header: false).separate(
rawReadsInfer
)
// Replicate infered raw reads for multiple process inputs
// Replicate infer
r
ed raw reads for multiple process inputs
rawReadsInfer.into {
rawReadsInfer_aggrQC
rawReadsInfer_uploadQC
...
...
@@ -1654,9 +1654,9 @@ process aggrQC {
echo -e "Submitter\t${speciesM}\t${endsM}\t${strandedM}\t${spikeM}\t-\t-\t'${readLengthM}'\t-" >> metadata.tsv
if [ "${params.speciesForce}" == "" ]
then
echo -e "Infered\t${speciesI}\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv
echo -e "Infer
r
ed\t${speciesI}\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv
else
echo -e "Infered\t${speciesI} (FORCED)\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv
echo -e "Infer
r
ed\t${speciesI} (FORCED)\t${endsI}\t${strandedI}\t${spikeI}\t-\t-\t-\t-" >> metadata.tsv
fi
echo -e "Measured\t-\t${endsManual}\t-\t-\t'${rawReadsI}'\t'${assignedReadsI}'\t'${readLengthI}'\t'${tinMedI}'" >> metadata.tsv
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment