--- trunk/src/applications/staticProps/RadialDistrFunc.cpp 2005/04/15 22:04:00 507 +++ trunk/src/applications/staticProps/RadialDistrFunc.cpp 2008/01/23 21:21:50 1213 @@ -46,8 +46,8 @@ namespace oopse { #include "primitives/Molecule.hpp" namespace oopse { - RadialDistrFunc:: RadialDistrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) - : info_(info), currentSnapshot_(NULL), dumpFilename_(filename), step_(1), + RadialDistrFunc::RadialDistrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) + : StaticAnalyser(info, filename), selectionScript1_(sele1), selectionScript2_(sele2), evaluator1_(info), evaluator2_(info), seleMan1_(info), seleMan2_(info), common_(info), sele1_minus_common_(info), sele2_minus_common_(info){ @@ -131,7 +131,6 @@ namespace oopse { //stage 3 are completely overlapping if (evaluator1_.isDynamic() || evaluator2_.isDynamic()) { - common_ = seleMan1_ & seleMan2_; sele1_minus_common_ = seleMan1_ - common_; sele2_minus_common_ = seleMan2_ - common_; @@ -139,14 +138,12 @@ namespace oopse { int nSelected2 = seleMan2_.getSelectionCount(); int nIntersect = common_.getSelectionCount(); - nPairs_ = nSelected1 * nSelected2 - (nIntersect +1) * nIntersect/2; + nPairs_ = nSelected1 * nSelected2 - (nIntersect +1) * nIntersect/2; } - processNonOverlapping(sele1_minus_common_, seleMan2_); processNonOverlapping(common_, sele2_minus_common_); processOverlapping(common_); - - + processHistogram(); }