--- PamCut/TrkCuts/TrkNucleiZCut/TrkNucleiZCut.h	2009/05/27 13:30:08	1.1
+++ PamCut/TrkCuts/TrkNucleiZCut/TrkNucleiZCut.h	2009/05/29 10:10:18	1.2
@@ -28,12 +28,12 @@
 /*! @enum TrkNucleiZ_method Method to use to measure Z. */
 enum TrkNucleiZ_method {
   TRKNUCLEIZ_BETA, ///< Tracker dE/dx Vs. ToF beta
-  TRKNUCLEIZ_DEFL,
-///< Tracker standalon e: dE/dx Vs. deflection
+  TRKNUCLEIZ_RIG,
+///< Tracker standalon e: dE/dx Vs. rigidity
 };
 
-/*! @enum TrkNucleiZ_CheckMean Handy aliases to set check mean */
-enum TrkNucleiZ_CheckMean {
+/*! @enum TrkNucleiZ_Check Handy aliases to set check mean */
+enum TrkNucleiZ_Check {
   TRKNUCLEIZ_CHECKMEAN, ///< Check the mean value.
   TRKNUCLEIZ_CHECKSINGLEVALUES
 ///< Check each single charge from each layer.
@@ -58,12 +58,12 @@
    * @param lowerLimit The lower bound (in units of sigma_Z) of the desired charge range, defined as Zmean - lowerBound*sigmaZ.
    * @param upperLimit The upper bound (in units of sigma_Z) of the desired charge range, defined as Zmean + upperBound*sigmaZ.
    * @param minLayers The minimum required number of layers which give a valid charge information.
-   * @param checkMean Flag to set the check method (see #Check and #TrkNucleiZ_CheckMean).
+   * @param howToCheck Flag to set the check by mean release or by release in single planes (see #TrkNucleiZ_Check).
    * @param method The method to use to measure the particle's charge (see #TrkNucleiZ_method).
    * @return
    */
   TrkNucleiZCut(const char *cutName, unsigned int Z, float lowerLimit, float upperLimit, unsigned int minLayers = 1,
-      unsigned int howToCheck = TRKNUCLEIZ_CHECKMEAN, unsigned int method = TRKNUCLEIZ_DEFL) :
+      unsigned int howToCheck = TRKNUCLEIZ_CHECKMEAN, unsigned int method = TRKNUCLEIZ_RIG) :
     PamCut(cutName), _Z(Z), _lowerLimit(lowerLimit), _upperLimit(upperLimit), _trkNuclei(NULL), _minLayers(minLayers),
         _howToCheck(howToCheck), _method(method) {
 
@@ -77,7 +77,18 @@
    *
    * The routine selects events whose value of Zmean obtained from the TrkNuclei Class is in the range [Zmean - sigma*lowerBound, Zmean + sigma*upperBound].
    * Zmean and sigma are defined respectively as the mean and the standard deviation of the charge distributions obtained using TrkNuclei.
-   * In current implementation, means are taken to be equal to the charge value (Zmean = Z) and sigmas are:
+   * In current implementation, calibrations for Z=1 and Z=2 for mean dE/dx Vs. rigidity are:
+   *
+   *  Z=1 |   mean     sigma
+   *  ------------------------
+   *      |  0.992      0.06
+   *
+   *
+   *  Z=2 |   mean     sigma
+   *  ------------------------
+   *      |  1.99       0.1
+   *
+   * For all other cases (Z>2 or single plane releases or dE/dx Vs. beta), means are taken to be equal to the charge value (Zmean = Z) and sigmas are:
    *
    *   Z |  sigma
    *   -----------
@@ -88,7 +99,7 @@
    *   5 |  0.44
    *   6 |  0.59
    *
-   * independent of the method used. The TofNuclei calibrations used are the standard ones (from Wolfgang, see TrkNuclei.cpp).
+   * The TofNuclei calibrations used are the standard ones (from Wolfgang, see TrkNuclei.cpp).
    * First of all, the number of layers giving a valid charge information is checked to be greater than minLayers; if it's not so,
    * the routine will return #TRKNUCLEIZ_TOOFEWLAYERS. Next, it will check if the charge obtained considering the mean dE/dx in the tracker's
    * layers is in the validity range if the constructor's flag howToCheckMean was set to TRKNUCLEIZ_CHECKMEAN; otherwise, it will check each
@@ -110,7 +121,11 @@
 private:
 
   unsigned int _Z;
-  static const float _sigmaZ[];
+
+  static const float _meanRigMean[]; //Means for mean dE/dx Vs. rigidity
+  static const float _sigmaRigMean[];//Sigmas for mean dE/dx Vs. rigidity
+  static const float _meanBetaMean[]; //Means for mean dE/dx Vs. beta
+  static const float _sigmaBetaMean[];//Sigmas for mean dE/dx Vs. beta
 
   float _lowerLimit;
   float _upperLimit;