--- trunk/src/applications/staticProps/StaticProps.cpp	2005/05/27 04:41:34	544
+++ trunk/src/applications/staticProps/StaticProps.cpp	2006/05/12 21:34:43	955
@@ -57,6 +57,9 @@
 #include "applications/staticProps/GofXyz.hpp"
 #include "applications/staticProps/P2OrderParameter.hpp"
 #include "applications/staticProps/SCDOrderParameter.hpp"
+#include "applications/staticProps/DensityPlot.hpp"
+#include "applications/staticProps/RhoZ.hpp"
+#include "applications/staticProps/Hxy.hpp"
 
 using namespace oopse;
 
@@ -88,7 +91,7 @@ int main(int argc, char* argv[]){
     char*  sele1Env= getenv("OOPSE_SELE1");
     if (sele1Env) {
       sele1 = sele1Env;
-    }else {
+    }else if (!args_info.scd_given) {
       sprintf( painCave.errMsg,
                "neither --sele1 option nor $OOPSE_SELE1 is set");
       painCave.severity = OOPSE_ERROR;
@@ -103,7 +106,9 @@ int main(int argc, char* argv[]){
     char* sele2Env = getenv("OOPSE_SELE2");
     if (sele2Env) {
       sele2 = sele2Env;            
-    } else {
+    } else if (args_info.density_given) { 
+      sele2 = "select all";
+    } else if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given)  {
       sprintf( painCave.errMsg,
                "neither --sele2 option nor $OOPSE_SELE2 is set");
       painCave.severity = OOPSE_ERROR;
@@ -178,6 +183,13 @@ int main(int argc, char* argv[]){
           std::string sele3 = args_info.sele3_arg;
           analyser  = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3);
       }
+  }else if (args_info.density_given) {
+      analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg);  
+  } else if (args_info.slab_density_given) {
+      Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
+      analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nrbins_arg);
+  }else if (args_info.hxy_given) {
+      analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, args_info.nbins_y_arg, args_info.nrbins_arg);
   }
     
   if (args_info.output_given) {