--- trunk/src/applications/dynamicProps/DynamicProps.cpp	2011/07/25 17:30:53	1596
+++ trunk/src/applications/dynamicProps/DynamicProps.cpp	2011/08/26 17:55:44	1615
@@ -59,6 +59,8 @@
 #include "applications/dynamicProps/DirectionalRCorrFunc.hpp"
 #include "applications/dynamicProps/EnergyCorrFunc.hpp"
 #include "applications/dynamicProps/StressCorrFunc.hpp"
+#include "applications/dynamicProps/SystemDipoleCorrFunc.hpp"
+#include "applications/dynamicProps/MomentumCorrFunc.hpp"
 
 
 using namespace OpenMD;
@@ -123,7 +125,9 @@ int main(int argc, char* argv[]){
 
 
   TimeCorrFunc* corrFunc;
-  if (args_info.dcorr_given){
+  if(args_info.sdcorr_given){
+    corrFunc = new SystemDipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize);
+  } else if (args_info.dcorr_given){
     corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize);
   } else if (args_info.rcorr_given) {
     corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2, memSize);
@@ -139,6 +143,8 @@ int main(int argc, char* argv[]){
     corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2, memSize);
   } else if (args_info.stresscorr_given){
     corrFunc = new StressCorrFunc(info, dumpFileName, sele1, sele2, memSize);
+  } else if (args_info.momentum_given){
+    corrFunc = new MomentumCorrFunc(info, dumpFileName, sele1, sele2, memSize);
   } else if (args_info.lcorr_given) {
     int order;
     if (args_info.order_given)