Merge release-4-5-patches into release-4-6

[alexxy/gromacs.git] / include / gstat.h

diff --git a/include/gstat.h b/include/gstat.h
index 719fe625125e43794b70da7347e3013086b7c9f0..7eb47ecfd45f1cf3ffd9dbb4f721eebb4b06ba9a 100644 (file)
--- a/include/gstat.h
+++ b/include/gstat.h
@@ -240,7 +240,7 @@ void expfit(int n, real x[], real y[], real Dy[],
 
 void ana_dih_trans(const char *fn_trans,const char *fn_histo,
                          real **dih,int nframes,int nangles,
-                         const char *grpname,real t0,real dt,gmx_bool bRb,
+                         const char *grpname,real *time,gmx_bool bRb,
                           const output_env_t oenv);
 /*
  * Analyse dihedral transitions, by counting transitions per dihedral
@@ -260,7 +260,7 @@ void ana_dih_trans(const char *fn_trans,const char *fn_histo,
  * nframes   number of times frames
  * nangles   number of angles
  * grpname   a string for the header of plots
- * t0,dt     starting time resp. time between time frames
+ * time      array (size nframes) of times of trajectory frames
  * bRb       determines whether the polymer convention is used
  *           (trans = 0)
  */
@@ -269,7 +269,7 @@ void low_ana_dih_trans(gmx_bool bTrans, const char *fn_trans,
                              gmx_bool bHisto, const char *fn_histo, int maxchi, 
                              real **dih, int nlist, t_dlist dlist[], 
                               int nframes, int nangles, const char *grpname, 
-                              int multiplicity[], real t0, real dt, gmx_bool bRb, 
+                              int multiplicity[], real *time, gmx_bool bRb,
                               real core_frac, const output_env_t oenv); 
   /* as above but passes dlist so can copy occupancies into it, and multiplicity[] 
    *  (1..nangles, corresp to dih[this][], so can have non-3 multiplicity of