Mercurial > repos > ximgchess > chap_test_20230411

changeset 76:da8f5ae271ea 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 64d735e72badb6466fcf32843328300887a4a46e
author ximgchess
date Thu, 27 Apr 2023 10:39:17 +0000
parents 15f06d8e188d
children 0fb5fc391411
files tomo/manta.yaml tomo/retiga.yaml tomo/tomo_reduce.xml
diffstat 3 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tomo/manta.yaml	Thu Apr 27 10:39:17 2023 +0000
@@ -0,0 +1,8 @@
+detector:
+  prefix: manta
+  rows: 3008
+  columns: 4112
+  pixel_size:
+  - 0.00345
+  - 0.00345
+  lens_magnification: 5.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tomo/retiga.yaml	Thu Apr 27 10:39:17 2023 +0000
@@ -0,0 +1,8 @@
+detector:
+  prefix: retiga
+  rows: 2048
+  columns: 2048
+  pixel_size:
+  - 0.0074
+  - 0.0074
+  lens_magnification: 5.0
--- a/tomo/tomo_reduce.xml	Wed Apr 26 18:22:44 2023 +0000
+++ b/tomo/tomo_reduce.xml	Thu Apr 27 10:39:17 2023 +0000
@@ -10,7 +10,7 @@
         $__tool_directory__/../pip_install.sh 'certif-pyspec==1.5.3' &&
         #if str($map.type_selector) == "yaml"
             cp $input_file map.yaml &&
-            cat $__tool_directory__/andor2.yaml $tool_config > reduce.yaml &&
+            cat $__tool_directory__/$map.type_selector.detector.type_selector $tool_config > reduce.yaml &&
         #else
             cp $input_file setup.nex &&
             cp $tool_config reduce.yaml &&
@@ -47,9 +47,9 @@
                 <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">
-                        <option value="andor2">andor2</option>
-                        <option value="manta">manta</option>
-                        <option value="retiga">retiga</option>
+                        <option value="andor2">andor2.yaml</option>
+                        <option value="manta">manta.yaml</option>
+                        <option value="retiga">retiga.yaml</option>
                     </param>
                     <when value="andor2"/>
                     <when value="manta"/>