--- trunk/src/selection/SelectionToken.hpp	2005/12/02 15:38:03	770
+++ trunk/src/selection/SelectionToken.hpp	2013/12/05 18:19:26	1953
@@ -6,19 +6,10 @@
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,6 +28,16 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
+ * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
+ * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
 
 #ifndef SELECTION_TOKEN_HPP
@@ -47,7 +48,7 @@
 #include <utility>
 #include "utils/any.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
 
   /**
@@ -121,8 +122,8 @@ namespace oopse {
     const  static int embeddedExpression= (1 << 15); // embedded expression
     const static int index = (1 << 16) | expression;
     // rasmol commands
-    const static int define       = command | expressionCommand |1;
-    const static int select       = command |expressionCommand |2 ;
+    const static int define       = command | expressionCommand | 1;
+    const static int select       = command | expressionCommand | 2 ;
 
     //predefine
     //const static int selected    = predefinedset |0;
@@ -130,7 +131,7 @@ namespace oopse {
     // atom expression operators
     const static int leftparen    = expression |  0;
     const static int rightparen   = expression |  1;
-    const static int to                = expression | 2;
+    const static int to           = expression |  2;
     const static int opAnd        = expression |  3;
     const static int opOr         = expression |  4;
     const static int opNot        = expression |  5;
@@ -138,8 +139,10 @@ namespace oopse {
     const static int asterisk     = expression |  7;
     const static int dot          = expression | 8;
     const static int all          = expression | 9 ; 
-    const static int none      = expression | 10;
-    const static int name      = expression | 11;
+    const static int none         = expression | 10;
+    const static int name         = expression | 11;
+    const static int hull         = expression | dynamic | 12;
+
     // miguel 2005 01 01
     // these are used to demark the beginning and end of expressions
     // they do not exist in the source code, but are emitted by the
@@ -148,14 +151,21 @@ namespace oopse {
     const static int expressionEnd   = expression | 101;
 
     const static int mass         = atomproperty | 0;
-    const static int charge       = atomproperty | 1;
+    const static int charge       = atomproperty | dynamic | 1;
+    const static int x            = atomproperty | dynamic | 2;
+    const static int y            = atomproperty | dynamic | 3;
+    const static int z            = atomproperty | dynamic | 4;
+    const static int r            = atomproperty | dynamic | 5;
+    const static int wrappedX     = atomproperty | dynamic | 6;
+    const static int wrappedY     = atomproperty | dynamic | 7;
+    const static int wrappedZ     = atomproperty | dynamic | 8;
         
-    const static int opGT         = comparator |  0;
-    const static int opGE         = comparator |  1;
-    const static int opLE         = comparator |  2;
-    const static int opLT         = comparator |  3;
-    const static int opEQ         = comparator |  4;
-    const static int opNE         = comparator |  5;
+    const static int opGT         = comparator |  dynamic | 0;
+    const static int opGE         = comparator |  dynamic | 1;
+    const static int opLE         = comparator |  dynamic | 2;
+    const static int opLT         = comparator |  dynamic | 3;
+    const static int opEQ         = comparator |  dynamic | 4;
+    const static int opNE         = comparator |  dynamic | 5;
  
     static Token tokenExpressionBegin;
     static Token tokenExpressionEnd;