--- PamCut/TofCuts/TofBetaRangeCut/TofBetaRangeCut.h	2009/05/27 13:30:09	1.1
+++ PamCut/TofCuts/TofBetaRangeCut/TofBetaRangeCut.h	2015/03/25 17:38:08	1.3
@@ -12,7 +12,6 @@
 
 #include "../../PamCutBase/PamCutBase.h"
 
-
 /*! @brief The TofBetaRange cut.
  * This cut selects a range of beta values. Note that beta can be either positive (downward going particle) or negative (upward going particle).
  */
@@ -20,26 +19,39 @@
 class TofBetaRangeCut: public PamCut {
 
 public:
-  /*! @brief Constructor.
-  * The parameters are: the TOF-index for the track which is necessary to input to derive the beta; resMax, qualCut and chi2Cut for the quality of beta; the minimum and maximum beta values.
-  * Various combinations of quality parameters are possible: default low-quality beta (used for beta[12]): 10.,10.,20.; medium-quality beta: 5.,15.,4.; high-quality beta: 3.,20.,3.
-  * NOTE: beta can be either positive (downward going particle) or negative (upward going particle). Beta = 100 means beta calculation was not successful.
-
-  * @param cutName The cut's name.
-  * @param trackTof Pointer to the TOF-index indicating the track to be used when evaluating
-  *        the beta (default value for TOF_index is 0, corresponding to the TOF stand-alone
-  *        track [no TRK information to build the TOF stand-alone track]). The pointer to the
-  *        TOF_index for TRK-track as given by TrkPhSinCut can be used.
-  *
-  * @param resMax Default: 10. (equivalent to beta[12])
-  * @param qualCut Default: 10. (equivalent to beta[12])
-  * @param chi2Cut Default: 20. (equivalent to beta[12])
-  * @param minBeta the minimum beta value (with sign)
-  * @param maxBeta the maximum beta value (with sign)
-  */
-  TofBetaRangeCut(const char *cutName, int *trackTof=NULL, float resMax=10., float qualCut=10., float chi2Cut=20., float minBeta=-100., float maxBeta=100.):
-    PamCut(cutName), _trackTof(trackTof), _resMax(resMax), _qualCut(qualCut), _chi2Cut(chi2Cut), _minBeta(minBeta), _maxBeta(maxBeta) {
+  /*! @brief Constructor 
+   * @param cutName The cut's name. 
+   * @param trkAlg Tracking algorythm to be used ()
+   * @param trkId ID of the (physical) track along which beta should be evaluated (default 0, that is the first track)
+   * @param resMax See documentation for ToFLevel2::CalcBeta. Default: 10. (equivalent to beta[12])
+   * @param qualCut See documentation for ToFLevel2::CalcBeta. Default: 10. (equivalent to beta[12]) 
+   * @param chi2Cut See documentation for ToFLevel2::CalcBeta. Default: 20. (equivalent to beta[12])
+   * @param minBeta the minimum beta value (with sign)
+   * @param maxBeta the maximum beta value (with sign)
+   *
+   * In order to evaluate the beta of a particle by using the tracker information, the trkAlg should be indicated (e.g."STD"). 
+   * For meaningfull analysis, this cut should follow a  TrkPhSinCut (single track), and the indicated trkAlg should be 
+   * consistently the same one.
+   * If the standalone ToF information is instead required, trkId should be set equal to -1. In this case trkAlg is ignored.
+   *
+   */
+
+
+/*   TofBetaRangeCut(const char *cutName, ToFTrkVar *trackTof = NULL, float resMax = 10., float qualCut = 10., float chi2Cut = */
+/*       20., float minBeta = -100., float maxBeta = 100.) : */
+/*     PamCut(cutName), _trackTof(trackTof), _resMax(resMax), _qualCut(qualCut), _chi2Cut(chi2Cut), _minBeta(minBeta), */
+/*         _maxBeta(maxBeta) {       */
+/*   } */
+    TofBetaRangeCut(const char *cutName, const char *trkAlg, int trkId=0, float resMax = 10., float qualCut = 10., float chi2Cut =
+      20., float minBeta = -100., float maxBeta = 100.) :
+	PamCut(cutName), _trkAlg(trkAlg), _trkId(trkId), _resMax(resMax), _qualCut(qualCut), _chi2Cut(chi2Cut), _minBeta(minBeta),
+        _maxBeta(maxBeta) {      
+
+//	cout << "TofBetaRangeCut("<<cutName<<","<<_trkAlg<<","<<_trkId<<","<<_resMax<<","<<_qualCut<<","<<_chi2Cut<<","<<_minBeta<<","<<_maxBeta<<")"<<endl;
+	beta = 0;
+
   }
+
   /*! @brief Destructor. */
   ~TofBetaRangeCut() {
   }
@@ -52,9 +64,12 @@
    */
   int Check(PamLevel2 *event);
 
+  float beta;
+
 private:
 
-  int *_trackTof;
+  const char *_trkAlg;///<Tracking algorythm 
+  int _trkId;
   float _resMax, _qualCut, _chi2Cut;
 
   float _minBeta, _maxBeta;