--- trunk/src/applications/staticProps/StaticProps.cpp	2014/08/13 20:42:43	2015
+++ trunk/src/applications/staticProps/StaticProps.cpp	2015/01/06 21:44:10	2049
@@ -81,6 +81,8 @@
 #include "applications/staticProps/RNEMDStats.hpp"
 #include "applications/staticProps/NitrileFrequencyMap.hpp"
 #include "applications/staticProps/MultipoleSum.hpp"
+#include "applications/staticProps/SurfaceDiffusion.hpp"
+#include "applications/staticProps/HBondGeometric.hpp"
 
 using namespace OpenMD;
 
@@ -98,6 +100,7 @@ int main(int argc, char* argv[]){
   std::string dumpFileName = args_info.input_arg;
   std::string sele1;
   std::string sele2;
+  std::string sele3;
   
   // check the first selection argument, or set it to the environment
   // variable, or failing that, set it to "select all"
@@ -129,6 +132,11 @@ int main(int argc, char* argv[]){
     }
   }
 
+  // check the third selection argument, which is only set if
+  // requested by the user
+
+  if (args_info.sele3_given) sele3 = args_info.sele3_arg;
+
   bool batchMode;
   if (args_info.scd_given){
     if (args_info.sele1_given && 
@@ -184,14 +192,27 @@ int main(int argc, char* argv[]){
     analyser  = new GofRZ(info, dumpFileName, sele1, sele2, maxLen, zmaxLen, 
 			  args_info.nbins_arg, args_info.nbins_z_arg);
   } else if (args_info.r_theta_given) {
-    analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen, 
-			      args_info.nbins_arg, args_info.nanglebins_arg);
+    if (args_info.sele3_given) 
+      analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, sele3, maxLen,
+                                args_info.nbins_arg, args_info.nanglebins_arg);
+    else 
+      analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen, 
+                                args_info.nbins_arg, args_info.nanglebins_arg);
   } else if (args_info.r_omega_given) {
-    analyser  = new GofROmega(info, dumpFileName, sele1, sele2, maxLen, 
-			      args_info.nbins_arg, args_info.nanglebins_arg);
+    if (args_info.sele3_given) 
+      analyser  = new GofROmega(info, dumpFileName, sele1, sele2, sele3, maxLen,
+                                args_info.nbins_arg, args_info.nanglebins_arg);
+    else 
+      analyser  = new GofROmega(info, dumpFileName, sele1, sele2, maxLen,
+                                args_info.nbins_arg, args_info.nanglebins_arg);
+
   } else if (args_info.theta_omega_given) {
-    analyser  = new GofAngle2(info, dumpFileName, sele1, sele2, 
-			      args_info.nanglebins_arg);
+    if (args_info.sele3_given) 
+      analyser  = new GofAngle2(info, dumpFileName, sele1, sele2, sele3,
+                                args_info.nanglebins_arg);
+    else
+      analyser  = new GofAngle2(info, dumpFileName, sele1, sele2, 
+                                args_info.nanglebins_arg);
   } else if (args_info.gxyz_given) {
     if (args_info.refsele_given) {
       analyser= new GofXyz(info, dumpFileName, sele1, sele2,
@@ -342,7 +363,6 @@ int main(int argc, char* argv[]){
                                         args_info.molname_arg, 
 					args_info.begin_arg, args_info.end_arg);
     } else{
-      std::string sele3 = args_info.sele3_arg;
       analyser  = new SCDOrderParameter(info, dumpFileName, 
                                         sele1, sele2, sele3);
     }
@@ -396,6 +416,8 @@ int main(int argc, char* argv[]){
     analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, 
 		       args_info.nbins_y_arg, args_info.nbins_arg);
 #endif
+  }else if (args_info.surfDiffusion_given){
+    analyser = new SurfaceDiffusion(info, dumpFileName, sele1, maxLen);
   }else if (args_info.rho_r_given) {
     if (args_info.radius_given){
       analyser = new RhoR(info, dumpFileName, sele1, maxLen,args_info.nbins_arg,args_info.radius_arg);
@@ -412,6 +434,28 @@ int main(int argc, char* argv[]){
     analyser = new NanoLength(info, dumpFileName, sele1);
   } else if (args_info.angle_r_given) {
     analyser = new AngleR(info, dumpFileName, sele1, maxLen,args_info.nbins_arg);
+  } else if (args_info.hbond_given){
+    if (args_info.rcut_given) {
+      if (args_info.thetacut_given) {
+        
+        analyser = new HBondGeometric(info, dumpFileName, sele1, sele2,
+                                      args_info.rcut_arg,
+                                      args_info.thetacut_arg,
+                                      args_info.nbins_arg);
+      } else {
+        sprintf( painCave.errMsg,
+                 "A cutoff angle (thetacut) must be specified when calculating Hydrogen Bonding Statistics");
+        painCave.severity = OPENMD_ERROR;
+        painCave.isFatal = 1;
+        simError();
+      }
+    } else {
+      sprintf( painCave.errMsg,
+               "A cutoff radius (rcut) must be specified when calculating Hydrogen Bonding Statistics");
+      painCave.severity = OPENMD_ERROR;
+      painCave.isFatal = 1;
+      simError();
+    }    
   }
   
   if (args_info.output_given) {