41 |
|
#ifndef APPLICATIONS_DYNAMICPROPS_RCORRFUNC_HPP |
42 |
|
#define APPLICATIONS_DYNAMICPROPS_RCORRFUNC_HPP |
43 |
|
|
44 |
< |
#include "applications/dynamicProps/CorrelationFunction.hpp" |
44 |
> |
#include "applications/dynamicProps/ParticleTimeCorrFunc.hpp" |
45 |
|
namespace oopse { |
46 |
|
|
47 |
< |
class RCorrFunc : public CorrelationFunction { |
48 |
< |
public: |
49 |
< |
RCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2); |
50 |
< |
|
51 |
< |
protected: |
52 |
< |
virtual void postCorrelate(); |
47 |
> |
class RCorrFunc : public ParticleTimeCorrFunc { |
48 |
> |
public: |
49 |
> |
RCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2); |
50 |
|
|
51 |
< |
private: |
52 |
< |
virtual double calcCorrVal(StuntDouble* sd1, int frame1, StuntDouble* sd2, int frame2); |
56 |
< |
void calcDiffConst(); |
57 |
< |
}; |
51 |
> |
private: |
52 |
> |
virtual double calcCorrVal(int frame1, int frame2, StuntDouble* sd1, StuntDouble* sd2); |
53 |
|
|
54 |
+ |
}; |
55 |
+ |
|
56 |
|
} |
57 |
|
#endif |
58 |
|
|