diff mergeGenomicFiles.xml @ 41:9806198df91f

fix

--- a/mergeGenomicFiles.xml	Fri Jul 31 21:29:17 2015 -0700
+++ b/mergeGenomicFiles.xml	Thu Aug 06 00:27:05 2015 -0700
@@ -1,4 +1,4 @@
-<tool id="mergeGenomicFiles" description="Merge two genomic datasets into a new dataset" name="Merge Genomic Datasets" version="0.0.1">
+<tool id="mergeGenomicFiles" description="Merge two genomic matrices into a new dataset" name="Merge Genomic Matrix Datasets" version="0.0.1">
   <description>
     Given two genomic datasets, merge them to create a larger dataset with the row and column identifiers from both datasets. Output this larger dataset, along with a 2-column matrix indicating the source file of each sample
   </description>
@@ -6,20 +6,24 @@
       mergeGenomicMatrixFiles.py $inputA $inputB $outputC $outputSourceMatrix
       #if $labelForDatasetA
           --aLabel "${labelForDatasetA}"
+      #else
+          --aLabel "${inputA.name}"
       #end if
       #if $labelForDatasetB
           --bLabel "${labelForDatasetB}"
+      #else
+          --bLabel "${inputB.name}"
       #end if
   </command>
   <inputs>
-    <param name="inputA" format="tabular" type="data" label="Genomic Dataset A"/>
-    <param type="text" name="labelForDatasetA"  label="Dataset A Label (optional)" optional="true"/>
-    <param name="inputB" format="tabular" type="data" label="Genomic Dataset B"/> 
-    <param type="text" name="labelForDatasetB"  label="Dataset B Label (optional)" optional="true"/>
+    <param name="inputA" format="tabular" type="data" label="Genomic Matrix A"/>
+    <param type="text" name="labelForDatasetA"  label="Dataset A Label (eg. A)" value="dataset A"/>
+    <param name="inputB" format="tabular" type="data" label="Genomic Matrix B"/> 
+    <param type="text" name="labelForDatasetB"  label="Dataset B Label (eg. B)" value="dataset B"/>
  </inputs>
   <outputs>
-    <data name="outputSourceMatrix" format="tabular" label="Genomic Data Sources"/>
-    <data name="outputC" format="tabular" label="Merged Genomic Data"/>
+    <data name="outputSourceMatrix" format="tabular" label="Data Source ${labelForDatasetB}+${labelForDatasetA}"/>
+    <data name="outputC" format="tabular" label="Genomic Matrix ${labelForDatasetB}+${labelForDatasetA}"/>
   </outputs>
   <help>
     ***Merge Genomic Datasets***