| 44 |  | #include "selection/SelectionManager.hpp" | 
| 45 |  | #include "applications/staticProps/StaticAnalyser.hpp" | 
| 46 |  | #include "math/Vector3.hpp" | 
| 47 | + | #include "math/SphericalHarmonic.hpp" | 
| 48 | + | #include "math/Wigner3jm_interface.h" | 
| 49 |  |  | 
| 50 |  | namespace oopse { | 
| 51 |  |  | 
| 52 |  | class BondOrderParameter : public StaticAnalyser{ | 
| 53 |  | public: | 
| 54 |  | BondOrderParameter(SimInfo* info, const std::string& filename, | 
| 55 | < | const std::string& sele, double rCut, int lNumber, int nbins); | 
| 55 | > | const std::string& sele, double rCut, int nbins); | 
| 56 |  |  | 
| 57 |  | virtual ~BondOrderParameter(); | 
| 58 |  | virtual void process(); | 
| 59 |  |  | 
| 60 |  | private: | 
| 61 | < |  | 
| 62 | < | void writeOrderParameter(); | 
| 61 | > |  | 
| 62 | > | void writeOrderParameter(std::vector<RealType> Q, std::vector<ComplexType> What); | 
| 63 |  | virtual void initalizeHistogram(); | 
| 64 | < | virtual void collectHistogram(RealType Q_l, RealType W_l_hat); | 
| 63 | < | virtual void processHistogram(); | 
| 64 | > | virtual void collectHistogram(std::vector<RealType> q, std::vector<ComplexType> what); | 
| 65 |  |  | 
| 66 |  | Snapshot* currentSnapshot_; | 
| 67 |  |  | 
| 70 |  | SelectionEvaluator evaluator_; | 
| 71 |  |  | 
| 72 |  | RealType rCut_; | 
| 73 | < | int lNumber_; | 
| 74 | < | int mSize_; | 
| 75 | < |  | 
| 73 | > | static const int lMax_ = 12; | 
| 74 | > | int frameCounter_; | 
| 75 | > | int nBins_; | 
| 76 | > |  | 
| 77 | > | std::map<std::pair<int,int>,int> m2Min; | 
| 78 | > | std::map<std::pair<int,int>,int> m2Max; | 
| 79 | > | std::map<std::pair<int,int>,std::vector<RealType> > w3j; | 
| 80 | > |  | 
| 81 | > | RealType MinQ_; | 
| 82 |  | RealType MaxQ_; | 
| 83 |  | RealType deltaQ_; | 
| 84 | + | std::vector<int> Qcount_; | 
| 85 | + | std::map<std::pair<int,int>,int> Q_histogram_; | 
| 86 |  |  | 
| 87 | + | RealType MinW_; | 
| 88 |  | RealType MaxW_; | 
| 89 | < | RealType deltaW_ | 
| 90 | < |  | 
| 91 | < | std::vector<int> Q_histogram_; | 
| 82 | < | std::vector<int> W_histogram_; | 
| 83 | < |  | 
| 89 | > | RealType deltaW_; | 
| 90 | > | std::vector<int> Wcount_; | 
| 91 | > | std::map<std::pair<int,int>,int> W_histogram_; | 
| 92 |  | }; | 
| 93 |  | } | 
| 94 |  |  |