-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
86b07b6
commit 697c1d1
Showing
12 changed files
with
305 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ | |
Copyright (C) 2016 Miguel Machado <[email protected]> | ||
Last modified: March 23, 2017 | ||
Last modified: April 03, 2017 | ||
This program is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
|
@@ -70,7 +70,7 @@ def get_trueCoverage_config(skipTrueCoverage, trueConfigFile, speciesExpected, s | |
|
||
|
||
def main(): | ||
version = '2.4' | ||
version = '2.5' | ||
args = utils.parseArguments(version) | ||
|
||
general_start_time = time.time() | ||
|
@@ -201,6 +201,9 @@ def main(): | |
print 'Only one fastq file was found: ' + str(fastq_files) | ||
print 'Pair-End sequencing is required. Moving to the next sample' | ||
continue | ||
elif len(fastq_files) == 0: | ||
print 'No compressed fastq files were found. Continue to the next sample' | ||
continue | ||
|
||
print 'The following files will be used:' | ||
print str(fastq_files) + '\n' | ||
|
@@ -278,7 +281,7 @@ def get_samples(args_inputDirectory, args_fastq, outdir, pairEnd_filesSeparation | |
print '' | ||
samples, removeCreatedSamplesDirectories, indir_same_outdir = utils.checkSetInputDirectory(inputDirectory, outdir, pairEnd_filesSeparation_list) | ||
elif args_inputDirectory is None: | ||
fastq_files = [fastq.name for fastq in args_fastq] | ||
fastq_files = [os.path.abspath(fastq.name) for fastq in args_fastq] | ||
if fastq_files[0] == fastq_files[1]: | ||
sys.exit('Same fastq file provided twice') | ||
inputDirectory, samples, removeCreatedSamplesDirectories, indir_same_outdir = get_sample_args_fastq(fastq_files, outdir, pairEnd_filesSeparation_list) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#reference_file (fasta file full path) | ||
/home/mpmachado/INNUca/modules/trueCoverage_rematch/escherichia_coli.fasta | ||
#length_extra_seq (int) | ||
100 | ||
#maximum_number_absent_genes (int) | ||
2 | ||
#maximum_number_genes_multiple_alleles (int) | ||
1 | ||
#minimum_read_coverage (x, int) | ||
25 | ||
#minimum_depth_presence (x, int) | ||
5 | ||
#minimum_depth_call (x, int) | ||
10 | ||
#minimum_depth_frequency_dominant_allele (0-1, double) | ||
0.60 | ||
#minimum_gene_coverage (0-100, int) | ||
80 | ||
#minimum_gene_identity (0-100, int) | ||
70 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
>ECs0135 | ||
GGGGGATAATCCGTTGTTACTAAAACGACTTTATATCTTAAGAACGGATTCGCTGGAGACGATGTCGCGGCTGGTGAGTAACCAGCCGCAGGGATAACAATCAAGCAACCTGTACCGGAATCGCTTTCGCGGTACGTTTCATTTCATTGTCGCCTTCAAAATAGGCGACGTTGGGTCGCCAGGTGCGAGCTTCTTCATCTGGCATGGTAACGAAGCTGGCGATGATGACAATATCGCCGACACTGGCGCAGTGGGCCGCCGCACCGTTAACAGAAATAATTCTCGAACCGCGTTCTGCCGCGATGGCATAAGTGGAGAAACGCTTGCCGTTGGTGACATTCCAGATATCAATGGCTTCGTTTTCGAGAATACCGGCTGCGTCAAGAAAATCCTGGTCAATGGCGCAAGAACCTTCATAGTGCAGGTCCGCATGAGTCACTTTCACGCGGTGGAGTTTGCCCTGCAGCATCGTGCGAATCATAACTTCTACCTTTCTACCCTGTCGTTAACGAAGCAGGCGGTGCCTGCTTTGAGGAAATTCTCACGCAGTATTGCCCGATTTTTGTTTAGTGTCTACTCAT | ||
>ECs0489 | ||
GAAACCTAAATATTTGTTGTTAAGCTGCAATGGAAACGGTAAAAGCGGCTAGTATTTAAAGGGATGGATGACATCTCAGCGTTGTCGGAGGAGATATTTCATGATGATACGTGAGCGGATAGAAGAAAAATTAAGGGCGGCGTTCCAACCCGTATTCCTCGAAGTAGTGGATGAAAGCTATCGTCACAATGTCCCAGCCGGCTCTGAAAGCCATTTTAAAGTTGTGCTGGTCAGCGATCGTTTTACGGGTGAACGTTTTCTGAATCGTCATCGAATGATTTACAGTACTTTAGCGGAGGAACTCTCTACTACCGTTCATGCGCTGGCTCTGCATACTTACACTATTAAGGAGTGGGAAGGGTTGCAGGACACCGTCTTTGCCTCTCCTCCCTGTCGTGGAGCAGGAAGCATCGCGTAAAAACGCATTTGCAACTGTCGGCGCTTTTCCAGTATGTTGCTAAAGATTTTATGAAAAACGGCCTGCGGGCCGTTTTGTTTTGTCTGGATTTTGCGCTTTT | ||
>ECs0662 | ||
TCACTTTTTAGTAAAGTTGCACTGGACAAAGCGTACCACAATTGGTGTACTGGTAACCGACACAGCATTTGTGTCTATTTTTCATGTAAAGGTAATTTTGATGTCTAAGATTAAAGGTAACGTTAAGTGGTTTAATGAGTCCAAAGGATTCGGTTTCATTACTCCGGAAGACGGCAGCAAAGACGTGTTCGTACACTTCTCTGCAATCCAGACTAATGGTTTTAAAACTCTTGCTGAAGGTCAGCGCGTAGAGTTCGAAATCACTAACGGTGCCAAAGGCCCTTCTGCTGCAAACGTAATCGCTCTGTAAGATACGTCAGCAAGAATTCAAAACCCGCTTAATCAGCGGGTTTTTTTTGGTCTTTAGTGTGCGGTTGAGGCCGAAAACAGCCAGAATGCCAGTGCGGTCA | ||
>ECs0916 | ||
TTGTTAATTCGGCGTGAAGAATTGATCCTGGACAGCATTATGCTCAAAAAATAGCCATACTATTTAATTGCAACAAGGCTGGAAAGAGGAGGATCGAAGTATGTTCGTTGACAGACAGCGAATCGATCTGCTGAACCGGTTGATCGACGCACGCGTTGACCTCGCCGCATACGTGCAACTGAGGAAGGCAAAAGGATACATGTCCGTCAGCGAAAGCAATCATCTACGAGATAACTTTTTTAAACTGAATCGCGAACTGCACGATAAATCGCTGCGGTTGAATCTTCATCTGGATCAGGAAGAGTGGAGTGCTCTTCATCATGCTGAAGAAGCATTAGCGACAGCCGCAGTATGTTTGATGAGTGGGCACCATGATTGCCCGACTGTTATTACCGTCAACGCCGATAAGCTTGAAAATTGTCTGATGAGCTTAACGCTGAGTATCCAGAGCCTGCAGAAGCACGCCATGCTTGAGAAGGCCTGAAAACTAAGGGGGAGAAAGCGTCTCCCCCTTCATGTTTAAGTTTTTGTAAAAATGAATTTGTTATCTCCTCCACTGACTACGCTTTAAGCCAGAGTCAATC | ||
>ECs1050 | ||
TGGTGATGGATCGCTGCCCGGCTATTGAGATCCCTCGCCTGGGCCTGGCCAAATAAAAAATCCCCGGAAGGCAAAAACCTTCCGGGGATCTGTTCAGGGATTAGTTACGCAGACGCGGGGCCTGGAGTTGTTTGCGGATGGTCTGCGCCAGCTCATCCATGGATGGCTGTTCAGGATGTTCATCCTGCAATTCGCTACTTAGCTGGGCTTCAGCCAGGTAGGTATGAACCGGTAGGCCGTTATCGTCCTCCATCACCACGTGATACCACGGAGCGGCGCGAAGCTCGTCATTCACCGCCAGCTCATCAGGCGACGGTTCAGAGAGCGAATAAACCGGGTCGATATCCACGACCACTCCGAGATAACCTAACAGGGAATGGCGGACCTGCTGGCCGATACCGAATTTGCTGGCAATCATAGTCACCTCCCGGGAAATCTTTACCTTTGATATAAGGGTAAAATTCCACATTTCAAGTTACATGACGCGACAGGCAAACCCTTTCAGATATAGCCCTTCC | ||
>ECs1438 | ||
TCTCATGGTTTAAGCAGAGTAATTAACTGAATGCAGATATACAACCCAGAAATGGTAAAGGCACCGGTGAGGTGCCTTTTGGGTGGATGGTCATGTCATGTTAATGACGCCGATACTCGTTTACCGGGAAATCACCGGATTCAATTTTGGCGATTCCTGCTTCTAATATCGAAATAAATTGTCTGGCAACATCAGTGGTTAACCAGAGCGTCTGACCAACTTCAGTCCCTTCCTGCTCGGACTTATTTGGGGTCTGGTAGTGCAAACGCAACATCAGCGCATCATAGCTATCAACGGTGCTGATGTCCCACCCTACGAGCGGATGAGTCTGAATGACTTCATTATTTTTTTCCATCATGGCCCCCTAATTCGTGTTACTAGACAACGTTATTCGAGGTTCAATGCGTTTTTATCTGAAGCAACTTCAGTATACCAATAAATAAGGGTAATCACCG | ||
>ECs2085 | ||
TTAACTCCTCAATCCTGTTGCTAGTTTTAAGGACAACATCGCCGTAGCGAAGAAACACGTGCTAAACCCCTAAATTAGGTTGCCGATCAAGCATAGCATCTTAAAGCGTAGGGTGCTGGCCACTGACCACATAATTGATCGTTTGCTGGTAGATATCACTGAGGATGTCGTTATCAGAAGCTTCCACCCATTTGGTCAGCTCCATGAGAATGTCATCTTCAGTGACAACACCGTGCTCTGCCCGAAGGCCTTGCTCAATGGCATTAACCAGAGCGGGTTCTGCTGTTGAATTTTCTGCCTGATAATAAGTAAACATAGTGATTCTCCGTGTCTGTGTATTTATAGTGTCTGCTACGGATCGCAGATTTATAAAGCACATTCAGCATGGCAAATATTTGCCGCTTCGTTGTTAAGAT | ||
>ECs2384 | ||
ATAAGTGCCTTCCCATCAAAAAAATATTCTCAACATAAAAAACTTTGTGTAATACTTGTAACGCTACATGGAGATTAACTCAATCTAGAGGGTATTAATAATGAAAGCTACTAAACTGGTACTGGGCGCGGTAATCCTGGGTTCTACTCTGCTGGCAGGTTGCTCCAGCAACGCTAAAATCGATCAGCTGTCTTCTGACGTTCAGACTCTGAACGCTAAAGTTGACCAGCTGAGCAACGACGTGAACGCAATGCGTTCCGACGTTCAGGCTGCTAAAGATGACGCAGCTCGTGCTAACCAGCGTCTGGACAACATGGCTACTAAATACCGCAAGTAATAGTACCTGTGAAGTGAAAAATGGCGCACATTGTGCGCCATTTTTTTGTCTGCTATTTACCACTACTGCGTCGCGCGTAACATATTCCCTTGCTCTGGTT | ||
>ECs2533 | ||
AACGCCAGGAGCGAAGATAAAGCATAGTAAAAAGCCTCGCATTCGACGAGGCTTTATAGCGAGATTGAAGCGTATTCACACTTCAGATCAGTGGATTCGATCAGATAGCTGTTACGTTAACAGCTGCCGGACCTTTCTGGCCGTCCTGAATTTCGAACTCAACGTTCTGACCTTCAGCCAGAGTTTTGAAGCCATTACCCTGGATAGCGGAGAAGTGTACGAACACGTCTTTGCTGCCATCAGCAGGAGTAATGAAGCCAAAACCTTTAGACTCGTTGAACCACTTAACCTGACCTTTAATCTTTGCCATTTGAAAAATTCCTTAGATTGTTTTCTTCGCCCGCAGGCATAACATAGATAAAACTGACACATTACTGCATGAGGCACCAATATAAGGCTCGGCAGAGAAG | ||
>ECs3163 | ||
ACGCCGACGATCGCCGAGACGTTTTCAGACCAGCGCCCACGGGAGAACGCCAGCAGGACGAAGCCAATCAATGGCAAAATAATGGTTAAGGCAAGCATGTTCATCCGCGCATCTCACTTACTGAATCGATGTTCAGGTTCTGGCGACGACGGTGAAGTTGCAGCAGCAGCGCAAGGCCGATACTCGCTTCTGCCGCCGCGAGGCTGATGGCGAGAATGTACATCACCTGACCGTCGGTCTGGCCCCAGTAACTTCCGGCGACCACAAAGGCCAGCGCGGAAGCGTTAATCATGATTTCCAGACCAATCAGCATAAACAGCAGATTGCGACGGATAACCAGACCGGTTAAGCCAAGAACGAATAAGATTGCCGCGAGGATCAGTCCATGTTGTAAGGGGATCATGCGTGCTCCTCCGTTTTTCTTTTCGCGCTGTCGTCTTTACGATTGCTCAGCACTTCACCCGCACGCTCTTCACGACCGACGTGGAAGGCCACAACCAGAC | ||
>ECs3469 | ||
GCAGTGGTGATTACTCCCCCTTAAAACACGAGCAAACAGATAAAAAAAGGGCCAGCCAATTGGCCAGCCCTTCTTAACAGGATGTCGCTTAAGCGAAATCTTAGTTAAGACGCTCTTTGATACGAGCAGCCTTACCAGTACGCTCACGCAGGTAGTACAGTTTAGCTTTACGAACAGCACCACGACGTTTGACAGAAATGCTGTCAACTACCGGAGAGTGAGTCTGGAAGACACGCTCAACGCCTTCGCCGTTGGAAATTTTACGAACAGTGAATGCAGAGTGCAGACCGCGGTTACGAATAGCGATAACCACGCCCTCGAATGCCTGCAGACGTTTTTTGGAACCTTCAACAACCCATACTTTCACTTCCACGGTATCACCCGGACGGAAGGAAGGTACGTCCTGCTTCATCTGCTCTTGTTCAAGTTGCTTAATAATGTTGCTCATAATTTAATCTCTTATCCTGGGTAAACTGATATCTCGGGGGCTTACGCCATCCCATCATGTTTATGTTGCTGTTGTGCGTGTTCCGTTTTGAACTCCGCCA | ||
>ECs3602 | ||
GCTTAGGACATTCCGTTTGCATTCGACGGCCAAATCCGGCCGCCGGAACCACGGCGCAAACATCCAAATGAGTGGTTGCCATGTTAATTCCCGGGCTGATTTATCGATTGTTTTGCCCCGCAGACTGTGCGCGCTTCGACGCGTCAGGCACCAGACGATAAAAAGTTTCGCCCGGCCTGGTCATGCTGAGTTCATTACGCGCACGCTCTTCGAGCGCCTCCTGGCCGCCATTGAGATCGTCAATTTCGGCAAAAAGTTGATCGTTTCGCGCTTTAAGTTTCGCGTTTGTAGCTTGCTGTGCCGCCACATCATCATTGACGCGGGTATAGTCATGTATACCGTTCTTACCGAACCACAGCGAATACTGTAGCCAGACCAGAATAGCCAGCAACAGCAGCGTTAGTTTACCCATCCTGCCCCCTGAAAAACGGCATCATCATCCCATGCATCCGAAGACGACTCTACATCCTCTGTTGGGGATACCGCGACAACGCGGGCAAATGTACCACATT | ||
>ECs4064 | ||
CGGATTAACGTCGCACCATGCGCATTTTTACCGGTTATCGAATGTAAAAAGCCCCGCAACGTGTTGCGGGGCTTTCATCCGTTACCGGGACGCGAAAAACTTATTCAGCTTCGATGCTGATAAATTTACGGTTTTTCGGGCCTTTAACTTCGAATTTCACTTTACCGTCTGCTTTAGCAAACAGAGTGTGGTCACGACCGCAACCTACGTTAGCGCCAGCGTGGAATTTGGTACCACGTTGACGAACGATGATGCTACCCGCCAGAACGGATTCGCCACCGAAACGCTTAACGCCCAGGCGTTTAGCTTCTGAATCGCGACCGTTACGTGTGGAGCCGCCAGCCTTTTTATGTGCCATTTGAAATCTCTCCTCAGGTCTTAGGCGCTGATGCCAGTAATTTTCACATCAGTGAACCACTGACGATGGCCCTGCTGCTTACGATAGTGTTTACGACGAC | ||
>ECs4440 | ||
GCATGCCCTGACTTCACCCCGCTGTGTCTGCTTTTCCCGACTATTCTTAATGAGCTTCGATGCAATTCACGATCCCGCAGTGTGATTTGAGGAGTTTTCAATGGAATATAAAGATCCAATGCATGAGCTGTTGAGCAGCCTGGAACAGATTGTTTTTAAAGATGAAACGCAGAAAATTACCCTGACGCACAGAACAACGTCCTGTACCGAAATTGAGCAGTTACGAAAAGGGACAGGATTAAAAATCGATGATTTCGCCCGGGTTTTGGGCGTATCAGTCGCCATGGTAAAGGAATGGGAATCCAGACGCGTGAAGCCTTCAAGTGCCGAACTAAAATTGATGCGTTTGATTCAAGCCAACCCGGCATTAAGTAAGCAGTTGATGGAATAGACTTTTATCCACTTTATTGCTGTTTACGGTCCTGATGACAGGACCGTTTTCCAACCGATTAATCATAAATATGAAAAATAATTGTTGCATCACCCGCCAA | ||
>ECs4714 | ||
TTCTGTTAAATGTGTTTTGCTCATAGTGTGGTAGAATATCAGCTTACTATTGCTTTACGAAAGCGTATCCGGTGAAATAAAGTCAACCTTTAGTTGGTTAATGTTACACCAACAACGAAACCAACACGCCAGGCTTATTCCTGTGGAGTTATATATGAGCGATAAAATTATTCACCTGACTGACGACAGTTTTGACACGGATGTACTCAAAGCGGACGGGGCGATCCTCGTCGATTTCTGGGCAGAGTGGTGCGGTCCGTGCAAAATGATCGCCCCGATTCTGGATGAAATCGCTGACGAATATCAGGGCAAACTGACCGTTGCAAAACTGAACATCGATCAAAACCCTGGCACTGCGCCGAAATATGGCATCCGTGGTATCCCGACTCTGCTGCTGTTCAAAAACGGTGAAGTGGCGGCAACCAAAGTGGGCGCACTGTCTAAAGGTCAGTTGAAAGAGTTCCTCGACGCTAACCTGGCGTAAGGGAATTTCATGTTCGGGTGCCCCGTCGCTAAAAACTGGACGCCCGGCGTGAGTCATGCTAACTTAGTGTTGACTTCGTATTAAACATACCTTATTAAGT | ||
>ECs4923 | ||
AAAAAGTGGCTATCGGTGCGTGTATGCAGGAGAGTGCTATTCTGGCATTTCCGTCGCACTCGATGCTTAGCAAGCGATAAACACATTGTAAGGATAACTTATGAACAAGACTCAACTGATTGATGTAATTGCAGAGAAAGCAGAACTGTCCAAAACCCAGGCTAAAGCTGCTCTGGAGTCCACTCTGGCTGCAATTACTGAGTCTCTGAAAGAAGGCGATGCTGTACAACTGGTTGGTTTCGGTACCTTCAAAGTGAACCACCGCGCTGAGCGTACTGGCCGCAACCCGCAGACCGGTAAAGAAATCAAAATTGCCGCAGCTAACGTACCGGCATTTGTTTCTGGCAAGGCACTGAAAGACGCAGTTAAGTAAGATTGCGTGGCAGTGAACAGTTTTAACGAAGGGGTGGTTTCACCCCTTTTGTCTTTCTGGCGTCGATCATTGATGCTGGCTGGCGCTCTGTTTCTCACTG | ||
>ECs5178 | ||
GTTCAGGGGTTCATTTCATGCCACAAGGCAAAGAACGGACTGAGCAAAATGGTTTTGCATGCCGAGCAGATTGAATTGATAGATTCTGGAGACTAGCCATATGGCACGTTATTTCCGTCGTCGCAAGTTCTGCCGTTTCACCGCGGAAGGCGTTCAAGAGATCGACTATAAAGATATCGCTACGCTGAAAAACTACATCACCGAAAGCGGTAAGATTGTCCCAAGCCGTATCACCGGTACCCGTGCAAAATACCAGCGTCAGCTGGCTCGCGCTATCAAACGCGCTCGCTACCTGTCCCTGCTGCCGTACACTGATCGCCATCAGTAATCGGTCACGGTCCATTAATACGACTTTGAGAGGATAAGGTAATGCAAGTTATTCTGCTTGATAAAGTAGCAAACCTGGGTAGCCTGGGTGATCAGGTAAA |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#reference_file (fasta file full path) | ||
/home/mpmachado/INNUca/modules/trueCoverage_rematch/salmonella_enterica.fasta | ||
#length_extra_seq (int) | ||
100 | ||
#maximum_number_absent_genes (int) | ||
2 | ||
#maximum_number_genes_multiple_alleles (int) | ||
1 | ||
#minimum_read_coverage (x, int) | ||
25 | ||
#minimum_depth_presence (x, int) | ||
5 | ||
#minimum_depth_call (x, int) | ||
10 | ||
#minimum_depth_frequency_dominant_allele (0-1, double) | ||
0.60 | ||
#minimum_gene_coverage (0-100, int) | ||
80 | ||
#minimum_gene_identity (0-100, int) | ||
70 |
Oops, something went wrong.