Mercurial > repos > bimib > marea

changeset 62:ce8534417470 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author bimib
date Sun, 15 Mar 2020 12:26:38 -0400
parents 69dfed656e0b
children b8cbc2122d55
files Marea/marea.xml
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Marea/marea.xml	Sun Mar 15 12:26:26 2020 -0400
+++ b/Marea/marea.xml	Sun Mar 15 12:26:38 2020 -0400
@@ -1,4 +1,4 @@
-<tool id="MaREA" name="Metabolic Reaction Enrichment Analysis" version="1.1.3">
+<tool id="MaREA" name="Metabolic Reaction Enrichment Analysis" version="1.1.4">
 	<macros>
 		<import>marea_macros.xml</import>
 	</macros>
@@ -28,11 +28,12 @@
                 ${data.input_name}
             #end for
             --comparison ${cond.comparis.comparison}
-            #if $cond.advanced.cond_map.cond_map_choice == 'true':
-            	--custom_rules true
-            	--custom_map ${cond.advanced.cond_map.custom_map}
-            #end if
+
             #if $cond.advanced.choice == 'true':
+				#if $cond.advanced.cond_map.cond_map_choice == 'true':
+					--custom_rules true
+					--custom_map ${cond.advanced.cond_map.custom_map}
+				#end if
       	       --pValue ${cond.advanced.pValue}
       	       --fChange ${cond.advanced.fChange}
 	           --generate_svg ${cond.advanced.generateSvg}
@@ -51,11 +52,11 @@
             #if $cond.comparis.comparison == 'onevsmany'
             	--control ${cond.comparis.controlgroup}
             #end if
-            #if $cond.advanced.cond_map.cond_map_choice == 'true':
-            	--custom_rules true
-            	--custom_map ${cond.advanced.cond_map.custom_map}
-            #end if
             #if $cond.advanced.choice == 'true':
+				#if $cond.advanced.cond_map.cond_map_choice == 'true':
+					--custom_rules true
+					--custom_map ${cond.advanced.cond_map.custom_map}
+				#end if
       	        --pValue ${cond.advanced.pValue}
       	        --fChange ${cond.advanced.fChange}
 	            --generate_svg ${cond.advanced.generateSvg}