Mercurial > repos > ximgchess > chap_test_20230411

changeset 92:142f73036013 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/CHESSComputing/ChessAnalysisPipeline commit 01388c69776c82e48e84676a3d17d4623f5e08bd-dirty
author ximgchess
date Wed, 24 May 2023 13:55:45 +0000
parents 72608a06dd7f
children c63315c31cef
files tomo/tomo_combine.xml tomo/tomo_reduce.xml
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tomo/tomo_combine.xml	Wed May 24 11:57:05 2023 +0000
+++ b/tomo/tomo_combine.xml	Wed May 24 13:55:45 2023 +0000
@@ -7,7 +7,7 @@
     <command detect_errors="exit_code">
         <![CDATA[
         mkdir tomo_combine_plots;
-        cp $input_file reconstruced.nex &&
+        cp $input_file reconstructed.nex &&
         cp $tool_config combine.yaml &&
         CHAP --config 
         $__tool_directory__/pipeline_combine.yaml
--- a/tomo/tomo_reduce.xml	Wed May 24 11:57:05 2023 +0000
+++ b/tomo/tomo_reduce.xml	Wed May 24 13:55:45 2023 +0000
@@ -9,7 +9,11 @@
         mkdir tomo_reduce_plots;
         #if str($map.type_selector) == "yaml"
             cp $input_file map.yaml &&
-            cat $__tool_directory__/$map.detector.type_selector $tool_config > reduce.yaml &&
+            #if str($map.detector.type_selector) == "from_file"
+                cat $map.detector.detector_file $tool_config > reduce.yaml &&
+            #else
+                cat $__tool_directory__/$map.detector.type_selector $tool_config > reduce.yaml &&
+            #end if
         #else
             cp $input_file setup.nex &&
             cp $tool_config reduce.yaml &&
@@ -45,14 +49,18 @@
             <when value="yaml">
                 <param name="input_file" type="data" format="yaml" optional="false" label="Map config file"/>
                 <conditional name="detector">
-                    <param name="type_selector" type="select" display="radio" label="Choose detector prefix">
+                    <param name="type_selector" type="select" display="radio" label="Choose detector">
                         <option value="andor2.yaml">andor2</option>
                         <option value="manta.yaml">manta</option>
                         <option value="retiga.yaml">retiga</option>
+                        <option value="from_file">from file</option>
                     </param>
                     <when value="andor2.yaml"/>
                     <when value="manta.yaml"/>
                     <when value="retiga.yaml"/>
+                    <when value="from_file">
+                        <param name="detector_file" type="data" format="yaml" optional="false" label="Detector config file"/>
+                    </when>
                 </conditional>
             </when>
             <when value="nexus">