--- a/PAMPA_GLM.xml	Mon Jul 27 09:52:47 2020 -0400
+++ b/PAMPA_GLM.xml	Sun Nov 22 18:40:23 2020 +0000
@@ -15,15 +15,21 @@
          '$sep'
          #if $settings.advanced=='advanced' 
              $settings.distrib
-             'FALSE'
+             $settings.rdata
          #else
              'None'
-             'FALSE'
+             'false'
          #end if
          'unit'
          '$__tool_directory__/FunctPAMPAGalaxy.r' 
          '$output_summary'
          '$output_recap'
+         '$output_rate'
+         #if $settings.advanced=='advanced'
+             #if $settings.rdata=='true'
+                 '$output_GLM'
+             #end if
+         #end if
     ]]>
     </command>
     <inputs>
@@ -39,14 +45,16 @@
         <expand macro="pampa_output_GLM"/>
     </outputs>
     <tests>
-        <test>
+        <test expect_num_outputs="4">
             <param name="input_metric" value="Community_metrics_cropped.tabular"/>
             <param name="input_unitobs" value="Unitobs.tabular"/>
             <param name="varint" value="4"/>
             <param name="varrep" value="year,site,habitat"/>
             <param name="varrand" value="site"/>
             <param name="sep" value="22"/>
-            <param name="advanced" value="simple"/>
+            <param name="advanced" value="advanced"/>
+            <param name="distrib" value="None"/>
+            <param name="rdata" value="true"/>
             <output name="output_summary">
                 <assert_contents> 
                     <has_n_lines n="9"/>
@@ -54,14 +62,31 @@
             </output>
             <output name="output_recap">
                 <assert_contents>
-                    <has_n_lines n="413"/>
+                    <has_n_lines n="412"/>
                 </assert_contents> 
             </output>
             <output name="output_rate">
                 <assert_contents> 
-                    <has_n_lines n="51"/>
+                    <has_n_lines n="50"/>
                 </assert_contents> 
             </output>
+            <output_collection name="output_GLM"  type="list" count="3">
+                <element name="GLM_HR" ftype="Rdata">
+                    <assert_contents> 
+                        <has_size value="185018" delta="10000"/>
+                    </assert_contents> 
+                </element>
+                <element name="GLM_RE" ftype="Rdata">
+                    <assert_contents> 
+                        <has_size value="168685" delta="10000"/>
+                    </assert_contents> 
+                </element>
+                <element name="global_GLM" ftype="Rdata">
+                    <assert_contents> 
+                        <has_size value="195910" delta="10000"/>
+                    </assert_contents> 
+                </element>
+            </output_collection>
         </test>
     </tests>
     <edam_topics>
@@ -118,13 +143,15 @@
 A tabular file with unitobs or location data which contains at least as much columns as used response variables and separation factor in addition with the 'observation.unit' or 'location' column.
 
 +--------------------------------+---------+--------+------------+-----+       
-| observation.unit OR location   | ??site? |  year  |  habitat   | ... |            
+| observation.unit OR location   |   site  |  year  |  habitat   | ... |            
 +================================+=========+========+============+=====+        
 |  site_yearID     OR locationID | site ID |  2000  | habitatID  | ... |            
 +--------------------------------+---------+--------+------------+-----+        
 |              ...               |   ...   |   ...  |     ...    | ... |       
 +--------------------------------+---------+--------+------------+-----+ 
 
+The site may represent the same entity as the location or represent an aggregation of several locations
+
 |
 
 **Output**
@@ -142,6 +169,5 @@
 Derived from PAMPA scripts (https://wwz.ifremer.fr/pampa/Meth.-Outils/Outils) written by Yves Reecht.
 
   ]]></help>
-
   <expand macro="pampa_bibref" />
 </tool>