--- trunk/src/applications/dynamicProps/DynamicProps.cpp 2006/08/30 21:04:04 1026 +++ trunk/src/applications/dynamicProps/DynamicProps.cpp 2008/05/27 16:39:06 1245 @@ -53,6 +53,10 @@ #include "applications/dynamicProps/RCorrFunc.hpp" #include "applications/dynamicProps/VCorrFunc.hpp" #include "applications/dynamicProps/LegendreCorrFunc.hpp" +#include "applications/dynamicProps/RadialRCorrFunc.hpp" +#include "applications/dynamicProps/ThetaCorrFunc.hpp" +#include "applications/dynamicProps/DirectionalRCorrFunc.hpp" +#include "applications/dynamicProps/EnergyCorrFunc.hpp" using namespace oopse; @@ -112,9 +116,16 @@ int main(int argc, char* argv[]){ corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2); } else if (args_info.rcorr_given) { corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2); - } - else if (args_info.vcorr_given) { + } else if (args_info.r_rcorr_given) { + corrFunc = new RadialRCorrFunc(info, dumpFileName, sele1, sele2); + } else if (args_info.thetacorr_given) { + corrFunc = new ThetaCorrFunc(info, dumpFileName, sele1, sele2); + } else if (args_info.drcorr_given) { + corrFunc = new DirectionalRCorrFunc(info, dumpFileName, sele1, sele2); + } else if (args_info.vcorr_given) { corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2); + } else if (args_info.helfandEcorr_given){ + corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2); } else if (args_info.lcorr_given) { int order; if (args_info.order_given)