Mercurial > repos > bimib > cobraxy

changeset 389:9a56cf5999ae draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author francesco_lapi
date Fri, 05 Sep 2025 10:35:26 +0000
parents 323f705b77e8
children a2dee883176e
files COBRAxy/custom_data_generator.xml
diffstat 1 files changed, 30 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/COBRAxy/custom_data_generator.xml	Fri Sep 05 10:29:17 2025 +0000
+++ b/COBRAxy/custom_data_generator.xml	Fri Sep 05 10:35:26 2025 +0000
@@ -1,8 +1,4 @@
 <tool id="CustomDataGenerator" name="Custom Data Generator" version="2.0.0">
-    
-    <macros>
-        <import>marea_macros.xml</import>
-    </macros>
 
 	<requirements>
         <requirement type="package" version="1.24.4">numpy</requirement>
@@ -11,6 +7,11 @@
         <requirement type="package" version="5.2.2">lxml</requirement>
 	</requirements>
 
+        
+    <macros>
+        <import>marea_macros.xml</import>
+    </macros>
+
     <command detect_errors="exit_code">
         <![CDATA[
       	python $__tool_directory__/custom_data_generator.py
@@ -35,9 +36,10 @@
             <param name="model_selector" argument="--model_selector" type="select" label="Model:">
                 <option value="HMRcore">HMRcore</option>
                 <option value="Recon">Recon 2.2</option>
-                <option value="ENGRO2"  selected="true">ENGRO 2</option>
+                <option value="ENGRO2" selected="true">ENGRO 2</option>
                 <option value="Custom_model">Custom</option>
             </param>
+            
             <!-- ENGRO2 -->
             <when value="ENGRO2">
                 <param name="name" argument="--name" type="text" value="ENGRO2" hidden="true" />
@@ -52,11 +54,14 @@
             <!-- Recon -->
             <when value="Recon">
                 <param name="name" argument="--name" type="text" value="Recon" hidden="true" />
-                <param name="medium_selector" argument="--medium_selector" type="select" label="Medium">
-                <option value="Default" selected="true">Default (Recon built-in medium)</option>
-                <option value="Custom">Custom medium file</option>
-                </param>
                 <conditional name="medium_selector">
+                    <param name="medium_selector" argument="--medium_selector" type="select" label="Medium">
+                        <option value="Default" selected="true">Default (Recon built-in medium)</option>
+                        <option value="Custom">Custom medium file</option>
+                    </param>
+                    <when value="Default">
+                        <!-- Nessun parametro aggiuntivo necessario -->
+                    </when>
                     <when value="Custom">
                         <param name="medium" argument="--medium" type="data" format="tabular,csv,tsv" label="Custom medium file:" />
                     </when>
@@ -66,11 +71,14 @@
             <!-- HMRcore -->
             <when value="HMRcore">
                 <param name="name" argument="--name" type="text" value="HMRcore" hidden="true" />
-                <param name="medium_selector" argument="--medium_selector" type="select" label="Medium">
-                <option value="Default" selected="true">Default (HMRcore built-in medium)</option>
-                <option value="Custom">Custom medium file</option>
-                </param>
                 <conditional name="medium_selector">
+                    <param name="medium_selector" argument="--medium_selector" type="select" label="Medium">
+                        <option value="Default" selected="true">Default (HMRcore built-in medium)</option>
+                        <option value="Custom">Custom medium file</option>
+                    </param>
+                    <when value="Default">
+                        <!-- Nessun parametro aggiuntivo necessario -->
+                    </when>
                     <when value="Custom">
                         <param name="medium" argument="--medium" type="data" format="tabular,csv,tsv" label="Custom medium file:" />
                     </when>
@@ -81,27 +89,26 @@
             <when value="Custom_model">
                 <param name="input" argument="--input" type="data" format="json,xml" label="Custom model file:" />
                 <param name="name" argument="--name" type="text" label="Model's name:" value="CustomModel" />
-                <param name="medium_selector" argument="--medium_selector" type="select" label="Medium">
-                    <option value="Default" selected="true">Don't use a separate medium file (use model defaults)</option>
-                    <option value="Custom">Custom medium file (required)</option>
-                </param>
                 <conditional name="medium_selector">
+                    <param name="medium_selector" argument="--medium_selector" type="select" label="Medium">
+                        <option value="Default" selected="true">Don't use a separate medium file (use model defaults)</option>
+                        <option value="Custom">Custom medium file (required)</option>
+                    </param>
+                    <when value="Default">
+                        <!-- Nessun parametro aggiuntivo necessario -->
+                    </when>
                     <when value="Custom">
                         <param name="medium" argument="--medium" type="data" format="tabular,csv,tsv" label="Custom medium file:" />
                     </when>
                 </conditional>
             </when>
         </conditional>
-
     </inputs>
 
     <outputs>
         <data name="log" format="txt" label="CustomDataGenerator - Log" />
-
-        <data name="out_tabular" format="tabular"
-                label="${cond_model.model_selector}_data_tabular"
-                optional="true"/>
-        </outputs>
+        <data name="out_tabular" format="tabular" label="${cond_model.model_selector}_data_tabular" optional="true"/>
+    </outputs>
 
     <help>
     <![CDATA[