--- a/setup.xml	Wed Oct 30 13:35:25 2019 -0400
+++ b/setup.xml	Wed Nov 20 11:16:14 2019 -0500
@@ -9,13 +9,11 @@
     <command detect_errors="exit_code"><![CDATA[
 
         ln -s '$pdb_input' ./pdb_input.pdb &&
-        gmx pdb2gmx -f ./pdb_input.pdb -o processed.gro -p topol.top -i posres.itp -water $water -ff $ff -${ignore_h}ignh &>> verbose.txt &&
-        gmx editconf -f processed.gro -o newbox.gro -c -d $box_d -bt $box_type &>> verbose.txt
+        gmx pdb2gmx -f ./pdb_input.pdb -o processed.gro -p topol.top -i posres.itp -water $water -ff $ff -${ignore_h}ignh -merge all &>> verbose.txt
 
     ]]></command>
 
     <inputs>
-        <!-- PDB2GMX VARS -->
         <param argument="pdb_input" type="data" format='pdb' label="PDB input file" help="Input structure"/>
         <param argument="water" type="select" label="Water model" help="Model for simulating water molecules in the solvent">
             <option value="tip3p" selected="true">TIP3P</option>
@@ -46,27 +44,15 @@
         </param>
 
         <param argument="ignore_h" type="boolean" label="Ignore hydrogens" truevalue="" falsevalue="no" help="Ignore hydrogen atoms that are in the coordinate file." />
-        
-        <!-- EDITCONF VARS -->
-        <param argument="box_d" type="float" label="Box dimensions in nanometers" value="0.0" min="0.0" max="10.0" help="Dimensions of the box in which simulation will take place" />
-        <param argument="box_type" type="select" label="Box type"
-            help="triclinic is a triclinic box, cubic is a rectangular box with all sides equal dodecahedron represents a rhombic dodecahedron and octahedron is a truncated octahedron. The last two are special cases of a triclinic box. The length of the three box vectors of the truncated octahedron is the shortest distance between two opposite hexagons. Relative to a cubic box with some periodic image distance, the volume of a dodecahedron with this same periodic distance is 0.71 times that of the cube, and that of a truncated octahedron is 0.77 times.">
-            <option value="cubic">Rectangular box with all sides equal</option>
-            <option value="triclinic">Triclinic</option>
-            <option value="dodecahedron">represents a rhombic dodecahedron</option>
-            <option value="octahedron">truncated octahedron</option>
-        </param>
 
-        <param name="capture_log" type="boolean" value="false" label="Generate detailed log" help="Generate detailed log information that can be summarized with ParseLog."/>
+        <expand macro="log" />
 
     </inputs>
     <outputs>
         <data name="output1" format="top" from_work_dir="topol.top"/>
-        <data name="output2" format="gro" from_work_dir="newbox.gro"/>
+        <data name="output2" format="gro" from_work_dir="processed.gro"/>
         <data name="output3" format="itp" from_work_dir="posres.itp"/>
-        <data name="report" format="txt" from_work_dir="verbose.txt">
-            <filter>capture_log</filter>
-        </data>
+        <expand macro="log_outputs" />
     </outputs>
     <tests>
         <test>
@@ -77,7 +63,7 @@
             <param name="box_d" value="1.0" />
             <param name="box_type" value="cubic" />
             <output name="output1" file="topol.top" ftype="top" compare="diff" lines_diff="20"/>
-            <output name="output2" file="newbox.gro" ftype="gro"/>
+            <output name="output2" file="processed.gro" ftype="gro"/>
             <output name="output3" file="posres.itp" ftype="itp"/>
         </test>
     </tests>
@@ -87,7 +73,7 @@
 
 **What it does**
 
-This tool performs the initial setup prior to a GROMACS simulation. This entails producing a topology from an input structure using the pdb2gmx command and also defining a simulation box with editconf.
+This tool performs the initial setup prior to a GROMACS simulation. This entails producing a topology from an input structure using the pdb2gmx command.
 
 Please note that the tool will only successfully generate a topology for residues it recognizes (i.e. standard amino acids). If the structure contains other components such as ligands, these should be separately parameterized with the AmberTools or ACPYPE tools. In this case, make sure to also use an AMBER forcefield for this tool to ensure compatability with the ligand topology. 
 
@@ -99,7 +85,6 @@
 
        - PDB file.
        - Water model and forcefield must be specified.
-       - Parameters for the simulation box (dimensions and shape).
      
 _____