Mercurial > repos > ximgchess > chap_test_20230411

diff tomo/tomo_reduce.xml @ 96:4b123ebffb06 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 b682c580a95bebc59bc33128973cee4eac8362c7-dirty
author ximgchess
date Wed, 24 May 2023 14:47:49 +0000
parents 3283cbddcc1d
children e7fd2e5b53ba
line wrap: on
line diff
--- a/tomo/tomo_reduce.xml	Wed May 24 14:46:50 2023 +0000
+++ b/tomo/tomo_reduce.xml	Wed May 24 14:47:49 2023 +0000
@@ -8,12 +8,9 @@
         <![CDATA[
         mkdir tomo_reduce_plots;
         #if str($map.type_selector) == "yaml"
+            $__tool_directory__/../pip_install.sh 'certif-pyspec==1.5.3' &&
             cp $input_file map.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
+            cat $__tool_directory__/$map.detector.type_selector $tool_config > reduce.yaml &&
         #else
             cp $input_file setup.nex &&
             cp $tool_config reduce.yaml &&
@@ -49,18 +46,14 @@
             <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">
+                    <param name="type_selector" type="select" display="radio" label="Choose detector prefix">
                         <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">