| 46 |
|
|
| 47 |
|
namespace oopse { |
| 48 |
|
|
| 49 |
< |
GofRAngle::GofRAngle(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) |
| 50 |
< |
: RadialDistrFunc(info, filename, sele1, sele2){ |
| 49 |
> |
GofRAngle::GofRAngle(SimInfo* info, const std::string& filename, const std::string& sele1, |
| 50 |
> |
const std::string& sele2, double len, int nrbins, int nangleBins) |
| 51 |
> |
: RadialDistrFunc(info, filename, sele1, sele2), len_(len), nRBins_(nrbins), nAngleBins_(nangleBins){ |
| 52 |
|
|
| 53 |
+ |
deltaR_ = len_ /nRBins_; |
| 54 |
+ |
deltaCosAngle_ = 2.0 / nAngleBins_; |
| 55 |
+ |
|
| 56 |
+ |
histogram_.resize(nRBins_); |
| 57 |
+ |
avgGofr_.resize(nRBins_); |
| 58 |
+ |
for (int i = 0 ; i < nRBins_; ++i) { |
| 59 |
+ |
histogram_[i].resize(nAngleBins_); |
| 60 |
+ |
avgGofr_[i].resize(nAngleBins_); |
| 61 |
+ |
} |
| 62 |
|
} |
| 63 |
|
|
| 64 |
|
|
| 77 |
|
|
| 78 |
|
|
| 79 |
|
void GofRAngle::processHistogram() { |
| 80 |
< |
int nRealPairs = getNRealPairs(); |
| 80 |
> |
|
| 81 |
> |
int nPairs = getNPairs(); |
| 82 |
|
double volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume(); |
| 83 |
< |
double pairDensity = nRealPairs /volume; |
| 83 |
> |
double pairDensity = nPairs /volume; |
| 84 |
|
double pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0; |
| 85 |
|
|
| 86 |
|
for(int i = 0 ; i < histogram_.size(); ++i){ |
