--- a/SMART/galaxy/Clusterize.xml	Mon Apr 29 03:45:52 2013 -0400
+++ b/SMART/galaxy/Clusterize.xml	Tue Apr 30 14:33:21 2013 -0400
@@ -1,8 +1,5 @@
-<tool id="MergingDataClusterize" name="clusterize">
-	<description>Clusterize features when their genomic intervals overlap.</description>
-	<requirements>
-		<requirement type="set_environment">PYTHONPATH</requirement>
-	</requirements>
+<tool id="MergingDataClusterize" name="Clusterize">
+	<description>Clusterizes the reads when their genomic intervals overlap.</description>
 	<command interpreter="python">
 		../Java/Python/clusterize.py -i $formatType.inputFileName
 		#if $formatType.FormatInputFileName == 'bed':
@@ -13,6 +10,8 @@
 			-f gff2
 		#elif $formatType.FormatInputFileName == 'gff3':
 			-f gff3
+		#elif $formatType.FormatInputFileName == 'csv':
+			-f csv
 		#elif $formatType.FormatInputFileName == 'sam':
 			-f sam
 		#elif $formatType.FormatInputFileName == 'gtf':
@@ -22,6 +21,7 @@
 		$colinear
 		$normalize
 		-d $distance
+		$log $outputFileLog
 	</command>
 
 	<inputs>
@@ -31,6 +31,7 @@
 				<option value="gff">gff</option>
 				<option value="gff2">gff2</option>
 				<option value="gff3">gff3</option>
+				<option value="csv">csv</option>
 				<option value="sam">sam</option>
 				<option value="gtf">gtf</option>
 			</param>
@@ -46,6 +47,9 @@
 			<when value="gff3">
 				<param name="inputFileName" format="gff3" type="data" label="Input File"/>
 			</when>
+			<when value="csv">
+				<param name="inputFileName" format="csv" type="data" label="Input File"/>
+			</when>
 			<when value="sam">
 				<param name="inputFileName" format="sam" type="data" label="Input File"/>
 			</when>
@@ -54,20 +58,16 @@
 			</when>
 		</conditional>
 
-		<param name="colinear" type="boolean" truevalue="-c" falsevalue="" checked="false" label="Only merge collinear features"/>
-		<param name="normalize" type="boolean" truevalue="-n" falsevalue="" checked="false" label="Normalize counts" help="Only works if the nbOccurrences tag is set."/>
-		<param name="distance" type="text" value="0" label="merge features if their relative distance is within N nt"/>
+		<param name="colinear" type="boolean" truevalue="-c" falsevalue="" checked="false" label="colinear option" help="This option clusterizes only the same strand reads"/>
+		<param name="normalize" type="boolean" truevalue="-n" falsevalue="" checked="false" label="normalize option for only GFF3 file format" help="This option normalize (attention!! Only for GFF3 file!!!!!)"/>
+		<param name="log" type="boolean" truevalue="-l" falsevalue="" checked="false" label="log option" help="This option create a log file"/>
+		<param name="distance" type="text" value="0" label="distance option" help="Limit the maximum distance between two reads"/>
 	</inputs>
 
 	<outputs>
 		<data name="outputFileGff" format="gff3"/>
+		<data name="outputFileLog" format="txt">
+			<filter>log</filter>
+		</data>
 	</outputs> 
-
-	<help>
-The script clusterizes the input genomic data. Two features are clusterized when their genomic intervals overlap. The output is a GFF3 file, where each element is a cluster. The number of elements in the cluster is given by the tag **nbElements**. The name of a cluster is the concatation of the names of its reads (like **read1--read2--read3**). Note that if the size of the name of the cluster exceeds 100 characters, it is truncated to the first 100 characters.
-
-Some options may clusterize the features which are closer than a given distance.
-
-By default, the tool clusterizes all features which overlap (or nearly overlap), even if they are on different strands. If you want to clusterize the features which are on the same strand only, you can specify it.
-	</help>
 </tool>