--- PamCut/CommonDefs.h	2009/10/27 10:26:40	1.5
+++ PamCut/CommonDefs.h	2010/03/10 09:10:44	1.8
@@ -22,11 +22,12 @@
   TRK = 1, ///< Code for Tracker
   CALO = 2, ///< Code for Calorimeter level2
   TOF = 4, ///< Code for ToF
-  AC = 8, ///< Code for AntiCoincidence
-  TRIG = 16, ///< Code for Trigger
+  ANT = 8, ///< Code for AntiCoincidence
+  TRG = 16, ///< Code for Trigger
   ORB = 32, ///< Code for Orbital Info
-  ALL = 63, ///< Sum of all the above codes
-  CALO_L1 = 64
+  DEFAULT = 63, ///< TRK, CALO, TOF, ANT, TRG, ORB
+  ND = 64, ///< Code for Neutron Detector
+  CALO_L1 = 128
 ///< Code for Calorimeter level1
 };
 
@@ -46,6 +47,26 @@
  */
 const int TOFNPADLAYER[6] = { 8, 6, 2, 2, 3, 3 };
 
+/*! @var H_MASS
+ * Proton mass
+ */
+const float H_MASS = 0.93827203; // GeV (pdg.web.cern.ch)
+
+/*! @var HE4_MASS
+ * Helium 4 mass
+ */
+const float HE4_MASS = 3.7274; // GeV (http://hyperphysics.phy-astr.gsu.edu/Hbase/pertab/He.html)
+
+/*! @var HE3_MASS
+ * Helium 3 mass
+ */
+const float HE3_MASS = 2.8084; // GeV (http://hyperphysics.phy-astr.gsu.edu/Hbase/pertab/He.html)
+
+/*! @var E_MASS
+ * Electron mass
+ */
+const float E_MASS = 0.000510998; // GeV (from PDG)
+
 /*! @brief A simple matrix class.
  *
  *  This class defines a matrix built by STL vectors. It is basically a variable-dimension