--- a/SMART/galaxy/CompareOverlappingSmallQuery.xml	Fri Apr 19 10:13:11 2013 -0400
+++ b/SMART/galaxy/CompareOverlappingSmallQuery.xml	Mon Apr 22 11:08:07 2013 -0400
@@ -1,5 +1,5 @@
-<tool id="CompareOverlappingSmallQuery" name="Compare Overlapping Small Query">
-	<description>Provide the queries that overlap with a reference, when the query is small.</description>  
+<tool id="CompareOverlappingSmallQuery" name="compare Overlapping Small Query">
+	<description>Provide the queries that overlap with a reference, when the query data set is small.</description>  
 	<command interpreter="python">
 		../Java/Python/CompareOverlappingSmallQuery.py -i $formatType.inputFileName1 
 		#if $formatType.FormatInputFileName1 == 'bed':  
@@ -36,13 +36,21 @@
 		#if $OptionMinOverlap.present == 'Yes':
 			-m $OptionMinOverlap.minOverlap
 		#end if
+		#if $OptionPcOverlapQuery.present == 'Yes':
+			-p $OptionPcOverlapQuery.minOverlap
+		#end if
+		#if $OptionPcOverlapRef.present == 'Yes':
+			-P $OptionPcOverlapRef.minOverlap
+		#end if
 		#if $OptionCollinearOrAntiSens.OptionCA == 'Collinear':
 			-c 
-		#elif $OptionCollinearOrAntiSens.OptionCA == 'Antisense':
+		#elif $OptionCollinearOrAntiSens.OptionCA == 'AntiSens':
 			-a
 		#end if	
 		$InvertMatch
 		$NotOverlapping
+		$OptionInclusionQuery
+		$OptionInclusionRef
 	</command>
 
 	<inputs>
@@ -104,7 +112,7 @@
 			</when>
 		</conditional>
 		<conditional name="OptionDistance">
-			<param name="Dist" type="select" label="Maximum Distance between two regions">
+			<param name="Dist" type="select" label="Maximum Distance between two reads">
 				<option value="Yes">Yes</option>
 				<option value="No" selected="true">No</option>
 			</param>
@@ -125,24 +133,68 @@
 			<when value="No">
 			</when>
 		</conditional>
+		<conditional name="OptionPcOverlapQuery">
+			<param name="present" type="select" label="N% of the query must overlap">
+				<option value="Yes">Yes</option>
+				<option value="No" selected="true">No</option>
+			</param>
+			<when value="Yes">
+				<param name="minOverlap" type="integer" value="0"/>
+			</when>
+			<when value="No">
+			</when>
+		</conditional>
+		<conditional name="OptionPcOverlapRef">
+			<param name="present" type="select" label="N% of the reference must overlap">
+				<option value="Yes">Yes</option>
+				<option value="No" selected="true">No</option>
+			</param>
+			<when value="Yes">
+				<param name="minOverlap" type="integer" value="0"/>
+			</when>
+			<when value="No">
+			</when>
+		</conditional>
+		<param name="OptionInclusionQuery" type="boolean" truevalue="-k" falsevalue="" checked="false" label="The query must be nested in a query"/>
+		<param name="OptionInclusionRef" type="boolean" truevalue="-K" falsevalue="" checked="false" label="The reference must be nested in a query"/>
 		<conditional name="OptionCollinearOrAntiSens">
-			<param name="OptionCA" type="select" label="Collinear or Antisense">
+			<param name="OptionCA" type="select" label="Collinear or anti-sens">
 				<option value="Collinear">Collinear</option>
-				<option value="Antisense">Antisense</option>
+				<option value="AntiSens">AntiSens</option>
 				<option value="NONE" selected="true">NONE</option>
 			</param>
 			<when value="Collinear">
 			</when>
-			<when value="Antisense">
+			<when value="AntiSens">
 			</when>
 			<when value="NONE">
 			</when>
 		</conditional>
-		<param name="InvertMatch" type="boolean" truevalue="-x" falsevalue="" checked="false" label="Invert match"/>
-		<param name="NotOverlapping" type="boolean" truevalue="-O" falsevalue="" checked="false" label="When there is no overlapping, the number of Overlapping will be set to 0 by default."/>
+		<param name="InvertMatch" type="boolean" truevalue="-x" falsevalue="" checked="false" label="Invert match: the output file will contain all query elements which do NOT overlap"/>
+		<param name="NotOverlapping" type="boolean" truevalue="-O" falsevalue="" checked="false" label="Also report the query data which do not overlap, with the nbOverlaps tag set to 0."/>
 	</inputs>
 
 	<outputs>
 		<data name="outputFileGff" format="gff3"/>
 	</outputs> 
+
+	<help>
+This script may be the most important one. It basically compares two sets of transcripts and keeps those from the first set which overlap with the second one. The first set is considered as the query set (basically, your data) and the second one is the reference set (RefSeq data, for example).
+  
+It is vital to understand that it will output the elements of the first file which overlap with the elements of the second one.
+
+Various modifiers are also available:
+
+-Invert selection (report those which do not overlap).
+
+-Restrict to colinear / anti-sense overlapping data.
+
+-Keep the query data even if they do not strictly overlap with the reference data, but are located not further away than *n* nucleotide from some reference data.
+
+-Keep the query data with are strictly included into reference data, meaning that a query transcript such that at least 1 nucleotide does not overlap with reference data will not be presented as a solution.
+
+The mechanism of shrinking and extending is also useful to make a fine grain comparison. For example, if you want to keep those such that the TSS is overlapping the reference set, you just shrink the query set to 1 nucleotide. Now, if you want to keep those which are overlapping you data or located 2kb downstream of it, just extend the query data in the downstream direction, and you will have what you want. You can also extend in the opposite direction to get the possible transcript factor sites which are upstream.
+
+Some option reverses the selection. Put in other words, it performs the comparison as usual, and outputs all those query data which do not overlap.
+	</help>
 </tool>