# HG changeset patch
# User bimib
# Date 1716485830 0
# Node ID a2bd4266f567b33147ea15df34a764f39db13ebe
# Parent  ff37582bfd152e5f647ac5344fe0a0287e23c5f6
Uploaded

diff -r ff37582bfd15 -r a2bd4266f567 marea_2_0/marea.xml
--- a/marea_2_0/marea.xml	Thu May 23 17:22:51 2024 +0000
+++ b/marea_2_0/marea.xml	Thu May 23 17:37:10 2024 +0000
@@ -17,12 +17,14 @@
 
       	--tool_dir $__tool_directory__
       	--option $cond.type_selector
+		--using_RAS_vs $cond.using_RAS_vs.check
+		--using_RPS_vs $cond.using_RPS_vs.check
 		--using_RAS $cond.using_RAS.check
 		--using_RPS $cond.using_RPS.check
         --out_log $log
 	
         #if $cond.type_selector == 'datasets':
-			#if $cond.using_RAS.check == 'true':
+			#if $cond.using_RAS_vs.check == 'true':
 				--input_datas
 				#for $data in $cond.input_Datasets:
 					${data.input}
@@ -34,7 +36,7 @@
 				#end for
 			#end if
 
-			#if $cond.using_RPS.check == 'true':
+			#if $cond.using_RPS_vs.check == 'true':
 				--input_datas_rps
 				#for $data in $cond.input_Datasets_RPS:
 					${data.input_rps}
@@ -48,8 +50,8 @@
         
         #elif $cond.type_selector == 'dataset_class':
 			#if $cond.using_RAS.check == 'true':
-				--input_data $using_RAS.input_data
-				--input_class $using_RAS.input_class
+				--input_data $cond.using_RAS.input_data
+				--input_class $cond.using_RAS.input_class
 			#end if
 
 			#if $cond.using_RPS.check == 'true':
@@ -92,8 +94,8 @@
 			</param>
 
 			<when value="datasets">
-				<conditional name = "using_RAS">
-					<param name = "check" argument = "--using_RAS" type = "boolean" checked = "true" label = "Using RAS datasets." />
+				<conditional name = "using_RAS_vs">
+					<param name = "check" argument = "--using_RAS_vs" type = "boolean" checked = "true" label = "Using RAS datasets." />
 
 					<when value = "true">
 						<repeat name="input_Datasets" title="RAS dataset" min="2">
@@ -103,8 +105,8 @@
 					</when>
 				</conditional>
 
-				<conditional name = "using_RPS">
-					<param name = "check" argument = "--using_RPS" type = "boolean" checked = "false" label = "Using RPS datasets." />
+				<conditional name = "using_RPS_vs">
+					<param name = "check" argument = "--using_RPS_vs" type = "boolean" checked = "false" label = "Using RPS datasets." />
 
 					<when value = "true">
 						<repeat name="input_Datasets_RPS" title="RPS dataset" min="2">