--- a/SMART/galaxy/clusterizeBySlidingWindows.xml	Mon Apr 29 03:45:52 2013 -0400
+++ b/SMART/galaxy/clusterizeBySlidingWindows.xml	Tue Apr 30 14:33:21 2013 -0400
@@ -1,8 +1,5 @@
-<tool id="clusterizeBySlidingWindows" name="clusterize by sliding windows">
-	<description>Produces a GFF3 file that clusters a list of transcripts using a sliding window. Cluster the data into regions (defined by size and overlap with next region).</description>
-	<requirements>
-		<requirement type="set_environment">PYTHONPATH</requirement>
-	</requirements>
+<tool id="clusterizeBySlidingWindows" name="clusterize By SlidingWindows">
+	<description>Produces a GFF3 file that clusters a list of transcripts using a sliding window. Cluster the data into regions (defined by size and overlap with next region) and keep only highest peaks.</description>
 	<command interpreter="python">
 		../Java/Python/clusterizeBySlidingWindows.py -i $formatType.inputFileName
 		#if $formatType.FormatInputFileName == 'bed':
@@ -76,16 +73,16 @@
 
 		<param name="size" type="text" value="50000" label="Size option" help="Size of the regions."/>
 		<param name="overlap" type="text" value="50" label="Overlap option" help="Overlap between two consecutive regions."/>	
-		<param name="normalize" type="boolean" truevalue="-m" falsevalue="" checked="false" label="Normalize option for only GFF3 file format" help="(only work if the tag nbOccurrences is set)"/>
-		<param name="strands" type="boolean" truevalue="-2" falsevalue="" checked="false" label="Consider the two strands separately"/>
+		<param name="normalize" type="boolean" truevalue="-m" falsevalue="" checked="false" label="Normalize option for only GFF3 file format" help="This option normalizes (Warning!! Only for GFF3 file!)"/>
+		<param name="strands" type="boolean" truevalue="-2" falsevalue="" checked="false" label="strands option" help="Consider the two strands separately."/>
 
 		<conditional name="OptionTag">
-			<param name="tag" type="select" label="Use a given tag as input (instead of summing number of features)">
+			<param name="tag" type="select" label="use a given tag as input (instead of summing number of features)">
 				<option value="Yes">Yes</option>
 				<option value="No" selected="true">No</option>
 			</param>
 			<when value="Yes">
-				<param name="value" type="select" label="tag name"/>
+				<param name="value" type="text" value="None" label="tag option" help="write a tag name you want to observe."/>
 			</when>
 			<when value="No">
 			</when>
@@ -93,18 +90,12 @@
 
 
 		<conditional name="OptionsOperation">
-			<param name="operation" type="select" label="combine tag value with given operation">
+			<param name="operation" type="select" label="combine tag value with given operation [choice (sum, avg, med, min, max)]">
 				<option value="Yes">Yes</option>
 				<option value="No" selected="true">No</option>
 			</param>
 			<when value="Yes">
-				<param name="value" type="select" label="operation" help="You can ONLY choose one of following operation : sum, avg, med, min, max.">
-					<option value="sum">sum</option>
-					<option value="avg">average</option>
-					<option value="med">median</option>
-					<option value="min">minimum</option>
-					<option value="max">maximum</option>
-				</param>
+				<param name="value" type="text" value="None" label="operation option" help="You can ONLY choose one of fowlling operation : sum, avg, med, min, max."/>
 			</when>
 			<when value="No">
 			</when>
@@ -123,19 +114,19 @@
 			</when>
 		</conditional>
 
+		<param name="strand" type="boolean" truevalue="-2" falsevalue="" checked="false" label="strand option" help="This option considers the two strands separately."/>
+		<param name="plot" type="boolean" truevalue="-p" falsevalue="" checked="false" label="plot option" help="This option creates a png file."/>
+		<param name="excel" type="boolean" truevalue="-x" falsevalue="" checked="false" label="excel option" help="This option creates a csv file."/>
+
 	</inputs>
 
 	<outputs>
 		<data name="outputFileGff" format="gff3"/>
+		<data name="excelOutput" format="csv">
+			<filter>excel</filter>
+		</data>	
+		<data name="plotPng" format="png">
+			<filter>plot</filter>
+		</data>	
 	</outputs> 
-
-	<help>
-Sliding windows are a convenient ways to clusterize data mapped on the genome. There are two important parameters of a sliding window: the size of the window and the size of the overlap.
-
-By default, sliding windows count the number of reads in each window. However, you can basically merge any information which is contained in the tags. You can compute the average, sum, median, max or min of the tags for each window. For instance, every window can contain the average cluster size, if you merge clusters instead of reads.
-
-The output file is a GFF3 file, where each element is a window. There is a special tag for each window, whose name is **nbElements** if you counted the number of transcripts per sliding window. However, if you performed a **min** (resp. **max**, **sum**, **median**, **average**) operation on the tags **value** of the transcripts, then the tag of the window will be **minValue** (resp. **maxValue**, **sumValue**, **medValue**, **avgValue**). You can also specify the name of your tag (which is actually advised: **nbReadsInSample1** will always be more informative than **nbElements**).
-
-You also have different option, which can select the *n* % highest regions, or the regions with at least *n* features in it, or even the regions with at least *n* unique features. This last option is useful when you want to cluster the reads which have mapped only once, for instance.
-	</help>
 </tool>