Mercurial > repos > bimib > cobraxy

changeset 390:a2dee883176e 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:43:05 +0000
parents 9a56cf5999ae
children 4e53b178031a
files COBRAxy/custom_data_generator.xml COBRAxy/marea_macros.xml
diffstat 2 files changed, 2 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/COBRAxy/custom_data_generator.xml	Fri Sep 05 10:35:26 2025 +0000
+++ b/COBRAxy/custom_data_generator.xml	Fri Sep 05 10:43:05 2025 +0000
@@ -7,7 +7,6 @@
         <requirement type="package" version="5.2.2">lxml</requirement>
 	</requirements>
 
-        
     <macros>
         <import>marea_macros.xml</import>
     </macros>
@@ -33,12 +32,7 @@
     </command>
     <inputs>
         <conditional name="cond_model">
-            <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="Custom_model">Custom</option>
-            </param>
+            <expand macro="options_model"/>
             
             <!-- ENGRO2 -->
             <when value="ENGRO2">
@@ -68,23 +62,6 @@
                 </conditional>
             </when>
 
-            <!-- HMRcore -->
-            <when value="HMRcore">
-                <param name="name" argument="--name" type="text" value="HMRcore" hidden="true" />
-                <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>
-                </conditional>
-            </when>
-
             <!-- Custom model -->
             <when value="Custom_model">
                 <param name="input" argument="--input" type="data" format="json,xml" label="Custom model file:" />
--- a/COBRAxy/marea_macros.xml	Fri Sep 05 10:35:26 2025 +0000
+++ b/COBRAxy/marea_macros.xml	Fri Sep 05 10:43:05 2025 +0000
@@ -11,9 +11,8 @@
 
     <xml name="options_model">
         <param name="model_selector" argument="--model_selector" type="select" label="Model:">
-            <option value="HMRcore">HMRcore</option>
+            <option value="ENGRO2"  selected="true">ENGRO 2</option>
             <option value="Recon">Recon 2.2</option>
-            <option value="ENGRO2"  selected="true">ENGRO 2</option>
             <option value="Custom_model">Custom</option>
         </param>
     </xml>