changeset 34:88e312d436e1 draft

Uploaded

--- a/marea_2_0/marea.xml	Thu May 23 18:10:30 2024 +0000
+++ b/marea_2_0/marea.xml	Thu May 23 18:48:26 2024 +0000
@@ -17,49 +17,44 @@
 
       	--tool_dir $__tool_directory__
       	--option $cond.type_selector
-
+		--using_RAS $cond.using_RAS.check
+		--using_RPS $cond.using_RPS.check
         --out_log $log
 	
         #if $cond.type_selector == 'datasets':
-			--using_RAS $cond.using_RAS_vs.check
-			--using_RPS $cond.using_RPS_vs.check
-
-			#if $cond.using_RAS_vs.check == 'true':
+			#if $cond.using_RAS.check == 'true':
 				--input_datas
-				#for $data in $input_Datasets:
+				#for $data in $cond.input_Datasets:
 					${data.input}
 				#end for
 
 				--names
-				#for $data in $input_Datasets:
+				#for $data in $cond.input_Datasets:
 					${data.input_name}
 				#end for
 			#end if
 
-			#if $cond.using_RPS_vs.check == 'true':
+			#if $cond.using_RPS.check == 'true':
 				--input_datas_rps
-				#for $data in $cond.using_RPS_vs.input_Datasets_RPS:
+				#for $data in $cond.input_Datasets_RPS:
 					${data.input_rps}
 				#end for
 
 				--names_rps
-				#for $data in $cond.using_RPS_vs.input_Datasets_RPS:
+				#for $data in $cond.input_Datasets_RPS:
 					${data.input_name_rps}
 				#end for
 			#end if
         
         #elif $cond.type_selector == 'dataset_class':
-			--using_RAS $cond.using_RAS.check
-			--using_RPS $cond.using_RPS.check
-
 			#if $cond.using_RAS.check == 'true':
-				--input_data $cond.using_RAS.input_data
-				--input_class $cond.using_RAS.input_class
+				--input_data ${input_data}
+				--input_class ${input_class}
 			#end if
 
 			#if $cond.using_RPS.check == 'true':
-				--input_data_rps $cond.using_RPS.input_data_rps
-				--input_class_rps $cond.using_RPS.input_class_rps
+				--input_data_rps ${input_data_rps}
+				--input_class_rps ${input_class_rps}
 			#end if
         #end if
 
@@ -97,8 +92,8 @@
 			</param>
 
 			<when value="datasets">
-				<conditional name = "using_RAS_vs">
-					<param name = "check" argument = "--using_RAS_vs" type = "boolean" checked = "true" label = "Using RAS datasets." />
+				<conditional name = "using_RAS">
+					<param name = "check" argument = "--using_RAS" type = "boolean" checked = "true" label = "Using RAS datasets." />
 
 					<when value = "true">
 						<repeat name="input_Datasets" title="RAS dataset" min="2">
@@ -108,8 +103,8 @@
 					</when>
 				</conditional>
 
-				<conditional name = "using_RPS_vs">
-					<param name = "check" argument = "--using_RPS_vs" type = "boolean" checked = "false" label = "Using RPS datasets." />
+				<conditional name = "using_RPS">
+					<param name = "check" argument = "--using_RPS" type = "boolean" checked = "false" label = "Using RPS datasets." />
 
 					<when value = "true">
 						<repeat name="input_Datasets_RPS" title="RPS dataset" min="2">