--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2006/05/19 13:15:52	1.1
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2006/06/01 09:03:09	1.2
@@ -10,6 +10,13 @@
 #include <TClonesArray.h>
 #include <TrkStruct.h>
 
+// z-coordinate of track state-vector reference-plane
+#define ZINI 23.5   
+// upper and lower (mechanical) z-coordinate of the tracker
+#define ZTRKUP 22.29
+#define ZTRKDW -22.22
+
+
 /**
  * \brief Class to describe, by points, a particle trajectory in the apparatus. 
  *
@@ -26,12 +33,18 @@
     float* x;   ///< x coordinates 
     float* y;   ///< y coordinates 
     float* z;   ///< z coordinates 
+    float* thx; ///< x projected angle 
+    float* thy; ///< y projected angle
+    float* tl;  ///< track length
 
-    Trajectory(){npoint=1; x = new float; y = new float; z = new float; return;};
+    Trajectory();
     Trajectory(int n);
     Trajectory(int n, float* pz);
     void Dump();
 
+    float GetLength(){float l=0; for(int i=0; i<npoint;i++)l=l+tl[i]; return l;};
+    float GetLength(int,int);
+
     ClassDef(Trajectory,1);
 
 };
@@ -74,8 +87,9 @@
     void Dump();
 
     Bool_t HasImage(){return !(image==-1);} ///< Returns true if the track has an image
-	int DoTrack(Trajectory* t);   			///< Evaluates the trajectory in the apparatus.
-	float BdL(){return 0;};					///< Evaluates the integral of B*dL along the track.
+    int DoTrack(Trajectory* t);   			///< Evaluates the trajectory in the apparatus.
+    int DoTrack2(Trajectory* t);   			///< Evaluates the trajectory in the apparatus.
+    float BdL(){return 0;};					///< Evaluates the integral of B*dL along the track.
     Int_t GetNX(){Int_t n=0; for(Int_t i=0; i<6; i++)n+=xgood[i]; return n;}; 
     Int_t GetNY(){Int_t n=0; for(Int_t i=0; i<6; i++)n+=ygood[i]; return n;};
     Float_t GetRigidity();