Mercurial > repos > greg > kaks_analysis

changeset 45:eaf9663f0cb0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Tue, 24 Oct 2017 10:02:26 -0400
parents c877a0c9e224
children e3b41d2889d4
files kaks_analysis.xml
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/kaks_analysis.xml	Tue Oct 24 09:53:59 2017 -0400
+++ b/kaks_analysis.xml	Tue Oct 24 10:02:26 2017 -0400
@@ -67,14 +67,15 @@
 && mv $output_dir/species1.fna '$output_species1_fna'
 && mv $output_dir/species1.faa '$output_species1_faa'
 #if str($comparison) == 'paralogs':
-    && mv $output_dir/species1.fna.blastn.paralogs '$output_species1_para_ortho'
+    && mv $output_dir/species1.fna.blastn.paralogs '$output_species1_paralog'
+    && mv $output_dir/*.rbhb '$output_rbhb_paralog'
 #else:
     && mv $output_dir/species2.faa '$output_species2_faa'
     && mv $output_dir/species2.fna '$output_species2_fna'
-    && mv $output_dir/species1.fna.blastn.orthologs '$output_species1_para_ortho'
+    && mv $output_dir/species1.fna.blastn.orthologs '$output_species1_ortholog'
     && mv $output_dir/species2.fna.blastn.orthologs '$output_species2_ortholog'
+    && mv $output_dir/*.rbhb '$output_rbhb_ortholog'
 #end if
-&& mv $output_dir/*.rbhb '$output_rbhb'
 && mv $output_dir/*.kaks '$output_kaks'
 #if str($fit_components) == 'yes':
     && mv $output_dir/*.components '$output_components'
@@ -181,19 +182,19 @@
         <data name="output_species2_faa" format="fasta" label="${tool.name} (amino acids species2) on ${on_string}">
             <filter>comparison_cond['comparison'] == 'orthologs'</filter>
         </data>
-        <data name="output_species1_para_ortho" format="tabular" label="${tool.name} (blastn results species1 vs species1) on ${on_string}">
+        <data name="output_species1_paralog" format="tabular" label="${tool.name} (blastn results species1 vs species1) on ${on_string}">
             <filter>comparison_cond['comparison'] == 'paralogs'</filter>
         </data>
-        <data name="output_species1_para_ortho" format="tabular" label="${tool.name} (blastn results species1 vs species2) on ${on_string}">
+        <data name="output_species1_ortholog" format="tabular" label="${tool.name} (blastn results species1 vs species2) on ${on_string}">
             <filter>comparison_cond['comparison'] == 'orthologs'</filter>
         </data>
         <data name="output_species2_ortholog" format="tabular" label="${tool.name} (blastn results species2 vs species1) on ${on_string}">
             <filter>comparison_cond['comparison'] == 'orthologs'</filter>
         </data>
-        <data name="output_rbhb" format="tabular" label="${tool.name} (paralogous pairs) on ${on_string}">
+        <data name="output_rbhb_paralog" format="tabular" label="${tool.name} (paralogous pairs) on ${on_string}">
             <filter>comparison_cond['comparison'] == 'paralogs'</filter>
         </data>
-        <data name="output_rbhb" format="tabular" label="${tool.name} (orthologous pairs) on ${on_string}">
+        <data name="output_rbhb_ortholog" format="tabular" label="${tool.name} (orthologous pairs) on ${on_string}">
             <filter>comparison_cond['comparison'] == 'orthologs'</filter>
         </data>
         <data name="output_kaks" format="tabular" label="${tool.name} (KaKs distribution) on ${on_string}" />
@@ -208,8 +209,8 @@
             <param name="non_commercial_use" value="True"/>
             <output name="output_species1_fna" file="species1_cds.fasta" ftype="fasta" compare="contains"/>
             <output name="output_species1_faa" file="species1_pep.fasta" ftype="fasta" compare="contains"/>
-            <output name="output_species1_para_ortho" file="output_blastn_results1.tabular" ftype="tabular" compare="contains"/>
-            <output name="output_rbhb" file="output_paralogous_pairs.tabular" ftype="tabular"/>
+            <output name="output_species1_paralog" file="output_blastn_results1.tabular" ftype="tabular" compare="contains"/>
+            <output name="output_rbhb_paralog" file="output_paralogous_pairs.tabular" ftype="tabular"/>
             <output name="output_kaks" file="output1.tabular" ftype="tabular"/>
         </test>
     </tests>