Remove .tpa, .tpb, .tpx, .trj files. Part of #1500.

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_sans.c

diff --git a/src/gromacs/gmxana/gmx_sans.c b/src/gromacs/gmxana/gmx_sans.c
index 75730a68f8aa216300774c3ffbb9a4ddc0ad09e0..a91af5888bbf27e5308f0ba395065c145ff9086d 100644 (file)
--- a/src/gromacs/gmxana/gmx_sans.c
+++ b/src/gromacs/gmxana/gmx_sans.c
@@ -33,15 +33,15 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "config.h"
 
-#include "typedefs.h"
-#include "macros.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/legacyheaders/macros.h"
 #include "gromacs/math/vec.h"
-#include "copyrite.h"
-#include "index.h"
+#include "gromacs/legacyheaders/copyrite.h"
+#include "gromacs/topology/index.h"
 #include "gstat.h"
 #include "gmx_ana.h"
 #include "nsfactor.h"
@@ -146,7 +146,7 @@ int gmx_sans(int argc, char *argv[])
 #define NFILE asize(fnm)
 
     t_filenm   fnm[] = {
-        { efTPX,  "-s",       NULL,       ffREAD },
+        { efTPR,  "-s",       NULL,       ffREAD },
         { efTRX,  "-f",       NULL,       ffREAD },
         { efNDX,  NULL,       NULL,       ffOPTRD },
         { efDAT,  "-d",       "nsfactor", ffOPTRD },
@@ -158,7 +158,7 @@ int gmx_sans(int argc, char *argv[])
 
     nthreads = gmx_omp_get_max_threads();
 
-    if (!parse_common_args(&argc, argv, PCA_CAN_TIME | PCA_TIME_UNIT | PCA_BE_NICE,
+    if (!parse_common_args(&argc, argv, PCA_CAN_TIME | PCA_TIME_UNIT,
                            NFILE, fnm, asize(pa), pa, asize(desc), desc, 0, NULL, &oenv))
     {
         return 0;
@@ -217,7 +217,7 @@ int gmx_sans(int argc, char *argv[])
 
     /* Try to read files */
     fnDAT = ftp2fn(efDAT, NFILE, fnm);
-    fnTPX = ftp2fn(efTPX, NFILE, fnm);
+    fnTPX = ftp2fn(efTPR, NFILE, fnm);
     fnTRX = ftp2fn(efTRX, NFILE, fnm);
 
     gnsf = gmx_neutronstructurefactors_init(fnDAT);