| 47 |  | class GofRAngle : public RadialDistrFunc { | 
| 48 |  |  | 
| 49 |  | public: | 
| 50 | < | GofRAngle(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2); | 
| 50 | > | GofRAngle(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, double len, int nrbins, int nangleBins); | 
| 51 |  |  | 
| 52 | – | void setNRBins(int nbins) { | 
| 53 | – | assert(nbins > 0); | 
| 54 | – | nRBins_ = nbins; | 
| 55 | – | deltaR_ = len_ / nRBins_; | 
| 56 | – | for (int i = 0 ; i < nRBins_; ++i) { | 
| 57 | – | histogram_[i].resize(nAngleBins_); | 
| 58 | – | avgGofr_[i].resize(nAngleBins_); | 
| 59 | – | } | 
| 60 | – | } | 
| 61 | – |  | 
| 52 |  | int getNRBins() { | 
| 53 |  | return nRBins_; | 
| 54 |  | } | 
| 55 |  |  | 
| 66 | – | void setLength(double len) { | 
| 67 | – | len_ = len; | 
| 68 | – | deltaR_ = len_ /nRBins_; | 
| 69 | – | } | 
| 70 | – |  | 
| 56 |  | double getLength() { | 
| 57 |  | return len_; | 
| 58 |  | } | 
| 59 | < |  | 
| 75 | < | void setNAngleBins(int nbins) { | 
| 76 | < | assert(nbins >0); | 
| 77 | < | nAngleBins_ = nbins; | 
| 78 | < | deltaCosAngle_ = 2.0 / nAngleBins_; | 
| 79 | < | for (int i = 0 ; i < nRBins_; ++i) { | 
| 80 | < | histogram_[i].resize(nAngleBins_); | 
| 81 | < | avgGofr_[i].resize(nAngleBins_); | 
| 82 | < | } | 
| 83 | < | } | 
| 84 | < |  | 
| 59 | > |  | 
| 60 |  | int getNAngleBins() {return nAngleBins_;} | 
| 61 |  |  | 
| 62 |  | private: | 
| 84 |  |  | 
| 85 |  | class GofRTheta : public GofRAngle { | 
| 86 |  | public: | 
| 87 | < | GofRTheta(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) | 
| 88 | < | : GofRAngle (info, filename, sele1, sele2) { | 
| 89 | < | setOutputName(getPrefix(filename) + ".gt"); | 
| 87 | > | GofRTheta(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, double len, int nrbins, int nangleBins) | 
| 88 | > | : GofRAngle (info, filename, sele1, sele2, len, nrbins, nangleBins) { | 
| 89 | > | setOutputName(getPrefix(filename) + ".gofrt"); | 
| 90 |  | } | 
| 91 |  |  | 
| 92 |  | private: | 
| 97 |  |  | 
| 98 |  | class GofROmega : public GofRAngle { | 
| 99 |  | public: | 
| 100 | < | GofROmega(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) | 
| 101 | < | : GofRAngle (info, filename, sele1, sele2) { | 
| 102 | < | setOutputName(getPrefix(filename) + ".go"); | 
| 100 | > | GofROmega(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, double len, int nrbins, int nangleBins) | 
| 101 | > | : GofRAngle (info, filename, sele1, sele2, len, nrbins, nangleBins) { | 
| 102 | > | setOutputName(getPrefix(filename) + ".gofro"); | 
| 103 |  | } | 
| 104 |  |  | 
| 105 |  | private: |