--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2008/01/22 08:55:06	1.34
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2009/03/11 14:19:09	1.42
@@ -30,6 +30,14 @@
 #define XMAGNLOW -8.07 
 #define YMAGNHIGH 6.57 
 #define YMAGNLOW -6.57 
+// tof planes 
+#define ZS11  53.74
+#define ZS12  53.04
+#define ZS21  23.94
+#define ZS22  23.44
+#define ZS31 -23.49
+#define ZS32 -24.34
+
 // (mechanical) x/y-coordinates of magnet cavity
 /* #define XTRKL -8.1 */
 /* #define XTRKR  8.1 */
@@ -49,12 +57,12 @@
  public:
 
     int npoint; ///< number of evaluated points along the trajectory
-    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
+    float* x;   //[npoint]
+    float* y;   //[npoint]
+    float* z;   //[npoint]
+    float* thx; //[npoint]
+    float* thy; //[npoint]
+    float* tl;  //[npoint]
 
     Trajectory();
     Trajectory(int n);
@@ -63,11 +71,16 @@
     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);
 
-    ClassDef(Trajectory,2);
+    ClassDef(Trajectory,3);
 
 };
 /**
@@ -80,10 +93,11 @@
  * Cluster flags: xgood[6], ygood[6]
  * 
  * xgood/ygood = +/- 0lsccccccc
- *                |   |||------- ID (1-7483647) of the included cluster  
- *                |   ||-------- sensor number (1,2   - increasing y)
- *                |   |--------- ladder number (1,2,3 - increasing x)
- *                |------------- does-not/does include bad strips
+ * ccccccc ID (1-7483647) of the included cluster  
+ * s       sensor number (1,2   - increasing y)
+ * l       ladder number (1,2,3 - increasing x)
+ * +/-     does-not/does include bad strips
+ *
  */
 // ==================================================================
 class TrkTrack : public TObject {
@@ -122,6 +136,9 @@
     float xpu[6];          ///< x coordinate in pitch units
     float ypu[6];          ///< y coordinate in pitch units
 
+    float xGF[14];         ///<calculated x coordinates on GF reference planes
+    float yGF[14];         ///<calculated y coordinates on GF reference planes
+
     TrkTrack();
     TrkTrack(const TrkTrack&);
 
@@ -137,11 +154,12 @@
     Int_t  GetSeqNo(){return seqno;}        ///< Returns the track sequential number
     Int_t  GetImageSeqNo(){return image;}   ///< Returns the track image sequential number
     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.
+    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+=(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();
@@ -152,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();
@@ -175,7 +194,12 @@
     void SetStepMin(int istepmin);
     void SetDeltaB(int id, double db);
 
-    Bool_t IsInsideCavity();
+    Bool_t IsInsideCavity(float);
+    Bool_t IsInsideCavity(){ return IsInsideCavity(0.); };
+    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();
 
@@ -190,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); };
@@ -205,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();
@@ -224,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();
@@ -237,7 +269,7 @@
 
     friend class TrkLevel2;
 
-    ClassDef(TrkTrack,4);
+    ClassDef(TrkTrack,5);
 
 };
 /**
@@ -255,6 +287,7 @@
     int plane;       ///<plane 
     float coord[2];  ///<coordinate (on sensor 1 and 2)
     float sgnl;      ///<cluster signal in MIP (<0 if saturated)
+    int multmax;     ///<cluster multiplicity and strip of maximum
 
     TrkSinglet();
     TrkSinglet(const TrkSinglet&);
@@ -266,10 +299,15 @@
     void Delete(){Clear();};
     Float_t GetSignal(){return fabs(sgnl);}
     Bool_t IsSaturated(){return (sgnl<0); };
-	
+
+    Bool_t IsBad()                 { return multmax<=0; };
+    Int_t GetCluster_Multiplicity(){ return (Int_t)(abs(multmax)/10000); };
+    Int_t GetCluster_MaxStrip()    { return (Int_t)(abs(multmax)%10000); };
+
+
     friend class TrkLevel2;
 
-    ClassDef(TrkSinglet,3);
+    ClassDef(TrkSinglet,4);
 
 };
 
@@ -287,24 +325,23 @@
  * The event status indicates the processing status of data from each DSP, according to the following
  * notation:
  *
- *     xxxx xxxx xxxx xxxx xxxx xxxx 
- *     |||| |||| |||| |||| |||| ||||_ 0 missing packet
- *     |||| |||| |||| |||| |||| |||__ 1 CRC error
- *     |||| |||| |||| |||| |||| ||___ 2 on-line software alarm (latch-up, timeout ecc...)
- *     |||| |||| |||| |||| |||| |____ 3 jump in the trigger counter
- *     |||| |||| |||| |||| ||||______ 4 decode error
- *     |||| |||| |||| |||| |||_______ 5 n.clusters > maximum number (level1 processing)
- *     |||| |||| |||| |||| ||________ 6 
- *     |||| |||| |||| |||| |_________ 7 
- *     |||| |||| |||| ||||___________ 8 n.clusters > maximum value (level2 processing)
- *     |||| |||| |||| |||____________ 9 n.couples per plane > maximum values (vector dimention)
- *     |||| |||| |||| ||_____________ 10 n.doublets > maximum values
- *     |||| |||| |||| |______________ 11 n.triplets > maximum values
- *     |||| |||| ||||________________ 12 n.yz-clouds > maximum values
- *     |||| |||| |||_________________ 13 n.xz-clouds > maximum values 
- *     |||| |||| ||__________________ 14 n.candidate-tracks > maximum values
- *     |||| |||| |___________________ 15 n.couples per plane > maximum values (for Hough transform)
- *     |||| ||||_____________________ 16 
+ * LSB --> 0 missing packet
+ *         1 CRC error
+ *         2 on-line software alarm (latch-up, timeout ecc...)
+ *         3 jump in the trigger counter
+ *         4 decode error
+ *         5 n.clusters > maximum number (level1 processing)
+ *         6 
+ *         7 
+ *         8 n.clusters > maximum value (level2 processing)
+ *         9 n.couples per plane > maximum values (vector dimention)
+ *         10 n.doublets > maximum values
+ *         11 n.triplets > maximum values
+ *         12 n.yz-clouds > maximum values
+ *         13 n.xz-clouds > maximum values 
+ *         14 n.candidate-tracks > maximum values
+ *         15 n.couples per plane > maximum values (for Hough transform)
+ * MSB --> 16 
  *         
  *
  * For all data processed before June 2007 the event status was coded according to
@@ -352,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