--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2008/03/05 17:00:18	1.35
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2009/03/11 14:19:09	1.42
@@ -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);
 
@@ -154,6 +159,7 @@
     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 +170,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 +196,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();
 
@@ -204,8 +214,13 @@
     Bool_t YGood(int ip){ return GetClusterY_ID(ip)!=-1; };
     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);
+/*     void SetXGood(int ip, int clid, int is); */
+/*     void SetYGood(int ip, int clid, int is); */
+    void SetXGood(int ip, int clid, int il, int is, bool bad);
+    void SetYGood(int ip, int clid, int il, int is, bool bad);
+    void SetXGood(int ip, int clid, int il, int is){ SetXGood(ip,clid,il,is,false); };
+    void SetYGood(int ip, int clid, int il, int is){ SetYGood(ip,clid,il,is,false); };
+
 
     Bool_t BadClusterX(int ip){ return IsBad(ip,0); };
     Bool_t BadClusterY(int ip){ return IsBad(ip,1); };
@@ -219,7 +234,7 @@
     Int_t GetClusterY_MaxStrip(int ip){ return (Int_t)(multmaxy[ip]%10000); };
     Float_t GetClusterX_Seed(int ip){ return seedx[ip]; };
     Float_t GetClusterY_Seed(int ip){ return seedy[ip]; };
-/*     Float_t GetClusterX_CoordinatePU(int ip); */
+/*     Float_t GetClusterX_oordinatePU(int ip); */
 /*     Float_t GetClusterY_CoordinatePU(int ip); */
     
     Float_t GetYav();
@@ -238,6 +253,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();
@@ -371,6 +389,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