--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2008/04/11 13:44:36	1.36
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2011/09/01 16:01:32	1.43
@@ -15,7 +15,7 @@
 #include <TrkLevel1.h>
 
 // z-coordinate of track state-vector reference-plane
-#define ZINI 23.5   
+#define ZINI 23.5 ///< z-coordinate of track state-vector reference-plane.
 // (mechanical) z-coordinate of the tracker planes
 #define ZTRK6 -22.22
 #define ZTRK5 -13.31
@@ -71,7 +71,12 @@
     void Dump();
     void Delete();
 
-    int DoTrack2(float* al);
+    int DoTrack(float* al, float zini);
+    int DoTrack(float* al){ return DoTrack(al,23.5); };
+
+    int DoTrack2(float* al, float zini);
+    int DoTrack2(float* al){ return DoTrack2(al,23.5); };
+
     float GetLength(){float l=0; for(int i=0; i<npoint;i++)l=l+tl[i]; return l;};
     float GetLength(int,int);
 
@@ -104,7 +109,18 @@
     int   seqno;           ///<stored track sequential number
     int   image;           ///<sequential number of track-image
 	
-    float al[5];           ///<TRACK STATE VECTOR 
+    /*! @brief Track state vector.
+     *
+     *  This is the track state vector on reference plane defined by #ZINI.
+     *
+     *  al[0]: X coordinate [cm]
+     *  al[1]: Y coordinate [cm]
+     *  al[2]: sin theta (altitude; theta = 0 is normal incidence)
+     *  al[3]: phi (azimuth; phi = 0 is negative X axis)
+     *  al[4]: deflection (with sign) [1/GV]
+     *
+     */
+    float al[5];
     float coval[5][5];     ///<covariance matrix 
     int   xgood[6];        ///<cluster id for x-view (0 = view not included in the fit) 
     int   ygood[6];        ///<cluster id for y-view (0 = view not included in the fit) 
@@ -151,9 +167,10 @@
     Bool_t HasImage(){return !(image==-1);} ///< Returns true if the track has an image
     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.
+    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+=(Int_t)XGood(i); return n;}; 
     Int_t GetNY(){Int_t n=0; for(Int_t i=0; i<6; i++)n+=(Int_t)YGood(i); return n;};
+    Int_t GetNXY(){Int_t n=0; for(Int_t i=0; i<6; i++)n+=(Int_t)YGood(i)*XGood(i); return n;};
     Int_t GetNtot(){return GetNX()+GetNY();};
     Float_t GetRigidity();
     Float_t GetDeflection();
@@ -164,6 +181,7 @@
     Float_t GetDEDX();
     Float_t GetDEDX(int ip);
     Float_t GetDEDX(int ip,int iv);
+    Int_t GetLeverArmXY();
     Int_t GetLeverArmX();
     Int_t GetLeverArmY();
     Float_t GetChi2X();
@@ -189,7 +207,10 @@
 
     Bool_t IsInsideCavity(float);
     Bool_t IsInsideCavity(){ return IsInsideCavity(0.); };
-    Bool_t IsInsideAcceptance();
+    Bool_t IsInsideAcceptance(float);
+    Bool_t IsInsideAcceptance(){ return IsInsideAcceptance(0.); };
+    Bool_t IsInsideGFSurface(const char*,float);
+    Bool_t IsInsideGFSurface(const char* surf){ return IsInsideGFSurface(surf,0.); };
 
     Bool_t EvaluateClusterPositions();
 
@@ -202,7 +223,7 @@
     Int_t GetSensor(int ip);
     Bool_t XGood(int ip){ return GetClusterX_ID(ip)!=-1; };
     Bool_t YGood(int ip){ return GetClusterY_ID(ip)!=-1; };
-    void ResetXGoo(int ip){ xgood[ip]=0; };
+    void ResetXGood(int ip){ xgood[ip]=0; };
     void ResetYGood(int ip){ ygood[ip]=0; };
 /*     void SetXGood(int ip, int clid, int is); */
 /*     void SetYGood(int ip, int clid, int is); */
@@ -243,6 +264,9 @@
     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); };
+    Float_t GetResidual_av(int ip, int iv);
+    Float_t GetResidual_av(int iv){ return GetResidual_av(-1,iv); };
+    Float_t GetResidual_av(){ return GetResidual_av(-1,-1); };
 
     Int_t GetClusterX_Multiplicity_max();
     Int_t GetClusterX_Multiplicity_min();
@@ -376,6 +400,7 @@
     void Clear(Option_t *option){Clear();};
     void Delete();
     void Set();
+    int UnpackError(){ for(int i=0; i<12; i++)if(!StatusCheck(i,0x12))return 1; return 0;};
     
     int ntrk() {return Track->GetEntries();}    ///< number of stored track
     int nclsx(){return SingletX->GetEntries();} ///< number of x singlets