--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/08/31 14:56:50	1.31
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2008/01/22 08:55:06	1.34
@@ -31,10 +31,10 @@
 #define YMAGNHIGH 6.57 
 #define YMAGNLOW -6.57 
 // (mechanical) x/y-coordinates of magnet cavity
-#define XTRKL -8.1
-#define XTRKR  8.1
-#define YTRKL -6.6
-#define YTRKR  6.6
+/* #define XTRKL -8.1 */
+/* #define XTRKR  8.1 */
+/* #define YTRKL -6.6 */
+/* #define YTRKR  6.6 */
 
 /**
  * \brief Class to describe, by points, a particle trajectory in the apparatus. 
@@ -90,11 +90,11 @@
 
 private:
 
+public:
+
     int   seqno;           ///<stored track sequential number
     int   image;           ///<sequential number of track-image
 	
-public:
-
     float al[5];           ///<TRACK STATE VECTOR 
     float coval[5][5];     ///<covariance matrix 
     int   xgood[6];        ///<cluster id for x-view (0 = view not included in the fit) 
@@ -173,6 +173,8 @@
     void SetTrackingMode(int trackmode);
     void SetPrecisionFactor(double fact);
     void SetStepMin(int istepmin);
+    void SetDeltaB(int id, double db);
+
     Bool_t IsInsideCavity();
 
     Bool_t EvaluateClusterPositions();
@@ -206,6 +208,30 @@
 /*     Float_t GetClusterX_CoordinatePU(int ip); */
 /*     Float_t GetClusterY_CoordinatePU(int ip); */
     
+    Float_t GetYav();
+    Float_t GetXav();
+    Float_t GetZav();
+
+    Int_t GetNColumns();
+
+    Float_t GetDEDX_max(int ip, int iv);
+    Float_t GetDEDX_max(int iv){ return GetDEDX_max(-1,iv); };
+    Float_t GetDEDX_max(){ return GetDEDX_max(-1,-1); };
+    Float_t GetDEDX_min(int ip, int iv);
+    Float_t GetDEDX_min(int iv){ return GetDEDX_min(-1,iv); };
+    Float_t GetDEDX_min(){ return GetDEDX_min(-1,-1); };
+
+    Float_t GetResidual_max(int ip, int iv);
+    Float_t GetResidual_max(int iv){ return GetResidual_max(-1,iv); };
+    Float_t GetResidual_max(){ return GetResidual_max(-1,-1); };
+
+    Int_t GetClusterX_Multiplicity_max();
+    Int_t GetClusterX_Multiplicity_min();
+    Int_t GetClusterY_Multiplicity_max();
+    Int_t GetClusterY_Multiplicity_min();
+
+    Float_t GetClusterX_Seed_min();
+    Float_t GetClusterY_Seed_min();
 
     TrkTrack* GetTrkTrack(){return this;};
 
@@ -342,10 +368,10 @@
     float GetBY(float* v){return TrkParams::GetBY(v);};///< By (kGauss)
     float GetBZ(float* v){return TrkParams::GetBZ(v);};///< Bz (kGauss)
     Float_t GetZTrk(Int_t);
-    Float_t GetXTrkLeft(){return XTRKL;};
-    Float_t GetXTrkRight(){return XTRKR;};
-    Float_t GetYTrkLeft(){return YTRKL;};
-    Float_t GetYTrkRight(){return YTRKR;};
+    Float_t GetXTrkLeft(){return XMAGNLOW;};
+    Float_t GetXTrkRight(){return XMAGNHIGH;};
+    Float_t GetYTrkLeft(){return YMAGNLOW;};
+    Float_t GetYTrkRight(){return YMAGNHIGH;};
     
     Bool_t IsMaskedVK(int,int);
     Bool_t GetVKMask(int,int);