# HG changeset patch
# User luca_milaz
# Date 1722693608 0
# Node ID 83a62e7743b3ba8ad4b759005ae859a00806f72b
# Parent  1058a2803472798111056bee32d8ac9a13c02dd3
Uploaded

diff -r 1058a2803472 -r 83a62e7743b3 marea_2/flux_to_map.xml
--- a/marea_2/flux_to_map.xml	Sat Aug 03 13:59:47 2024 +0000
+++ b/marea_2/flux_to_map.xml	Sat Aug 03 14:00:08 2024 +0000
@@ -24,28 +24,21 @@
 	
         #if $cond.type_selector == 'datasets':
 
-			--using_RPS $cond.using_rps.check
+			--input_datas_fluxes
+			#for $data in $cond.using_rps.input_datasets_rps:
+				${data.input_fluxes}
+			#end for
 
-			#if $cond.using_rps.check == 'true':
-				--input_datas_rps
-				#for $data in $cond.using_rps.input_datasets_rps:
-					${data.input_rps}
-				#end for
+			--names_fluxes
+			#for $data in $cond.using_rps.input_datasets_rps:
+				${data.input_name_fluxes}
+			#end for
 
-				--names_rps
-				#for $data in $cond.using_rps.input_datasets_rps:
-					${data.input_name_rps}
-				#end for
-			#end if
-        
         #elif $cond.type_selector == 'dataset_class':
 
-			--using_RPS $cond.using_rps_all.check
+			--input_data_fluxes ${cond.using_rps_all.input_data_fluxes}
+			--input_class_fluxes ${cond.using_rps_all.input_class_fluxes}
 
-			#if $cond.using_rps_all.check == 'true':
-				--input_data_rps ${cond.using_rps_all.input_data_rps}
-				--input_class_rps ${cond.using_rps_all.input_class_rps}
-			#end if
         #end if
 
 		--comparison ${comparis.comparison}
@@ -82,14 +75,14 @@
 
 			<when value="datasets">
 				<repeat name="input_datasets_fluxes" title="Fluxes dataset" min="2">
-					<param name="input_rps" argument="--input_datas_rps" type="data" format="tabular, csv, tsv" label="add dataset" />
-					<param name="input_name_rps" argument="--names_rps" type="text" label="Dataset's name:" value="Dataset" help="Default: Dataset" />
+					<param name="input_fluxes" argument="--input_datas_fluxes" type="data" format="tabular, csv, tsv" label="add dataset" />
+					<param name="input_name_fluxes" argument="--names_fluxes" type="text" label="Dataset's name:" value="Dataset" help="Default: Dataset" />
 				</repeat>
 			</when>
 
 			<when value="dataset_class">
-				<param name="input_data_rps" argument="--input_data_rps" type="data" format="tabular, csv, tsv" label="All fluxes" />
-				<param name="input_class_rps" argument="--input_class_rps" type="data" format="tabular, csv, tsv" label="Sample group specification" />
+				<param name="input_data_fluxes" argument="--input_data_fluxes" type="data" format="tabular, csv, tsv" label="All fluxes" />
+				<param name="input_class_fluxes" argument="--input_class_fluxes" type="data" format="tabular, csv, tsv" label="Sample group specification" />
 			</when>
 		</conditional>
 
@@ -132,8 +125,8 @@
 	</inputs>
 
 	<outputs>
-		<data format="txt" name="log" label="MaREA - Log" />
-		<collection name="results" type="list" label="MaREA - Results">
+		<data format="txt" name="log" label="FluxToMap - Log" />
+		<collection name="results" type="list" label="FluxToMap - Results">
 			<discover_datasets pattern="__name_and_ext__" directory="result"/>
 		</collection>
 	</outputs>