# HG changeset patch # User greg # Date 1467815106 14400 # Node ID 4df8e9f58a53dea878569fbc7d46426fcc5aadb6 # Parent e85346ab5054727009e169cf8f738f2a97c5fba2 Uploaded diff -r e85346ab5054 -r 4df8e9f58a53 fimo.xml --- a/fimo.xml Thu Jun 16 08:07:03 2016 -0400 +++ b/fimo.xml Wed Jul 06 10:25:06 2016 -0400 @@ -1,8 +1,8 @@ - + - Scan a set of sequences for motifs. - imagemagick - meme + graphicsmagick + meme Yes - + + + + @@ -178,7 +181,7 @@ - options_type['output_separate_motifs'] == 'no' + options_type['options_type_selector'] == 'basic' or (options_type['options_type_selector'] == 'advanced' and options_type['output_separate_motifs'] == 'no') @@ -193,7 +196,7 @@ - options_type['output_separate_motifs'] == 'yes' + options_type['options_type_selector'] == 'advanced' and options_type['output_separate_motifs'] == 'yes' diff -r e85346ab5054 -r 4df8e9f58a53 fimo_wrapper.py --- a/fimo_wrapper.py Thu Jun 16 08:07:03 2016 -0400 +++ b/fimo_wrapper.py Wed Jul 06 10:25:06 2016 -0400 @@ -56,13 +56,13 @@ parser.add_argument('--max_strand', action='store_true', help='If matches on both strands at a given position satisfy the output threshold, only report the match for the strand with the higher score') parser.add_argument('--max_stored_scores', dest='max_stored_scores', type=int, help='Maximum score count to store') parser.add_argument('--motif', dest='motifs', action='append', default=[], help='Specify motif by id') -parser.add_argument('--output_separate_motifs', default="no", help='Output one dataset per motif') +parser.add_argument('--output_separate_motifs', dest='output_separate_motifs', default='no', help='Output one dataset per motif') parser.add_argument('--motif_pseudo', dest='motif_pseudo', type=float, default=0.1, help='Pseudocount to add to counts in motif matrix') parser.add_argument('--no_qvalue', action='store_true', help='Do not compute a q-value for each p-value') parser.add_argument('--norc', action='store_true', help='Do not score the reverse complement DNA strand') parser.add_argument('--output_path', dest='output_path', help='Output files directory') -parser.add_argument('--parse_genomic_coord', default='no', help='Check each sequence header for UCSC style genomic coordinates') -parser.add_argument('--remove_duplicate_coords', default='no', help='Remove duplicate entries in unique GFF coordinates') +parser.add_argument('--parse_genomic_coord', dest='parse_genomic_coord', default='no', help='Check each sequence header for UCSC style genomic coordinates') +parser.add_argument('--remove_duplicate_coords', dest='remove_duplicate_coords', default='no', help='Remove duplicate entries in unique GFF coordinates') parser.add_argument('--qv_thresh', action='store_true', help='Use q-values for the output threshold') parser.add_argument('--thresh', dest='thresh', type=float, help='p-value threshold') parser.add_argument('--gff_output', dest='gff_output', help='Gff output file') diff -r e85346ab5054 -r 4df8e9f58a53 test-data/fimo_output_html_1.html --- a/test-data/fimo_output_html_1.html Thu Jun 16 08:07:03 2016 -0400 +++ b/test-data/fimo_output_html_1.html Wed Jul 06 10:25:06 2016 -0400 @@ -41,12 +41,10 @@

- DATABASE /Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2541.dat
Database contains 1 sequences, 5386 residues

- MOTIFS /Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2540.dat (Protein) @@ -98,3 +96,5 @@ probability of a random sequence of the same length as the motif matching that position of the sequence with as good or better a score. +
  • +The score for the match of a position in a sequence to a motif diff -r e85346ab5054 -r 4df8e9f58a53 test-data/fimo_output_html_2.html --- a/test-data/fimo_output_html_2.html Thu Jun 16 08:07:03 2016 -0400 +++ b/test-data/fimo_output_html_2.html Wed Jul 06 10:25:06 2016 -0400 @@ -96,3 +96,5 @@ probability of a random sequence of the same length as the motif matching that position of the sequence with as good or better a score.
  • +
  • +The score for the match of a position in a sequence to a motif diff -r e85346ab5054 -r 4df8e9f58a53 test-data/fimo_output_xml_1.xml --- a/test-data/fimo_output_xml_1.xml Thu Jun 16 08:07:03 2016 -0400 +++ b/test-data/fimo_output_xml_1.xml Wed Jul 06 10:25:06 2016 -0400 @@ -4,11 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= xmlns:fimo="http://noble.gs.washington.edu/schema/fimo" > -fimo --o /Users/gvk/work/git_workspace/galaxy/database/job_working_directory/001/1973/dataset_2713_files --verbosity 1 /Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2540.dat /Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2541.dat -/Users/gvk/work/git_workspace/galaxy/database/job_working_directory/001/1973/dataset_2713_files -/Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2540.dat -/Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2541.dat false true false diff -r e85346ab5054 -r 4df8e9f58a53 test-data/fimo_output_xml_2.xml --- a/test-data/fimo_output_xml_2.xml Thu Jun 16 08:07:03 2016 -0400 +++ b/test-data/fimo_output_xml_2.xml Wed Jul 06 10:25:06 2016 -0400 @@ -4,14 +4,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= xmlns:fimo="http://noble.gs.washington.edu/schema/fimo" > -fimo --alpha 1.000000 --max-stored-scores 100000 --motif-pseudo 0.100000 --no-qvalue --thresh 0.000100 --o /Users/gvk/work/git_workspace/galaxy/database/job_working_directory/001/1978/dataset_2738_files --verbosity 1 /Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2540.dat /Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2541.dat -/Users/gvk/work/git_workspace/galaxy/database/job_working_directory/001/1978/dataset_2738_files -/Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2540.dat -/Users/gvk/work/git_workspace/galaxy/database/files/002/dataset_2541.dat false false -false false false 0.0001 diff -r e85346ab5054 -r 4df8e9f58a53 test-data/meme_output_html_1.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/meme_output_html_1.html Wed Jul 06 10:25:06 2016 -0400 @@ -0,0 +1,97 @@ + + + + + MEME +