diff check.xml @ 2:8ee4590690e5 draft default tip

"planemo upload for repository https://github.com/mesocentre-clermont-auvergne/aubi_piaf commit 11dcfa0a6d5fbff9bc654a8a1ad14d79dbd22fdb"
author agpetit
date Thu, 21 Jul 2022 14:46:22 +0000
parents ae4b0af8efd3
children
line wrap: on
line diff
--- a/check.xml	Wed May 25 12:42:00 2022 +0000
+++ b/check.xml	Thu Jul 21 14:46:22 2022 +0000
@@ -1,5 +1,5 @@
 <tool id="gmx_check" name="GROMACS check" version="@TOOL_VERSION@+galaxy@GALAXY_VERSION@" profile="@PROFILE@">
-    <description>using gmx check</description>
+    <description>to provide information about GROMACS input files</description>
     <macros>
         <token name="@GALAXY_VERSION@">0</token>
         <token name="@PROFILE@">21.05</token>
@@ -7,252 +7,197 @@
     </macros>
     <expand macro="requirements" />
     <command detect_errors="exit_code"><![CDATA[
-        #for $i, $choice in enumerate($analysis)
-            #if $choice.input_file.calculate_select == "info_traj":
-                ln -s '$choice.input_file.traj_file' './$i.$choice.input_file.traj_file.element_identifier';
-                gmx check
-                    -f './$i.$choice.input_file.traj_file.element_identifier'
-                    &> '${i}.Trajectory_information_for_"${choice.input_file.traj_file.element_identifier}".txt';
-            #elif $choice.input_file.calculate_select == "compare_traj":
-                ln -s '$choice.input_file.traj_file' './$i.$choice.input_file.traj_file.element_identifier';
-                ln -s '$choice.input_file.traj_file2' './$i.$choice.input_file.traj_file2.element_identifier';
-                gmx check
-                    -f './$i.$choice.input_file.traj_file.element_identifier'
-                    -f2 './$i.$choice.input_file.traj_file2.element_identifier'
-                    $choice.input_file.rmsd
-                    -tol '$choice.input_file.rel_tol'
-                    -abstol '$choice.input_file.abs_tol'
-                    &> '${i}.Compare_trajectories_between_"${choice.input_file.traj_file.element_identifier}"_and_"${choice.input_file.traj_file2.element_identifier}".txt';
-            #elif $choice.input_file.calculate_select == "info_struc":
-                ln -s '$choice.input_file.struc_file' './$i.$choice.input_file.struc_file.element_identifier';
-                gmx check
-                    -c './$i.$choice.input_file.struc_file.element_identifier'
-                    -vdwfac '$choice.input_file.vdwfac'
-                    -bonlo '$choice.input_file.bonlo'
-                    -bonhi '$choice.input_file.bonhi'
-                    &> '${i}.Structure_information_for_"${choice.input_file.struc_file.element_identifier}".txt';
-            #elif $choice.input_file.calculate_select == "info_ener":
-                ln -s '$choice.input_file.ener_file' './$i.$choice.input_file.ener_file.element_identifier' ;
-                gmx check
-                    -e './$i.$choice.input_file.ener_file.element_identifier'
-                    &> '${i}.Energy_information_for_"${$choice.input_file.ener_file.element_identifier}".txt';
-            #elif $choice.input_file.calculate_select == "info_ind":
-                ln -s '$choice.input_file.ind_file' './$i.$choice.input_file.ind_file.element_identifier';
-                gmx check
-                    -n './$i.$choice.input_file.ind_file.element_identifier'
-                    &> '${i}.Index_information_for_"${choice.input_file.ind_file.element_identifier}".txt';
-            #elif $choice.input_file.calculate_select == "compare_ener":
-                ln -s '$choice.input_file.ener_file' './$i.$choice.input_file.ener_file.element_identifier';
-                ln -s '$choice.input_file.ener_file2' './$i.$choice.input_file.ener_file2.element_identifier';
-                gmx check
-                    -e './$i.$choice.input_file.ener_file.element_identifier'
-                    -e2 './$i.$choice.input_file.ener_file2.element_identifier'
-                    -tol '$choice.input_file.rel_tol'
-                    -abstol '$choice.input_file.abs_tol'
-                    -lastener '$choice.input_file.lastener'
-                    &> '${i}.Compare_energies_between_"${choice.input_file.ener_file.element_identifier}"_and_"${choice.input_file.ener_file2.element_identifier}".txt';
-            #else:
-                ln -s '$choice.input_file.top_file' './$i.$choice.input_file.top_file.element_identifier';
-                ln -s '$choice.input_file.top_file2' './$i.$choice.input_file.top_file2.element_identifier';
-                gmx check
-                    -s1 './$i.$choice.input_file.top_file.element_identifier'
-                    -s2 './$i.$choice.input_file.top_file2.element_identifier'
-                    -abstol '$choice.input_file.abs_tol'
-                    &> '${i}.Compare_topologies_between_"${choice.input_file.top_file.element_identifier}"_and_"${choice.input_file.top_file2.element_identifier}".txt';
-            #end if
-        #end for
+        #if $input_file.calculate_select == "info_traj":
+            ln -s '$input_file.traj_file' './traj.$input_file.traj_file.ext';
+            gmx check
+                -f './traj.$input_file.traj_file.ext'
+                &> '$out_info_traj';
+        #elif $input_file.calculate_select == "compare_traj":
+            ln -s '$input_file.traj_file' './traj1.$input_file.traj_file.ext';
+            ln -s '$input_file.traj_file2' './traj2.$input_file.traj_file2.ext';
+            gmx check
+                -f './traj1.$input_file.traj_file.ext'
+                -f2 './traj2.$input_file.traj_file2.ext'
+                $input_file.rmsd
+                -tol '$input_file.rel_tol'
+                -abstol '$input_file.abs_tol'
+                &> '$out_compare_traj';
+        #elif $input_file.calculate_select == "info_struc":
+            ln -s '$input_file.struc_file' './struc.$input_file.struc_file.ext';
+            gmx check
+                -c './struc.$input_file.struc_file.ext'
+                -vdwfac '$input_file.vdwfac'
+                -bonlo '$input_file.bonlo'
+                -bonhi '$input_file.bonhi'
+                &> '$out_info_struc';
+        #elif $input_file.calculate_select == "info_ener":
+            ln -s '$input_file.ener_file' './ener.$input_file.ener_file.ext' ;
+            gmx check
+                -e './ener.$input_file.ener_file.ext'
+                &> '$out_info_ener';
+        #elif $input_file.calculate_select == "info_ind":
+            ln -s '$input_file.ind_file' './index.$input_file.ind_file.ext';
+            gmx check
+                -n './index.$input_file.ind_file.ext'
+                &> '$out_info_ind';
+        #elif $input_file.calculate_select == "compare_ener":
+            ln -s '$input_file.ener_file' './ener1.$input_file.ener_file.ext';
+            ln -s '$input_file.ener_file2' './ener2.$input_file.ener_file2.ext';
+            gmx check
+                -e './ener1.$input_file.ener_file.ext'
+                -e2 './ener2.$input_file.ener_file2.ext'
+                -tol '$input_file.rel_tol'
+                -abstol '$input_file.abs_tol'
+                -lastener '$input_file.lastener'
+                &> '$out_compare_ener';
+        #else:
+            ln -s '$input_file.top_file' './top1.$input_file.top_file.ext';
+            ln -s '$input_file.top_file2' './top2.$input_file.top_file2.ext';
+            gmx check
+                -s1 './top1.$input_file.top_file.ext'
+                -s2 './top2.$input_file.top_file2.ext'
+                -abstol '$input_file.abs_tol'
+                &> '$out_compare_topol';
+        #end if
     ]]></command>
     <inputs>
-        <repeat name="analysis" title="Type of analysis">
-            <conditional name="input_file">
-                <param name="calculate_select" type="select" label="Select the type of information you want to obtain">
-                    <option value="info_traj">Information about a trajectory</option>
-                    <option value="compare_traj">Compare two trajectories</option>
-                    <option value="info_struc">Information about the system structure</option>
-                    <option value="info_ener">Information about the system energy</option>
-                    <option value="info_ind">Information about the system index</option>
-                    <option value="compare_top">Compare two topologies</option>
-                    <option value="compare_ener">Compare two energy files</option>
+        <conditional name="input_file">
+            <param name="calculate_select" type="select" label="Select the type of information you want to obtain">
+                <option value="info_traj">Information about a trajectory</option>
+                <option value="compare_traj">Compare two trajectories</option>
+                <option value="info_struc">Information about the system structure</option>
+                <option value="info_ener">Information about the system energy</option>
+                <option value="info_ind">Information about the system index</option>
+                <option value="compare_top">Compare two topologies</option>
+                <option value="compare_ener">Compare two energy files</option>
+            </param>
+            <when value="info_traj">
+                <param name="traj_file" type="data" format="xtc, trr, cpt, gro, pdb" label="Trajectory file" help="Enter the trajectory file. Accepted formats: xtc, trr, cpt, gro, pdb."/>
+            </when>
+            <when value="compare_traj">
+                <param name="traj_file" type="data" format="xtc, trr, cpt, gro, pdb" label="Trajectory file 1" help="Enter the first trajectory file. Accepted formats: xtc, trr, cpt, gro, pdb."/>
+                <param name="traj_file2" type="data" format="xtc, trr, cpt, gro, pdb" label="Trajectory file 2" help="Enter the second trajectory file. Accepted formats: xtc, trr, cpt, gro, pdb."/>
+                <param name="rmsd" type="boolean" truevalue="-rmsd" falsevalue="" label="Do you want to display the RMSD?"/>
+                <param name="rel_tol" type="float" max="1.0" value="0.001" label="Enter relative tolerance" help="Relative tolerance for comparing real values defined as 2*(a-b)/(|a|+|b|)."/>
+                <param name="abs_tol" type="float" max="1.0" value="0.001" optional="True" label="Enter absolute tolerance" help="Absolute tolerance, useful when sums are close to zero."/>
+            </when>
+            <when value="info_struc">
+                <param name="struc_file" type="data" format="tpr, gro, pdb, brk, ent" label="Structure file" help="Enter the structure file. Accepted formats: tpr, gro, pdb, brk, ent.">
+                    <validator type="expression" message="Wrong file format">value.extension != 'edr' and value.extension != 'xtc'</validator>
                 </param>
-                <when value="info_traj">
-                    <param name="traj_file" type="data" format="xtc, trr, cpt, gro, g96, pdb, tng" label="Trajectory file" help="Enter the trajectory file. Accepted formats: xtc, trr, cpt, gro, g96, pdb, tng."/>
-                </when>
-                <when value="compare_traj">
-                    <param name="traj_file" type="data" format="xtc, trr, cpt, gro, g96, pdb, tng" label="Trajectory file 1" help="Enter the first trajectory file. Accepted formats: xtc, trr, cpt, gro, g96, pdb, tng."/>
-                    <param name="traj_file2" type="data" format="xtc, trr, cpt, gro, g96, pdb, tng" label="Trajectory file 2" help="Enter the second trajectory file. Accepted formats: xtc, trr, cpt, gro, g96, pdb, tng."/>
-                    <param name="rmsd" type="boolean" truevalue="-rmsd" falsevalue="" label="Do you want to display the RMSD?"/>
-                    <param name="rel_tol" type="float" max="1.0" value="0.001" label="Enter relative tolerance" help="Relative tolerance for comparing real values defined as 2*(a-b)/(|a|+|b|)."/>
-                    <param name="abs_tol" type="float" max="1.0" value="0.001" optional="True" label="Enter absolute tolerance" help="Absolute tolerance, useful when sums are close to zero."/>
-                </when>
-                <when value="info_struc">
-                    <param name="struc_file" type="data" format="tpr, gro, g96, pdb, brk, ent" label="Structure file" help="Enter the structure file. Accepted formats: tpr, gro, g96, pdb, brk, ent.">
-                        <validator type="expression" message="Wrong file format">value.extension != 'edr' and value.extension != 'xtc'</validator>
-                    </param>
-                    <param name="vdwfac" type="float" max="1.0" value="0.8" label="Enter the fraction of sum of VdW radii sum"/>
-                    <param name="bonlo" type="float" max="1.0" value="0.4" label="Enter the minimal fraction of sum of vdW radii for bonded atoms"/>
-                    <param name="bonhi" type="float" max="1.0" value="0.7" label="Enter the maximal fraction of sum of vdW radii for bonded atoms"/>
-                </when>
-                <when value="info_ener">
-                    <param name="ener_file" type="data" format="edr" label="Energy file" help="Enter the energy file. Accepted format: edr."/>
-                </when>
-                <when value="info_ind">
-                    <param name="ind_file" type="data" format="ndx" label="Index file" help="Enter the index file. Accepted format: ndx."/>
-                </when>
-                <when value="compare_top">
-                    <param name="top_file" type="data" format="tpr" label="Topology file 1" help="Enter the first topology file. Accepted format: tpr.">
-                        <validator type="expression" message="Wrong file format">value.extension == 'tpr'</validator>
-                    </param>
-                    <param name="top_file2" type="data" format="tpr" label="Topology file 2" help="Enter the second topology file. Accepted format: tpr.">
-                        <validator type="expression" message="Wrong file format">value.extension == 'tpr'</validator>
-                    </param>
-                    <param name="abs_tol" type="float" max="1.0" value="0.001" label="Enter absolute tolerance" help="Absolute tolerance, useful when sums are close to zero."/>
-                </when>
-                <when value="compare_ener">
-                    <param name="ener_file" type="data" format="edr" label="Energy file 1" help="Enter the first energy file. Accepted format: edr."/>
-                    <param name="ener_file2" type="data" format="edr" label="Energy file 2" help="Enter the second energy file. Accepted format: edr."/>
-                    <param name="rel_tol" type="float" max="1.0" value="0.001" label="Enter relative tolerance" help="Relative tolerance for comparing real values defined as 2*(a-b)/(|a|+|b|)."/>
-                    <param name="abs_tol" type="float" max="1.0" value="0.001" optional="True" label="Enter absolute tolerance" help="Absolute tolerance, useful when sums are close to zero."/>
-                    <param name="lastener" type="text" value="all" label="Enter the last energy term to compare" help="Last energy term to compare. It makes sense to go up until the Pressure."/>
-                </when>
-            </conditional>
-        </repeat>
+                <param name="vdwfac" type="float" max="1.0" min="0" value="0.8" label="Enter the fraction of sum of VdW radii sum"/>
+                <param name="bonlo" type="float" max="1.0" min="0" value="0.4" label="Enter the minimal fraction of sum of van der Waals radii for bonded atoms"/>
+                <param name="bonhi" type="float" max="1.0" min="0" value="0.7" label="Enter the maximal fraction of sum of van der Waals radii for bonded atoms"/>
+            </when>
+            <when value="info_ener">
+                <param name="ener_file" type="data" format="edr" label="Energy file" help="Enter the energy file. Accepted format: edr."/>
+            </when>
+            <when value="info_ind">
+                <param name="ind_file" type="data" format="ndx" label="Index file" help="Enter the index file. Accepted format: ndx."/>
+            </when>
+            <when value="compare_top">
+                <param name="top_file" type="data" format="tpr" label="Topology file 1" help="Enter the first topology file. Accepted format: tpr.">
+                    <validator type="expression" message="Wrong file format">value.extension == 'tpr'</validator>
+                </param>
+                <param name="top_file2" type="data" format="tpr" label="Topology file 2" help="Enter the second topology file. Accepted format: tpr.">
+                    <validator type="expression" message="Wrong file format">value.extension == 'tpr'</validator>
+                </param>
+                <param name="abs_tol" type="float" max="1.0" value="0.001" label="Enter absolute tolerance" help="Absolute tolerance, useful when sums are close to zero."/>
+            </when>
+            <when value="compare_ener">
+                <param name="ener_file" type="data" format="edr" label="Energy file 1" help="Enter the first energy file. Accepted format: edr."/>
+                <param name="ener_file2" type="data" format="edr" label="Energy file 2" help="Enter the second energy file. Accepted format: edr."/>
+                <param name="rel_tol" type="float" max="1.0" value="0.001" label="Enter relative tolerance" help="Relative tolerance for comparing real values defined as 2*(a-b)/(|a|+|b|)."/>
+                <param name="abs_tol" type="float" max="1.0" value="0.001" optional="True" label="Enter absolute tolerance" help="Absolute tolerance, useful when sums are close to zero."/>
+                <param name="lastener" type="text" value="all" label="Enter the last energy term to compare" help="Last energy term to compare. It makes sense to go up until the Pressure."/>
+            </when>
+        </conditional>
     </inputs>
     <outputs>
-        <data name="output">
-            <discover_datasets pattern="(?P&lt;name&gt;.+\.txt)$" ext="txt" visible="true" directory="" assign_primary_output="true"/>
+        <data name="out_info_traj" format="txt" from_work_dir="*.txt" label="${tool.name} : information on trajectory on ${on_string}">
+            <filter>input_file["calculate_select"] == "info_traj"</filter>
+        </data>
+        <data name="out_compare_traj" format="txt" from_work_dir="*.txt" label="${tool.name} : compare trajectories on ${on_string}">
+            <filter>input_file["calculate_select"] == "compare_traj"</filter>
+        </data>
+        <data name="out_info_struc" format="txt" from_work_dir="*.txt" label="${tool.name} : information on structure on ${on_string}">
+            <filter>input_file["calculate_select"] == "info_struc"</filter>
+        </data>
+        <data name="out_info_ener" format="txt" from_work_dir="*.txt" label="${tool.name} : information on energy on ${on_string}">
+            <filter>input_file["calculate_select"] == "info_ener"</filter>
+        </data>
+        <data name="out_info_ind" format="txt" from_work_dir="*.txt" label="${tool.name} : information on index file on ${on_string}">
+            <filter>input_file["calculate_select"] == "info_ind"</filter>
+        </data>
+        <data name="out_compare_ener" format="txt" from_work_dir="*.txt" label="${tool.name} : compare energy files on ${on_string}">
+            <filter>input_file["calculate_select"] == "compare_ener"</filter>
+        </data>
+        <data name="out_compare_topol" format="txt" from_work_dir="*.txt" label="${tool.name} : compare topology files on ${on_string}">
+            <filter>input_file["calculate_select"] == "compare_top"</filter>
         </data>
     </outputs>
     <tests>
         <test>
-            <repeat name="analysis">
-                <conditional name="input_file">
-                    <param name="calculate_select" value="info_traj"/>
-                    <param name="traj_file" value="nvt.xtc" ftype="xtc"/>
-                </conditional>
-            </repeat>
-            <output name="output" file="check_info_traj.txt" ftype="txt" lines_diff="4">
-                <assert_contents>
-                    <has_n_lines n="38"/>
-                    <has_text text="Reading frame"/>
-                    <has_text text="# Atoms  94"/>
-                    <has_text text="Step            11    0.1"/>
-                </assert_contents>
-            </output>
+            <conditional name="input_file">
+                <param name="calculate_select" value="info_traj"/>
+                <param name="traj_file" value="nvt.xtc" ftype="xtc"/>
+            </conditional>
+            <output name="out_info_traj" file="check_info_traj.txt" ftype="txt" lines_diff="8"/>
         </test>
         <test>
-            <repeat name="analysis">
-                <conditional name="input_file">
-                    <param name="calculate_select" value="compare_traj"/>
-                    <param name="traj_file" value="nvt.xtc" ftype="xtc"/>
-                    <param name="traj_file2" value="npt.xtc" ftype="xtc"/>
-                    <param name="rmsd" value="True"/>
-                    <param name="rel_tol" value="0.1"/>
-                    <param name="abs_tol" value="0.1"/>
-                </conditional>
-            </repeat>
-            <output name="output" file="check_compare_traj.txt" ftype="txt" lines_diff="4">
-                <assert_contents>
-                    <has_n_lines n="62"/>
-                    <has_text text="Reading frame"/>
-                    <has_text text="Last frame         10 time    1.000"/>
-                    <has_text text="x RMSD 0.135353"/>
-                </assert_contents>
-            </output>
+            <conditional name="input_file">
+                <param name="calculate_select" value="compare_traj"/>
+                <param name="traj_file" value="nvt.xtc" ftype="xtc"/>
+                <param name="traj_file2" value="npt.xtc" ftype="xtc"/>
+                <param name="rmsd" value="True"/>
+                <param name="rel_tol" value="0.1"/>
+                <param name="abs_tol" value="0.1"/>
+            </conditional>
+            <output name="out_compare_traj" file="check_compare_traj.txt" ftype="txt" lines_diff="8"/>
         </test>
         <test>
-            <repeat name="analysis">
-                <conditional name="input_file">
-                    <param name="calculate_select" value="info_struc"/>
-                    <param name="struc_file" value="minim.gro" ftype="gro"/>
-                    <param name="vdwfac" value="0.8"/>
-                    <param name="bonlo" value="0.4"/>
-                    <param name="bonhi" value="0.7"/>
-                </conditional>
-            </repeat>
-            <output name="output" file="check_info_structure.txt" ftype="txt" lines_diff="5">
-                <assert_contents>
-                    <has_n_lines n="480"/>
-                    <has_text text="94 atoms in file"/>
-                    <has_text text="coordinates found"/>
-                    <has_text text="box         found"/>
-                    <has_text text="no atoms found outside box"/>
-                    <has_text text="atom# name  residue r_vdw  atom# name  residue r_vdw  distance"/>
-                </assert_contents>
-            </output>
+            <conditional name="input_file">
+                <param name="calculate_select" value="info_struc"/>
+                <param name="struc_file" value="minim.gro" ftype="gro"/>
+                <param name="vdwfac" value="0.8"/>
+                <param name="bonlo" value="0.4"/>
+                <param name="bonhi" value="0.7"/>
+            </conditional>
+            <output name="out_info_struc" file="check_info_structure.txt" ftype="txt" lines_diff="10"/>
         </test>
         <test>
-            <repeat name="analysis">
-                <conditional name="input_file">
-                    <param name="calculate_select" value="info_ener"/>
-                    <param name="ener_file" value="minim.edr" ftype="edr"/>
-                </conditional>
-            </repeat>
-            <repeat name="analysis">
-                <conditional name="input_file">
-                    <param name="calculate_select" value="info_ind"/>
-                    <param name="ind_file" value="index.ndx" ftype="ndx"/>
-                </conditional>
-            </repeat>
-            <output name="output" file="check_info_energy.txt" ftype="txt" lines_diff="4">
-                <assert_contents>
-                    <has_n_lines n="67"/>
-                    <has_text text="Reading energy frame      1 time    1.000 "/>
-                    <has_text text="31 groups in energy file"/>
-                    <has_text text="Timesteps at t=20 don't match (2, 1)"/>
-                    <has_text text="Found 25 frames."/>
-                </assert_contents>
-                <discovered_dataset designation='1.Index_information_for_"index.ndx".txt' file="check_info_index.txt" ftype="txt" lines_diff="4">
-                    <assert_contents>
-                        <has_n_lines n="28"/>
-                        <has_text text="Contents of index file"/>
-                        <has_text text="Nr.   Group               #Entries   First    Last"/>
-                        <has_text text="  2  Protein-H                 43       1      92"/>
-                        <has_text text="  10  Prot-Masses               92       1      92"/>
-                    </assert_contents>
-                </discovered_dataset>
-            </output>
+            <conditional name="input_file">
+                <param name="calculate_select" value="info_ener"/>
+                <param name="ener_file" value="minim.edr" ftype="edr"/>
+            </conditional>
+            <output name="out_info_ener" file="check_info_energy.txt" ftype="txt" lines_diff="8"/>
+        </test>
+        <test>
+            <conditional name="input_file">
+                <param name="calculate_select" value="info_ind"/>
+                <param name="ind_file" value="index.ndx" ftype="ndx"/>
+            </conditional>
+            <output name="out_info_ind" file="check_info_index.txt" ftype="txt" lines_diff="8"/>
         </test>
         <test>
-            <repeat name="analysis">
-                <conditional name="input_file">
-                    <param name="calculate_select" value="compare_top"/>
-                    <param name="top_file" value="nvt.tpr" ftype="tpr"/>
-                    <param name="top_file2" value="npt.tpr" ftype="tpr"/>
-                    <param name="abs_tol" value="0.1"/>
-                </conditional>
-            </repeat>
-            <output name="output" file="check_compare_topology.txt" ftype="txt" lines_diff="4">
-                <assert_contents>
-                    <has_n_lines n="1229"/>
-                    <has_text text="maxresnr (7 - 5)"/>
-                    <has_text text="comparing inputrec"/>
-                    <has_text text="inputrec->nstxout (1000 - 50)"/>
-                    <has_text text="ffparams->iparams[237]2: pos0A=( 1.25000000e-01, 1.25000000e-01, 0.00000000e+00)"/>
-                    <has_text text="InteractionList entry[255] (259 - 236)"/>
-                </assert_contents>
-            </output>
+            <conditional name="input_file">
+                <param name="calculate_select" value="compare_top"/>
+                <param name="top_file" value="npt.tpr" ftype="tpr"/>
+                <param name="top_file2" value="npt2.tpr" ftype="tpr"/>
+                <param name="abs_tol" value="0.1"/>
+            </conditional>
+            <output name="out_compare_topol" file="check_compare_topology.txt" ftype="txt" lines_diff="8"/>
         </test>
         <test>
-            <repeat name="analysis">
-                <conditional name="input_file">
-                    <param name="calculate_select" value="compare_ener"/>
-                    <param name="ener_file" value="minim.edr" ftype="edr"/>
-                    <param name="ener_file2" value="outp.edr" ftype="edr"/>
-                    <param name="rel_tol" value="0.1"/>
-                    <param name="abs_tol" value="0.1"/>
-                    <param name="lastener" value="Pressure"/>
-                </conditional>
-            </repeat>
-            <output name="output" file="check_compare_energy.txt" ftype="txt" lines_diff="4">
-                <assert_contents>
-                    <has_n_lines n="199"/>
-                    <has_text text="Reading energy frame"/>
-                    <has_text text="enm[12] (- - Conserved En.)"/>
-                    <has_text text="Angle            step   1:       536.268,  step   1:      188.647"/>
-                    <has_text text="step (3 - 150)"/>
-                    <has_text text="Coul. recip.     step  14:       914.559,  step  14:      304.201"/>
-                </assert_contents>
-            </output>
+            <conditional name="input_file">
+                <param name="calculate_select" value="compare_ener"/>
+                <param name="ener_file" value="minim.edr" ftype="edr"/>
+                <param name="ener_file2" value="outp.edr" ftype="edr"/>
+                <param name="rel_tol" value="0.1"/>
+                <param name="abs_tol" value="0.1"/>
+                <param name="lastener" value="Pressure"/>
+            </conditional>
+            <output name="out_compare_ener" file="check_compare_energy.txt" ftype="txt" lines_diff="8"/>
         </test>
     </tests>
     <help><![CDATA[
@@ -261,13 +206,13 @@
 
 **What it does**
 
-This tool reads a trajectory (.tng, .trr or .xtc), an energy file (.edr) or an index file (.ndx) and prints out useful information about them.
+This tool reads a trajectory (trr or xtc), an energy file (edr) or an index file (ndx) and prints out useful information about them.
 
-Option -c checks for presence of coordinates, velocities and box in the file, for close contacts (smaller than -vdwfac and not bonded, i.e. not between -bonlo and -bonhi, all relative to the sum of both Van der Waals radii) and atoms outside the box (these may occur often and are no problem). If velocities are present, an estimated temperature will be calculated from them.
+Selecting 'information about the structure of a system' checks for the presence of coordinates, velocities and the box in the file, close contacts (smaller than van der Waals radii and not bound, i.e. not between minimal fraction of sum of van der Waals radii and maximal fraction of sum of van der Waals radii, all relative to the sum of the two van der Waals radii) and atoms outside the box (these can occur often and are not a problem). If velocities are present, an estimated temperature will be calculated from them.
 
-If an index file, is given its contents will be summarized.
+If an index file is given, its contents will be summarized.
 
-The program can compare two run input (.tpr) files when both -s1 and -s2 are supplied. When comparing run input files this way, the default relative tolerance is reduced to 0.000001 and the absolute tolerance set to zero to find any differences not due to minor compiler optimization differences, although you can of course still set any other tolerances through the options.Similarly a pair of trajectory files can be compared (using the -f2 option), or a pair of energy files (using the -e2 option).
+The program can compare two runtime input files (tpr) when both topology file 1 and topology file 2 are provided. When comparing run input files this way, the default relative tolerance is reduced to 0.000001 and the absolute tolerance set to zero to find any differences not due to minor compiler optimization differences, although you can of course still set any other tolerances through the options. Similarly a pair of trajectory files can be compared (using compare two trajectories), or a pair of energy files (using compare two energy files).
 
 _____
 
@@ -276,40 +221,38 @@
 **Inputs**
 
 **Information about a trajectory**
-    - Trajectory file : -f option. Trajectory file in xtc, trr, cpt, gro, g96, pdb or tng format.
+    - Trajectory file : trajectory file in xtc, trr, cpt, gro or pdb format.
 
 **Compare two trajectories**
-    - Trajectory file 1 : -f option. Trajectory file in xtc, trr, cpt, gro, g96, pdb or tng format.
-    - Trajectory file 2 : -f2 option. Trajectory file in xtc, trr, cpt, gro, g96, pdb or tng format.
-    - Do you want to display the RMSD? : -rmsd option. Print RMSD for x, v and f.
-    - Enter relative tolerance : -tol option. Relative tolerance for comparing real values.
-    - Enter absolute tolerance : -abstol option. Absolute tolerance, useful when sums are close to zero.
+    - Trajectory file 1 : trajectory file in xtc, trr, cpt, gro or pdb format.
+    - Trajectory file 2 : trajectory file in xtc, trr, cpt, gro or pdb format.
+    - Do you want to display the RMSD? : print RMSD for x, v and f.
+    - Enter relative tolerance : relative tolerance for comparing real values.
+    - Enter absolute tolerance : absolute tolerance, useful when sums are close to zero.
 
 **Information about the structure of a system**
-    - Structure file : -c option. Structure file in tpr, gro, g96, pdb, brk or ent format.
-    - Enter the fraction of sum of VdW radii : -vdwfac option.
-    - Enter the minimal fraction of sum of vdW radii for bonded atoms : -bonlo option.
-    - Enter the maximal fraction of sum of vdW radii for bonded atoms : -bonhi option.
+    - Structure file : structure file in tpr, gro, pdb, brk or ent format.
+    - Enter the fraction of sum of VdW radii : fraction of sum of VdW radii used as warning cutoff.
+    - Enter the minimal fraction of sum of van der Waals radii for bonded atoms : minimal fraction of sum of van der Waals radii for bonded atoms.
+    - Enter the maximal fraction of sum of van der Waals radii for bonded atoms : maximal fraction of sum of van der Waals radii for bonded atoms.
 
 **Information about the energy of a system**
-    - Energy file : -e option. Energy file in edr format.
+    - Energy file : energy file in edr format.
 
 **Information about the index of a system**
-    - Index file : -n option. Index file in ndx format.
+    - Index file : index file in ndx format.
 
 **Compare two topologies**
-    - Topology file 1 : -s1 option. Topology file in tpr format.
-    - Topology file 2 : -s2 option. Topology file in tpr format.
-    - Enter absolute tolerance : -abstol option. Absolute tolerance, useful when sums are close to zero.
+    - Topology file 1 : topology file in tpr format.
+    - Topology file 2 : topology file in tpr format.
+    - Enter absolute tolerance : absolute tolerance, useful when sums are close to zero.
 
 **Compare two energy files**
-    - Energy file 1 : -e option. Energy file in edr format.
-    - Energy file 2 : -e2 option. Energy file in edr format.
-    - Enter relative tolerance : -tol option. Relative tolerance for comparing real values.
-    - Enter absolute tolerance : -abstol option. Absolute tolerance, useful when sums are close to zero.
-    - Enter the last energy term to compare : -lastener. Last energy term to compare (if not given all are tested). It makes sense to go up until the Pressure.
-
-The -ab option is not implemented.
+    - Energy file 1 : energy file in edr format.
+    - Energy file 2 : energy file in edr format.
+    - Enter relative tolerance : relative tolerance for comparing real values.
+    - Enter absolute tolerance : absolute tolerance, useful when sums are close to zero.
+    - Enter the last energy term to compare : last energy term to compare (if not given all are tested). It makes sense to go up until the pressure.
 
 _____
 
@@ -317,7 +260,7 @@
 
 **Output**
 
-    - list with one or more TXT files. This file contains either information about the trajectory, the structure, the index or the energy, or a comparison between two trajectories, two topologies or two energy files.
+    - list with one or more text files. This file contains either information about the trajectory, the structure, the index or the energy, or a comparison between two trajectories, two topologies or two energy files.
 
     ]]></help>
     <citations>