--- trunk/src/applications/staticProps/StaticProps.cpp 2007/09/17 20:05:51 1180 +++ trunk/src/applications/staticProps/StaticProps.cpp 2008/06/30 17:53:42 1267 @@ -52,6 +52,7 @@ #include "applications/staticProps/StaticPropsCmd.h" #include "applications/staticProps/StaticAnalyser.hpp" #include "applications/staticProps/GofR.hpp" +#include "applications/staticProps/GofZ.hpp" #include "applications/staticProps/GofRAngle.hpp" #include "applications/staticProps/GofAngle2.hpp" #include "applications/staticProps/GofXyz.hpp" @@ -182,6 +183,9 @@ int main(int argc, char* argv[]){ if (args_info.gofr_given){ analyser= new GofR(info, dumpFileName, sele1, sele2, maxLen, args_info.nbins_arg); + } else if (args_info.gofz_given) { + analyser= new GofZ(info, dumpFileName, sele1, sele2, maxLen, + args_info.nbins_arg); } else if (args_info.r_theta_given) { analyser = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen, args_info.nbins_arg, args_info.nanglebins_arg); @@ -249,11 +253,10 @@ 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, sele2, maxLen, + analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nbins_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.nbins_arg); + analyser = new RhoZ(info, dumpFileName, sele1, args_info.nbins_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,