--- trunk/src/applications/staticProps/StaticPropsCmd.h	2010/06/23 19:25:02	1454
+++ trunk/src/applications/staticProps/StaticPropsCmd.h	2010/12/29 16:48:19	1531
@@ -1,6 +1,6 @@
 /** @file StaticPropsCmd.h
  *  @brief The header file for the command line option parser
- *  generated by GNU Gengetopt version 2.22
+ *  generated by GNU Gengetopt version 2.22.4
  *  http://www.gnu.org/software/gengetopt.
  *  DO NOT modify this file, since it can be overwritten
  *  @author GNU Gengetopt by Lorenzo Bettini */
@@ -20,10 +20,15 @@ extern "C" {
 #endif /* __cplusplus */
 
 #ifndef CMDLINE_PARSER_PACKAGE
-/** @brief the program name */
+/** @brief the program name (used for printing errors) */
 #define CMDLINE_PARSER_PACKAGE "StaticProps"
 #endif
 
+#ifndef CMDLINE_PARSER_PACKAGE_NAME
+/** @brief the complete program name (used for help and version) */
+#define CMDLINE_PARSER_PACKAGE_NAME "StaticProps"
+#endif
+
 #ifndef CMDLINE_PARSER_VERSION
 /** @brief the program version */
 #define CMDLINE_PARSER_VERSION "1.00"
@@ -103,6 +108,7 @@ struct gengetopt_args_info
   const char *bo_help; /**< @brief bond order parameter (--rcut must be specified) help description.  */
   const char *bor_help; /**< @brief bond order parameter as a function of radius (--rcut must be specified) help description.  */
   const char *bad_help; /**< @brief N(theta) bond angle density within (--rcut must be specified) help description.  */
+  const char *count_help; /**< @brief count of molecules matching selection criteria (and associated statistics) help description.  */
   const char *gofr_help; /**< @brief g(r) help description.  */
   const char *gofz_help; /**< @brief g(z) help description.  */
   const char *r_theta_help; /**< @brief g(r, cos(theta)) help description.  */
@@ -119,7 +125,9 @@ struct gengetopt_args_info
   const char *p_angle_help; /**< @brief p(cos(theta)) help description.  */
   const char *hxy_help; /**< @brief hxy help description.  */
   const char *rho_r_help; /**< @brief rho of R help description.  */
+  const char *angle_r_help; /**< @brief angle of R help description.  */
   const char *hullvol_help; /**< @brief hull volume of nanoparticle help description.  */
+  const char *tet_param_help; /**< @brief tetrahedrality order parameter help description.  */
   
   unsigned int help_given ;	/**< @brief Whether help was given.  */
   unsigned int version_given ;	/**< @brief Whether version was given.  */
@@ -148,6 +156,7 @@ struct gengetopt_args_info
   unsigned int bo_given ;	/**< @brief Whether bo was given.  */
   unsigned int bor_given ;	/**< @brief Whether bor was given.  */
   unsigned int bad_given ;	/**< @brief Whether bad was given.  */
+  unsigned int count_given ;	/**< @brief Whether count was given.  */
   unsigned int gofr_given ;	/**< @brief Whether gofr was given.  */
   unsigned int gofz_given ;	/**< @brief Whether gofz was given.  */
   unsigned int r_theta_given ;	/**< @brief Whether r_theta was given.  */
@@ -164,7 +173,9 @@ struct gengetopt_args_info
   unsigned int p_angle_given ;	/**< @brief Whether p_angle was given.  */
   unsigned int hxy_given ;	/**< @brief Whether hxy was given.  */
   unsigned int rho_r_given ;	/**< @brief Whether rho_r was given.  */
+  unsigned int angle_r_given ;	/**< @brief Whether angle_r was given.  */
   unsigned int hullvol_given ;	/**< @brief Whether hullvol was given.  */
+  unsigned int tet_param_given ;	/**< @brief Whether tet_param was given.  */
 
   char **inputs ; /**< @brief unamed options (options without names) */
   unsigned inputs_num ; /**< @brief unamed options number */
@@ -195,7 +206,7 @@ extern const char *gengetopt_args_info_help[];
  * @param args_info the structure where option information will be stored
  * @return 0 if everything went fine, NON 0 if an error took place
  */
-int cmdline_parser (int argc, char * const *argv,
+int cmdline_parser (int argc, char **argv,
   struct gengetopt_args_info *args_info);
 
 /**
@@ -209,7 +220,7 @@ int cmdline_parser (int argc, char * const *argv,
  * @return 0 if everything went fine, NON 0 if an error took place
  * @deprecated use cmdline_parser_ext() instead
  */
-int cmdline_parser2 (int argc, char * const *argv,
+int cmdline_parser2 (int argc, char **argv,
   struct gengetopt_args_info *args_info,
   int override, int initialize, int check_required);
 
@@ -221,7 +232,7 @@ int cmdline_parser2 (int argc, char * const *argv,
  * @param params additional parameters for the parser
  * @return 0 if everything went fine, NON 0 if an error took place
  */
-int cmdline_parser_ext (int argc, char * const *argv,
+int cmdline_parser_ext (int argc, char **argv,
   struct gengetopt_args_info *args_info,
   struct cmdline_parser_params *params);