--- trunk/src/applications/staticProps/StaticProps.cpp	2005/05/27 21:11:24	545
+++ trunk/src/applications/staticProps/StaticProps.cpp	2006/05/17 21:51:42	963
@@ -58,6 +58,10 @@
 #include "applications/staticProps/P2OrderParameter.hpp"
 #include "applications/staticProps/SCDOrderParameter.hpp"
 #include "applications/staticProps/DensityPlot.hpp"
+#include "applications/staticProps/RhoZ.hpp"
+#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
+#include "applications/staticProps/Hxy.hpp"
+#endif
 
 using namespace oopse;
 
@@ -104,7 +108,9 @@ int main(int argc, char* argv[]){
     char* sele2Env = getenv("OOPSE_SELE2");
     if (sele2Env) {
       sele2 = sele2Env;            
-    } else if(!args_info.scd_given && !args_info.density_given)  {
+    } 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;
@@ -142,7 +148,7 @@ int main(int argc, char* argv[]){
   SimCreator creator;
   SimInfo* info = creator.createSim(mdFileName);
 
-  double maxLen;
+  RealType maxLen;
   if (args_info.length_given) {
     maxLen = args_info.length_arg;
   } else {
@@ -180,7 +186,14 @@ int main(int argc, char* argv[]){
           analyser  = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3);
       }
   }else if (args_info.density_given) {
-      analyser= new DensityPlot(info, dumpFileName, sele1, maxLen, args_info.nrbins_arg);  
+      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);
+#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
+  }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);
+#endif
   }
     
   if (args_info.output_given) {