--- trunk/OOPSE-3.0/src/applications/dynamicProps/VCorrFunc.hpp 2005/02/13 06:57:48 2002 +++ trunk/OOPSE-3.0/src/applications/dynamicProps/VCorrFunc.hpp 2005/02/14 17:35:25 2017 @@ -41,19 +41,15 @@ #ifndef APPLICATIONS_DYNAMICPROPS_VCORRFUNC_HPP #define APPLICATIONS_DYNAMICPROPS_VCORRFUNC_HPP -#include "applications/dynamicProps/CorrelationFunction.hpp" +#include "applications/dynamicProps/ParticleTimeCorrFunc.hpp" namespace oopse { -class VCorrFunc : public CorrelationFunction { +class VCorrFunc : public ParticleTimeCorrFunc { public: VCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2); - - protected: - virtual void postCorrelate(); private: - virtual double calcCorrVal(StuntDouble* sd1, int frame1, StuntDouble* sd2, int frame2); - void calcDiffConst(); + virtual double calcCorrVal(int frame1, int frame2, StuntDouble* sd1, StuntDouble* sd2); };