46 |
|
|
47 |
|
namespace oopse { |
48 |
|
|
49 |
< |
GofR::GofR(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, double len) |
50 |
< |
: RadialDistrFunc(info, filename, sele1, sele2, len){ |
49 |
> |
GofR::GofR(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) |
50 |
> |
: RadialDistrFunc(info, filename, sele1, sele2){ |
51 |
|
|
52 |
< |
histogram_.resize(nbins_); |
53 |
< |
avgGofr_.resize(nbins_); |
52 |
> |
deltaR_ = len_ /nRBins_; |
53 |
> |
|
54 |
> |
histogram_.resize(nRBins_); |
55 |
> |
avgGofr_.resize(nRBins_); |
56 |
> |
|
57 |
> |
setOutputName(getPrefix(filename) + ".gofr"); |
58 |
|
} |
59 |
|
|
60 |
|
|
61 |
|
void GofR::preProcess() { |
58 |
– |
avgGofr_.resize(nbins_); |
62 |
|
std::fill(avgGofr_.begin(), avgGofr_.end(), 0.0); |
63 |
|
} |
64 |
|
|
65 |
|
void GofR::initalizeHistogram() { |
63 |
– |
npairs_ = 0; |
66 |
|
std::fill(histogram_.begin(), histogram_.end(), 0); |
67 |
|
} |
68 |
|
|
69 |
|
|
70 |
|
void GofR::processHistogram() { |
71 |
|
|
72 |
+ |
int nPairs = getNPairs(); |
73 |
|
double volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume(); |
74 |
< |
double pairDensity = npairs_ /volume; |
75 |
< |
double pairConstant = ( 4.0 * PI * pairDensity ) / 3.0; |
74 |
> |
double pairDensity = nPairs /volume * 2.0; |
75 |
> |
double pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0; |
76 |
|
|
77 |
|
for(int i = 0 ; i < histogram_.size(); ++i){ |
78 |
|
|
79 |
< |
double rLower = i * delta_; |
80 |
< |
double rUpper = rLower + delta_; |
79 |
> |
double rLower = i * deltaR_; |
80 |
> |
double rUpper = rLower + deltaR_; |
81 |
|
double volSlice = ( rUpper * rUpper * rUpper ) - ( rLower * rLower * rLower ); |
82 |
|
double nIdeal = volSlice * pairConstant; |
83 |
|
|
99 |
|
|
100 |
|
double distance = r12.length(); |
101 |
|
|
102 |
< |
int whichBin = distance / delta_; |
103 |
< |
histogram_[whichBin] ++; |
104 |
< |
npairs_++; |
102 |
> |
if (distance < len_) { |
103 |
> |
int whichBin = distance / deltaR_; |
104 |
> |
histogram_[whichBin] += 2; |
105 |
> |
} |
106 |
|
} |
107 |
|
|
108 |
|
|
114 |
|
rdfStream << "selection2: (" << selectionScript2_ << ")\n"; |
115 |
|
rdfStream << "#r\tcorrValue\n"; |
116 |
|
for (int i = 0; i < avgGofr_.size(); ++i) { |
117 |
< |
double r = delta_ * (i + 0.5); |
117 |
> |
double r = deltaR_ * (i + 0.5); |
118 |
|
rdfStream << r << "\t" << avgGofr_[i]/nProcessed_ << "\n"; |
119 |
|
} |
120 |
|
|