Skip to content
Snippets Groups Projects
Commit d92d93f9 authored by Jonathan Gesell's avatar Jonathan Gesell
Browse files

Updated Hisat2 options, and output of parseMeta.

parent 25502c3d
Branches
Tags
2 merge requests!37v0.0.1,!15Resolve "process_align"
Pipeline #5772 failed with stages
in 8 minutes and 47 seconds
...@@ -197,7 +197,7 @@ if (spike == 'yes') { ...@@ -197,7 +197,7 @@ if (spike == 'yes') {
reference = Channel.fromPath ("/project/BICF/BICF_Core/shared/gudmap/references/GRCm38.P6/hisat2") reference = Channel.fromPath ("/project/BICF/BICF_Core/shared/gudmap/references/GRCm38.P6/hisat2")
} }
} }
reference.subscribe { println "$it" } //reference.subscribe { println "$it" }
/* /*
* trimData: trims any adapter or non-host sequences from the data * trimData: trims any adapter or non-host sequences from the data
...@@ -249,8 +249,8 @@ process alignReads { ...@@ -249,8 +249,8 @@ process alignReads {
script: script:
""" """
if [ "${endsManual_alignReads}" == 'pe' ]; then if [ "${endsManual_alignReads}" == 'pe' ]; then
hisat2 -p `nproc` --add-chrname --un-gz ${repRID}.unal.gz -S ${repRID}.sam -x ${reference}/genome -1 ${fqs[0]} -2 ${fqs[1]} 1>${repRID}.align.out 2>${repRID}.align.err; hisat2 -p `nproc` --add-chrname --un-gz ${repRID}.unal.gz -S ${repRID}.sam -x ${reference}/genome ${stranded_alignReads} -1 ${fqs[0]} -2 ${fqs[1]} 1>${repRID}.align.out 2>${repRID}.align.err;
else hisat2 -p `nproc` --add-chrname --un-gz ${repRID}.unal.gz -S ${repRID}.sam -x ${reference}/genome -U ${fqs[0]} 1>${repRID}.align.out 2>${repRID}.align.err; else hisat2 -p `nproc` --add-chrname --un-gz ${repRID}.unal.gz -S ${repRID}.sam -x ${reference}/genome ${stranded_alignReads} -U ${fqs[0]} 1>${repRID}.align.out 2>${repRID}.align.err;
fi; fi;
samtools view -1 --threads `nproc` -o ${repRID}.bam ${repRID}.sam 1>>${repRID}.align.out 2>>${repRID}.align.err; samtools view -1 --threads `nproc` -o ${repRID}.bam ${repRID}.sam 1>>${repRID}.align.out 2>>${repRID}.align.err;
samtools sort -@ `nproc` -O BAM -o ${repRID}.bam 1>>${repRID}.align.out 2>>${repRID}.align.err; samtools sort -@ `nproc` -O BAM -o ${repRID}.bam 1>>${repRID}.align.out 2>>${repRID}.align.err;
......
...@@ -54,9 +54,12 @@ def main(): ...@@ -54,9 +54,12 @@ def main():
# Get strandedness metadata from 'Experiment Settings.csv' # Get strandedness metadata from 'Experiment Settings.csv'
if (args.parameter == "stranded"): if (args.parameter == "stranded"):
if (metaFile.Has_Strand_Specific_Information.unique() == "yes"): if (metaFile.Has_Strand_Specific_Information.unique() == "yes"):
stranded = "stranded" if endsManual == "se":
stranded = "--rna-strandness F"
else:
stranded = "--rna-strandness FR"
elif (metaFile.Has_Strand_Specific_Information.unique() == "no"): elif (metaFile.Has_Strand_Specific_Information.unique() == "no"):
stranded = "unstranded" stranded = ""
else: else:
print("Stranded metadata not match expected options: " + metaFile.Has_Strand_Specific_Information.unique()) print("Stranded metadata not match expected options: " + metaFile.Has_Strand_Specific_Information.unique())
exit(1) exit(1)
...@@ -85,4 +88,4 @@ def main(): ...@@ -85,4 +88,4 @@ def main():
print(species) print(species)
if __name__ == '__main__': if __name__ == '__main__':
main() main()
\ No newline at end of file
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