--- a/infer_experiment.xml	Tue May 03 16:36:57 2016 -0400
+++ b/infer_experiment.xml	Tue Mar 14 10:23:21 2017 -0400
@@ -1,32 +1,29 @@
-<tool id="rseqc_infer_experiment" name="Infer Experiment" version="2.4galaxy1">
+<tool id="rseqc_infer_experiment" name="Infer Experiment" version="@WRAPPER_VERSION@">
     <description>speculates how RNA-seq were configured</description>
 
     <macros>
         <import>rseqc_macros.xml</import>
     </macros>
 
-    <requirements>
-        <expand macro="requirement_package_numpy" />
-        <expand macro="requirement_package_rseqc" />
-    </requirements>
+    <expand macro="requirements" />
 
     <expand macro="stdio" />
 
     <version_command><![CDATA[infer_experiment.py --version]]></version_command>
 
     <command><![CDATA[
-        infer_experiment.py -i $input -r $refgene
-            --sample-size $sample_size
-            --mapq $mapq
-            > $output
+        infer_experiment.py -i '${input}' -r '${refgene}'
+            --sample-size ${sample_size}
+            --mapq ${mapq}
+            > '${output}'
             ]]>
     </command>
 
     <inputs>
-        <param name="input" type="data" format="bam,sam" label="Input BAM/SAM file" help="(--input-file)"/>
-        <param name="refgene" type="data" format="bed" label="Reference gene model in bed format" help="(--refgene)" />
-        <param name="sample_size" type="integer" label="Number of reads sampled from SAM/BAM file (default = 200000)" value="200000" help="(--sample-size)"/>
-        <param name="mapq" type="integer" label="Minimum mapping quality (default=30)" help="Minimum phred scale mapping quality to consider a read 'uniquely mapped' (--mapq)" value="30" />
+        <expand macro="bam_param" />
+        <expand macro="refgene_param" />
+        <expand macro="sample_size_param" />
+        <expand macro="mapq_param" />
     </inputs>
 
     <outputs>
@@ -134,19 +131,7 @@
 
 *Conclusion*: This is single-end, strand specific RNA-seq data. Strandness of reads are concordant with strandness of reference gene.
 
-
------
-
-About RSeQC
-+++++++++++
-
-The RSeQC_ package provides a number of useful modules that can comprehensively evaluate high throughput sequence data especially RNA-seq data. "Basic modules" quickly inspect sequence quality, nucleotide composition bias, PCR bias and GC bias, while "RNA-seq specific modules" investigate sequencing saturation status of both splicing junction detection and expression estimation, mapped reads clipping profile, mapped reads distribution, coverage uniformity over gene body, reproducibility, strand specificity and splice junction annotation.
-
-The RSeQC package is licensed under the GNU GPL v3 license.
-
-.. image:: http://rseqc.sourceforge.net/_static/logo.png
-
-.. _RSeQC: http://rseqc.sourceforge.net/
+@ABOUT@
 
 ]]>
     </help>