44 |
|
|
45 |
|
namespace oopse { |
46 |
|
DipoleCorrFunc::DipoleCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) |
47 |
< |
: CorrelationFunction(info, filename, sele1, sele2, DataStorage::dslElectroFrame){ |
47 |
> |
: ParticleTimeCorrFunc(info, filename, sele1, sele2, DataStorage::dslElectroFrame){ |
48 |
|
|
49 |
|
setCorrFuncType("Dipole Correlation Function"); |
50 |
< |
setOutputName(getPrefix(dumpFilename_) + ".dcf"); |
50 |
> |
setOutputName(getPrefix(dumpFilename_) + ".dcorr"); |
51 |
|
|
52 |
|
} |
53 |
|
|
54 |
< |
double DipoleCorrFunc::calcCorrVal(StuntDouble* sd1, int frame1, StuntDouble* sd2, int frame2) { |
54 |
> |
double DipoleCorrFunc::calcCorrVal(int frame1, int frame2, StuntDouble* sd1, StuntDouble* sd2) { |
55 |
|
Vector3d v1 =sd1->getVel(frame1); |
56 |
|
Vector3d v2 = sd2->getVel(frame2); |
57 |
|
|