43 |
|
|
44 |
|
namespace oopse { |
45 |
|
|
46 |
< |
ParticleTimeCorrFunc::ParticleTimeCorrFunc(SimInfo * info, const std::string & filename, |
47 |
< |
const std :: string & sele1, const std :: string & sele2, int storageLayout) |
46 |
> |
ParticleTimeCorrFunc::ParticleTimeCorrFunc(SimInfo * info, const std::string & filename, |
47 |
> |
const std :: string & sele1, const std :: string & sele2, int storageLayout) |
48 |
|
: TimeCorrFunc(info, filename, sele1, sele2, storageLayout){ |
49 |
|
|
50 |
|
|
51 |
< |
nSelected_ = seleMan1_.getSelectionCount(); |
52 |
< |
assert( nSelected_ == seleMan2_.getSelectionCount()); |
53 |
< |
} |
51 |
> |
nSelected_ = seleMan1_.getSelectionCount(); |
52 |
> |
assert( nSelected_ == seleMan2_.getSelectionCount()); |
53 |
> |
} |
54 |
|
|
55 |
< |
void ParticleTimeCorrFunc::correlateFrames(int frame1, int frame2) { |
55 |
> |
void ParticleTimeCorrFunc::correlateFrames(int frame1, int frame2) { |
56 |
|
Snapshot* snapshot1 = bsMan_->getSnapshot(frame1); |
57 |
|
Snapshot* snapshot2 = bsMan_->getSnapshot(frame2); |
58 |
|
assert(snapshot1 && snapshot2); |
69 |
|
StuntDouble* sd2; |
70 |
|
|
71 |
|
for (sd1 = seleMan1_.beginSelected(i), sd2 = seleMan2_.beginSelected(j); |
72 |
< |
sd1 != NULL && sd2 != NULL; |
73 |
< |
sd1 = seleMan1_.nextSelected(i), sd2 = seleMan2_.nextSelected(j)) { |
72 |
> |
sd1 != NULL && sd2 != NULL; |
73 |
> |
sd1 = seleMan1_.nextSelected(i), sd2 = seleMan2_.nextSelected(j)) { |
74 |
|
|
75 |
< |
double corrVal = calcCorrVal(frame1, frame2, sd1, sd2); |
76 |
< |
histogram_[timeBin] += corrVal; |
75 |
> |
double corrVal = calcCorrVal(frame1, frame2, sd1, sd2); |
76 |
> |
histogram_[timeBin] += corrVal; |
77 |
|
} |
78 |
|
|
79 |
< |
} |
79 |
> |
} |
80 |
|
|
81 |
|
} |
82 |
|
|