- changed to SimpleCorr instead of SpaceTimeCorr

diff --git a/src/spacetimecorr.cpp b/src/spacetimecorr.cpp
index 868f0bafd2fd3231b767055a68f75a5a4f313d3e..aa5fba4297f1d7f49442a4be929986590bdaab2c 100644 (file)
--- a/src/spacetimecorr.cpp
+++ b/src/spacetimecorr.cpp
@@ -181,12 +181,12 @@ void correlation_evaluation(std::vector< std::vector< RVec > > traj, int window_
  * \ingroup module_trajectoryanalysis
  */
 
-class SpaceTimeCorr : public TrajectoryAnalysisModule
+class SimpleCorr : public TrajectoryAnalysisModule
 {
     public:
 
-        SpaceTimeCorr();
-        virtual ~SpaceTimeCorr();
+        SimpleCorr();
+        virtual ~SimpleCorr();
 
         //! Set the options and setting
         virtual void initOptions(IOptionsContainer          *options,
@@ -225,16 +225,16 @@ class SpaceTimeCorr : public TrajectoryAnalysisModule
         // Copy and assign disallowed by base.
 };
 
-SpaceTimeCorr::SpaceTimeCorr(): TrajectoryAnalysisModule()
+SimpleCorr::SimpleCorr(): TrajectoryAnalysisModule()
 {
 }
 
-SpaceTimeCorr::~SpaceTimeCorr()
+SimpleCorr::~SimpleCorr()
 {
 }
 
 void
-SpaceTimeCorr::initOptions(IOptionsContainer          *options,
+SimpleCorr::initOptions(IOptionsContainer          *options,
                      TrajectoryAnalysisSettings *settings)
 {
     static const char *const desc[] = {
@@ -263,7 +263,7 @@ SpaceTimeCorr::initOptions(IOptionsContainer          *options,
 }
 
 void
-SpaceTimeCorr::initAnalysis(const TrajectoryAnalysisSettings &settings,
+SimpleCorr::initAnalysis(const TrajectoryAnalysisSettings &settings,
                       const TopologyInformation        &top)
 {
     ArrayRef< const int > atomind = sel_[0].atomIndices();
@@ -275,7 +275,7 @@ SpaceTimeCorr::initAnalysis(const TrajectoryAnalysisSettings &settings,
 }
 
 void
-SpaceTimeCorr::initAfterFirstFrame(const TrajectoryAnalysisSettings       &settings,
+SimpleCorr::initAfterFirstFrame(const TrajectoryAnalysisSettings       &settings,
                              const t_trxframe                       &fr)
 {
 }
@@ -283,7 +283,7 @@ SpaceTimeCorr::initAfterFirstFrame(const TrajectoryAnalysisSettings       &setti
 // -s '/home/toluk/Develop/samples/reca_rd/reca_rd.mono.xtc' -f '/home/toluk/Develop/samples/reca_rd/reca_rd.mono.xtc' -n '/home/toluk/Develop/samples/reca_rd/test6.ndx' -sf '/home/toluk/Develop/samples/reca_rd/SelectionList5' -Window 1000
 
 void
-SpaceTimeCorr::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
+SimpleCorr::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
                       TrajectoryAnalysisModuleData *pdata)
 {
     trajectory.resize(trajectory.size() + 1);
@@ -295,7 +295,7 @@ SpaceTimeCorr::analyzeFrame(int frnr, const t_trxframe &fr, t_pbc *pbc,
 }
 
 void
-SpaceTimeCorr::finishAnalysis(int nframes)
+SimpleCorr::finishAnalysis(int nframes)
 {
     std::vector< std::vector< std::vector< float > > > crltns;
 
@@ -314,7 +314,7 @@ SpaceTimeCorr::finishAnalysis(int nframes)
 }
 
 void
-SpaceTimeCorr::writeOutput()
+SimpleCorr::writeOutput()
 {
     std::cout << "GAME OVER\n";
 }
@@ -325,5 +325,5 @@ SpaceTimeCorr::writeOutput()
 int
 main(int argc, char *argv[])
 {
-    return gmx::TrajectoryAnalysisCommandLineRunner::runAsMain<SpaceTimeCorr>(argc, argv);
+    return gmx::TrajectoryAnalysisCommandLineRunner::runAsMain<SimpleCorr>(argc, argv);
 }