--- a/sim.xml	Wed Oct 27 08:02:22 2021 +0000
+++ b/sim.xml	Tue Nov 30 15:27:11 2021 +0000
@@ -2,7 +2,7 @@
     <description>for system equilibration or data collection</description>
     <macros>
         <import>macros.xml</import>
-        <token name="@GALAXY_VERSION@">2</token>
+        <token name="@GALAXY_VERSION@">3</token>
     </macros>
     <expand macro="requirements" />
     <command detect_errors="exit_code"><![CDATA[
@@ -98,24 +98,34 @@
                     pme_order      = 4        ; cubic interpolation
                     fourierspacing  = 0.16    ; grid spacing for FFT
                     ; Temperature coupling is on
-                    tcoupl    = V-rescale              ; modified Berendsen thermostat
-                    tc-grps    = Protein Non-Protein  ; two coupling groups - more accurate
+                    tcoupl   = V-rescale ; modified Berendsen thermostat
+                    #if $sets.mdp.systemTcouple == "true":
+                    tc-grps = System ; coupling the whole system. Can be used in any system, beyond peptides.
+                    tau_t    = 0.1 ; time constant in ps
+                    ref_t    = $sets.mdp.temperature
+                    #else
+                    tc-grps   = Protein Non-Protein  ; two coupling groups - more accurate
                     tau_t    = 0.1    0.1          ; time constant, in ps
                     ref_t    = $sets.mdp.temperature $sets.mdp.temperature           ; reference temperature, one for each group, in K
+                    #end if
                     ; Periodic boundary conditions
                     pbc    = xyz    ; 3-D PBC
                     ; Dispersion correction
                     DispCorr  = EnerPres  ; account for cut-off vdW scheme
                     ; Velocity generation
-                    gen_vel    = no    ; Velocity generation is off
+                    #if $sets.ensembleselect.ensemble == "npt" or $sets.ensembleselect.startvel == "false":
+                    gen_vel    = no    ; Velocity generation is OFF
+                    #else
+                    gen_vel    = yes    ; Velocity generation is ON
+                    #end if
                 #end if
                 #if $inps.itp_in:
                     define    = -DPOSRES  ; position restrain the protein
                     refcoord_scaling  = com
                 #end if
-                #if $sets.ensemble == "nvt":
+                #if $sets.ensembleselect.ensemble == "nvt":
                     pcoupl    = no     ; no pressure coupling in NVT
-                #else: 
+                #else:
                     ; Pressure coupling is on
                     pcoupl            = Parrinello-Rahman      ; Pressure coupling on in NPT
                     pcoupltype          = isotropic              ; uniform scaling of box vectors
@@ -130,7 +140,7 @@
     <inputs>
         <param argument="gro_input" type="data" format='gro' label="GRO structure file"/>
         <param argument="top_input" type="data" format='top' label="Topology (TOP) file"/>
-
+ 
         <section name="inps" title="Inputs" expanded="false">
         
             <!-- CPT inp -->
@@ -174,6 +184,7 @@
             </conditional> -->
 
             <param argument="ndx_in" type="data" format='ndx' label="Index (ndx) file" optional="true" help="Use an index file specifying custom atom groups. Leave empty to use default generated group"/>
+            
 
         </section>
 
@@ -222,12 +233,21 @@
 
         <section name="sets" title="Settings" expanded="false">
             <!-- other ... -->
-            <param name="ensemble" label="Ensemble" type="select" help="NVT ensemble (constant number of particles, volume and temperature) or NPT ensemble (constant number of particles, pressure and temperature)">
+            
+            <conditional name="ensembleselect">
+              <param name="ensemble" label="Ensemble" type="select" help="NVT ensemble (constant number of particles, volume and temperature) or NPT ensemble (constant number of particles, pressure and temperature)">
                 <option value="nvt">Isothermal-isochoric ensemble (NVT)</option>
                 <option value="npt">Isothermal-isobaric ensemble (NPT)</option>
-            </param>
-
-            <expand macro="md_inputs"/>
+              </param>
+                  <when value="nvt">
+                     <param argument="startvel" type="select" label="Starting Velocities">
+                        <option value="true">Assign starting velocities (recommended for NVT)</option>
+                        <option value="false" selected="true">Do not assign starting velocities</option>
+                     </param>
+                  </when>
+                  <when value="npt" />
+            </conditional>            
+          <expand macro="md_inputs"/>
         </section>
         
         <expand macro="maxwarn" />