diff nmr_alignement/NmrAlignment_xml.xml @ 2:908e1345d7ca draft

Uploaded

--- a/nmr_alignement/NmrAlignment_xml.xml	Thu Mar 02 10:23:37 2017 -0500
+++ b/nmr_alignement/NmrAlignment_xml.xml	Fri Mar 31 09:56:39 2017 -0400
@@ -1,4 +1,4 @@
-<tool id="NmrAlignment" name="NMR spectra alignment" version="2.0.1">
+<tool id="NmrAlignment" name="NMR spectra alignment" version="2.0.2">
 	<description>based on the Cluster-based Peak Alignment (CluPA) algorithm</description>
 	 <requirements>
         <requirement type="package" version="3.1.2">R</requirement>
@@ -15,6 +15,8 @@
 		## File input
         #if $inputs.input == "lib":
             library '$__app__.config.user_library_import_dir/$__user_email__/$inputs.library'
+		#elif $inputs.input == "tsv_file":
+            tsvfile $inputs.tsv_file
         #elif $inputs.input == "zip_file":
             zipfile '$inputs.zip_file'
         #end if
@@ -50,11 +52,15 @@
         <conditional name="inputs">
             <param name="input" type="select" label="Choose your inputs method" >
                 <option value="zip_file" selected="true">Zip file from your history containing your Bruker directories</option>
+                <option value="tsv_file">Tsv file containing preprocessed spectra (from your history)</option>
                 <option value="lib" >Library directory name</option>
             </param>
             <when value="zip_file">
                 <param name="zip_file" type="data" format="no_unzip.zip" label="Zip file" />
             </when>
+            <when value="tsv_file">
+                <param name="tsv_file" type="data" format="tabular" label="Tsv file" />
+            </when>
             <when value="lib">
                 <param name="library" type="text" size="40" label="Library directory name" help="The name of your directory containing all your data" >
                     <validator type="empty_field"/>