@@ -78,7 +78,8 @@ def get_arg():
78
78
step 2: assembly, \
79
79
step 3: blast contigs, \
80
80
step 4: orf discovery, \
81
- step 5: reporting (default: 12345 - i.e, steps 1 through 5).' )
81
+ step 5: reporting (default: 12345 - i.e, steps 1 through 5), \
82
+ step 7: blast unassembled reads.' )
82
83
83
84
# Trinity default contig length is 200
84
85
# Ioan: for detection of species, impose no bound on the contig length in assembly
@@ -230,7 +231,8 @@ def scan_main(args):
230
231
'3' : '-S {mypython} -N blst_{args.identifier} -V -cwd -o log.out -e log.err' .format (mypython = sys .executable , args = args ),
231
232
'4' : '-S {mypython} -N orf_{args.identifier} -V -cwd -o log.out -e log.err' .format (mypython = sys .executable , args = args ),
232
233
'5' : '-S {mypython} -N rep_{args.identifier} -V -cwd -o log.out -e log.err' .format (mypython = sys .executable , args = args ),
233
- '6' : '-S {mypython} -N rep2_{args.identifier} -V -cwd -o log.out -e log.err' .format (mypython = sys .executable , args = args )
234
+ '6' : '-S {mypython} -N rep2_{args.identifier} -V -cwd -o log.out -e log.err' .format (mypython = sys .executable , args = args ),
235
+ '7' : '-S /bin/bash -N blst_unass_{args.identifier} -V -cwd -o log.out -e log.err' .format (args = args )
234
236
}
235
237
236
238
# dict which maps each step to extra qsub params for the CUMC cluster
@@ -240,7 +242,8 @@ def scan_main(args):
240
242
'3' : ' -l mem=4G,time=8::' ,
241
243
'4' : ' -l mem=2G,time=2::' ,
242
244
'5' : ' -l mem=1G,time=1::' ,
243
- '6' : ' -l mem=1G,time=1::'
245
+ '6' : ' -l mem=1G,time=1::' ,
246
+ '7' : ' -l mem=1G,time=12::'
244
247
}
245
248
246
249
# dict which maps each step to the shell part of the command
@@ -250,7 +253,8 @@ def scan_main(args):
250
253
'3' : '{args.scripts}/scripts/blast_wrapper.py --scripts {args.scripts} --threshold {args.contigthreshold} --db {args.blastdb} --threads {args.blast_threads} --id {args.identifier} --filelength {args.blastchunk} --verbose {args.verbose} --noclean {args.noclean} --nosge {args.noSGE} --hpc {args.hpc} --btime {args.btime} --bmem {args.bmem}' .format (args = args ),
251
254
'4' : '{args.scripts}/scripts/orf_discovery.py --scripts {args.scripts} --id {args.identifier} --threshold {args.orfthreshold} --db {args.pblastdb} --blast {args.orfblast} --verbose {args.verbose} --noclean {args.noclean}' .format (args = args ),
252
255
'5' : '{args.scripts}/scripts/makereport.py --scripts {args.scripts} --id {args.identifier} --verbose {args.verbose} --blacklist {args.blacklist} --taxid2names {args.taxid2names} --hpc {args.hpc}' .format (args = args ),
253
- '6' : '{args.scripts}/scripts/makereport.py --outputdir report_ifilter --input blast/ifilter.concat.txt --scripts {args.scripts} --id {args.identifier} --verbose {args.verbose} --blacklist {args.blacklist} --taxid2names {args.taxid2names} --hpc {args.hpc}' .format (args = args )
256
+ '6' : '{args.scripts}/scripts/makereport.py --outputdir report_ifilter --input blast/ifilter.concat.txt --scripts {args.scripts} --id {args.identifier} --verbose {args.verbose} --blacklist {args.blacklist} --taxid2names {args.taxid2names} --hpc {args.hpc}' .format (args = args ),
257
+ '7' : '{args.scripts}/scripts/blast_unassembled_reads.sh assembly/reads2contigs.bam blast_unassembled_reads {args.scripts} {args.blastdb} {args.blacklist} {args.taxid2names} {args.scripts}/resources/blast.header' .format (args = args )
254
258
}
255
259
256
260
# start with job id set to zero string
0 commit comments