Mercurial > repos > greg > gene_family_aligner

changeset 49:4e660a64437c draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Fri, 08 Sep 2017 09:19:03 -0400
parents 38f097c41e8e
children 85b11211fe87
files gene_family_aligner.xml
diffstat 1 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/gene_family_aligner.xml	Fri Sep 08 08:56:59 2017 -0400
+++ b/gene_family_aligner.xml	Fri Sep 08 09:19:03 2017 -0400
@@ -73,38 +73,42 @@
             <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_aln_faa" format="fasta" />
             <filter>remove_gappy_sequences_cond['remove_gappy_sequences'] == 'no'</filter>
         </collection>
-        <collection name="primary_fna" type="list" label="${tool.name} (primary orthogroup codon alignments) on ${on_string}">
-            <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_aln_fna" format="fasta" />
-            <filter>input_format_cond['input_format'] == 'ptorthocs' and input_format_cond['codon_alignments'] == 'yes' and remove_gappy_sequences_cond['remove_gappy_sequences'] == 'no'</filter>
-        </collection>
         <collection name="trimmed_faa" type="list" label="${tool.name} (trimmed orthogroup protein alignments) on ${on_string}">
             <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_trimmed_aln_faa" format="fasta" />
             <filter>remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'no'</filter>
         </collection>
-        <collection name="primary_trimmed" type="list" label="${tool.name} (primary orthogroup protein alignments) on ${on_string}">
+        <collection name="pristine_trimmed_faa" type="list" label="${tool.name} (primary orthogroup protein alignments) on ${on_string}">
             <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/other_orthogroups_aln" format="fasta" />
-            <filter>remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'no' and remove_gappy_sequences_cond['output_pristine_alignments'] == 'yes'</filter>
+            <filter>input_format_cond['input_format'] == 'ptortho' and remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'no' and remove_gappy_sequences_cond['output_pristine_alignments'] == 'yes'</filter>
+        </collection>
+        <collection name="filtered_faa" type="list" label="${tool.name} (filtered orthogroup protein alignments) on ${on_string}">
+            <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_filtered_aln_faa" format="fasta" />
+            <filter>remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'yes'</filter>
+        </collection>
+        <collection name="pristine_filtered_faa" type="list" label="${tool.name} (primary and trimmed proteins orthogroup alignments) on ${on_string}">
+            <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/other_orthogroups_aln" format="fasta" />
+            <filter>remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'yes' and remove_gappy_sequences_cond['output_pristine_alignments'] == 'yes'</filter>
+        </collection>
+        <collection name="primary_fna" type="list" label="${tool.name} (primary orthogroup codon alignments) on ${on_string}">
+            <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_aln_fna" format="fasta" />
+            <filter>input_format_cond['input_format'] == 'ptorthocs' and input_format_cond['codon_alignments'] == 'yes' and remove_gappy_sequences_cond['remove_gappy_sequences'] == 'no'</filter>
         </collection>
         <collection name="trimmed_fna" type="list" label="${tool.name} (trimmed orthogroup codon alignments) on ${on_string}">
             <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_trimmed_aln_fna" format="fasta" />
             <filter>input_format_cond['input_format'] == 'ptorthocs' and input_format_cond['codon_alignments'] == 'yes' and remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'no'</filter>
         </collection>
-        <collection name="primary_trimmed" type="list" label="${tool.name} (primary orthogroup protein and codon alignments) on ${on_string}">
+        <collection name="pristine_trimmed_fna" type="list" label="${tool.name} (primary orthogroup protein and codon alignments) on ${on_string}">
             <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/other_orthogroups_aln" format="fasta" />
             <filter>input_format_cond['input_format'] == 'ptorthocs' and input_format_cond['codon_alignments'] == 'yes' and remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'no' and remove_gappy_sequences_cond['output_pristine_alignments'] == 'yes'</filter>
         </collection>
-        <collection name="filtered" type="list" label="${tool.name} (filtered orthogroup protein alignments) on ${on_string}">
-            <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_filtered_aln_faa" format="fasta" />
-            <filter>remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'yes'</filter>
-        </collection>
-        <collection name="primary_filtered" type="list" label="${tool.name} (primary and trimmed proteins orthogroup alignments) on ${on_string}">
-            <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/other_orthogroups_aln" format="fasta" />
-            <filter>remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'yes' and remove_gappy_sequences_cond['output_pristine_alignments'] == 'yes'</filter>
-        </collection>
         <collection name="filtered_fna" type="list" label="${tool.name} (filtered orthogroup codon alignments) on ${on_string}">
             <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/orthogroups_filtered_aln_fna" format="fasta" />
             <filter>input_format_cond['input_format'] == 'ptorthocs' and input_format_cond['codon_alignments'] == 'yes' and remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'yes'</filter>
         </collection>
+        <collection name="pristine_filtered_fna" type="list" label="${tool.name} (filtered orthogroup codon alignments) on ${on_string}">
+            <discover_datasets pattern="__name__" directory="geneFamilyAlignments_dir/other_orthogroups_aln" format="fasta" />
+            <filter>input_format_cond['input_format'] == 'ptorthocs' and input_format_cond['codon_alignments'] == 'yes' and remove_gappy_sequences_cond['remove_gappy_sequences'] == 'yes' and remove_gappy_sequences_cond['remove_sequences_with_gaps_cond']['remove_sequences_with_gaps'] == 'yes' and remove_gappy_sequences_cond['output_pristine_alignments'] == 'yes'</filter>
+        </collection>
     </outputs>
     <tests>
         <test>