Commit 56962e0f authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '105-update-tools-for-better-export-handling' into 'dev' 

Resolve "Update tools for better export handling"

Closes #105

See merge request ndip/galaxy-tools!179
parents 145963d7 c7784ebf

tools/neutrons/export.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<tool name="Export Datasets" id="neutrons_export" version="0.1.0" profile="22.05">

<tool name="Export Datasets" id="neutrons_export" version="0.2.0" profile="22.05">

  <description>to SNS/HFIR storage</description>

    <requirements>

        <container type="docker">alpine:3.17</container>
@@ -7,6 +7,7 @@ 
    <command><![CDATA[

        #from pathlib import Path

        #if $input_mode.input_mode_collection == 'true':

            mkdir -p $input_mode.export_folder &&

            #for $el in $input_mode.input:

               #set $name = str($el.element_identifier)

               #if Path($name).suffix == '':

tools/neutrons/topaz_combine.xml

+2 −1
Original line number Diff line number Diff line 
<tool id="neutrons_topaz_combine" name="Topaz Combine"  profile="22.05" version="0.1.0">

<tool id="neutrons_topaz_combine" name="Topaz Combine"  profile="22.05" version="0.2.0">

    <description></description>

    <requirements>

        <container type="docker" shell="/bin/bash">code.ornl.gov:4567/ndip/tool-sources/topaz/topaz-reduction:0.1</container>
@@ -17,6 +17,7 @@ 
        #end for

        python /app/update_config.py $input params.config output_directory=\$(pwd)/reduced &&

        python -u /app/topaz_reduction_combinefiles.py \$(pwd)/params.config > >(tee -a $output) 2> >(tee -a $output >&2) &&

        cp $input reduced/config.txt

        cd reduced && rm ${input_list}

    ]]></command>

    <inputs>