--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/03/29 17:06:39	1.23
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/05/14 11:03:04	1.25
@@ -11,15 +11,11 @@
 #include <TRefArray.h>
 #include <TRef.h>
 
-//#include <TrkStruct.h>
 #include <TrkParams.h>
 #include <TrkLevel1.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
 // (mechanical) z-coordinate of the tracker planes
 #define ZTRK6 -22.23
 #define ZTRK5 -13.32
@@ -73,6 +69,14 @@
  * A track is defined by the measured coordinates associated to it, the 
  * track status vector, plus other quantities.
  * A track may have an "image", due to the ambiguity in the y view.
+ *
+ * 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
  */
 // ==================================================================
 class TrkTrack : public TObject {
@@ -81,23 +85,20 @@
 
     int   seqno;           ///<stored track sequential number
     int   image;           ///<sequential number of track-image
-
 	
 public:
 
-    TRefArray *clx;
-    TRefArray *cly;
-
-/*     float al[5];           ///<TRACK STATE VECTOR  */
     float al[5];           ///<TRACK STATE VECTOR 
     float coval[5][5];     ///<covariance matrix 
-    int   xgood[6];        ///<mask of included x planes 
-    int   ygood[6];        ///<mask of included y planes 
+    int   xgood[6];        ///<cluster flag for x-view (0 = view not included in the fit) 
+    int   ygood[6];        ///<cluster flag for y-view (0 = view not included in the fit) 
     float xm[6];           ///<measured x coordinates
     float ym[6];           ///<measured y coordinates 
     float zm[6];           ///<measured z coordinates 
     float resx[6];         ///<spatial resolution on X view
     float resy[6];         ///<spatial resolution on y view
+    float tailx[6];        ///<spatial resolution tail on X view
+    float taily[6];        ///<spatial resolution tail on y view
     float chi2;            ///<chi2
     int   nstep;           ///<n. step
     float xv[6];           ///<calculated x coordinates
@@ -105,8 +106,8 @@
     float zv[6];           ///<calculated z coordinates
     float axv[6];          ///<calculated angles (deg) on x view
     float ayv[6];          ///<calculated angles (deg) on y view
-    float dedx_x[6];       ///<dE/dx in MIP 
-    float dedx_y[6];       ///<dE/dx in MIP 
+    float dedx_x[6];       ///<dE/dx in MIP (<0 if saturated)
+    float dedx_y[6];       ///<dE/dx in MIP (<0 if saturated) 
 
     TrkTrack();
     TrkTrack(const TrkTrack&);
@@ -126,45 +127,59 @@
     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;};
+    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 GetNtot(){return GetNX()+GetNY();};
     Float_t GetRigidity();
     Float_t GetDeflection();
+    Bool_t IsSaturated(int,int);
+    Bool_t IsSaturated(int);
+    Bool_t IsSaturated();
+    Bool_t IsBad(int,int);
     Float_t GetDEDX();
-    Float_t GetDEDX(Int_t ip){if( !(XGood(ip)+YGood(ip)) ) return 0; return (dedx_x[ip]+dedx_y[ip])/(XGood(ip)+YGood(ip));};
-    // sono un'imbecille... assegno xm e ym anche quando si tratta di un singolo
-    // non posso quindi usare xm e ym per dire se una vista e` inclusa nel fit o no
-/*	Bool_t XGood(int ip){ return xm[ip] != -100.;};
-	Bool_t YGood(int ip){ return ym[ip] != -100.;};*/
-    Bool_t XGood(int ip){ return xgood[ip]> 0;};
-    Bool_t YGood(int ip){ return ygood[ip]> 0;};
-    
+    Float_t GetDEDX(int);
+    Float_t GetDEDX(int,int);
+    Int_t GetLeverArmX();
+    Int_t GetLeverArmY();
 
     void SetMeasure(double *xmeas, double *ymeas, double *zmeas);
     void SetResolution(double *rx, double *ry);
     void SetGood(int *xg, int *yg);
     void LoadField(TString s);
-    void Fit(double pfixed, int& fail, int iprint);
+    void Fit(double pfixed, int& fail, int iprint, int froml1);
+    void Fit(double pfixed, int& fail, int iprint){ Fit(pfixed,fail,iprint,0); };
     void FitReset();
     void SetTrackingMode(int trackmode);
     void SetPrecisionFactor(double fact);
     void SetStepMin(int istepmin);
 
+    void EvaluateClusterPositions();
+
     void FillMiniStruct(cMini2track&);
     void SetFromMiniStruct(cMini2track*);
     
-    TrkCluster *GetClusterX(int ip);
-    TrkCluster *GetClusterY(int ip);
+    Int_t GetClusterX_ID(int ip);
+    Int_t GetClusterY_ID(int ip);
+    Int_t GetLadder(int ip);
+    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 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);
+
+    Bool_t BadClusterX(int ip){ return IsBad(ip,0); };
+    Bool_t BadClusterY(int ip){ return IsBad(ip,1); };
+
+    Bool_t SaturatedClusterX(int ip){ return IsSaturated(ip,0); };
+    Bool_t SaturatedClusterY(int ip){ return IsSaturated(ip,1); };
 
-    Int_t GetClusterX_ID(int ip){return xgood[ip];};
-    Int_t GetClusterY_ID(int ip){return ygood[ip];};
-    
     TrkTrack* GetTrkTrack(){return this;};
 
     friend class TrkLevel2;
 
-    ClassDef(TrkTrack,2);
+    ClassDef(TrkTrack,3);
 
 };
 /**
@@ -179,11 +194,9 @@
 
 public:
 	
-    TRef cls;
-
     int plane;       ///<plane 
     float coord[2];  ///<coordinate (on sensor 1 and 2)
-    float sgnl;      ///<cluster signal in MIP 
+    float sgnl;      ///<cluster signal in MIP (<0 if saturated)
 
     TrkSinglet();
     TrkSinglet(const TrkSinglet&);
@@ -193,12 +206,12 @@
     void Clear();
     void Clear(Option_t *option){Clear();};
     void Delete(){Clear();};
+    Float_t GetSignal(){return fabs(sgnl);}
+    Bool_t IsSaturated(){return (sgnl<0); };
 	
-    TrkCluster *GetCluster(){TrkCluster *pt = (TrkCluster*)cls.GetObject(); return pt;};
-
     friend class TrkLevel2;
 
-    ClassDef(TrkSinglet,2);
+    ClassDef(TrkSinglet,3);
 
 };
 
@@ -220,6 +233,8 @@
  public:
 
     Int_t         good[12];       ///< event status
+    UInt_t        VKmask[12];     ///< Viking-chip mask
+    UInt_t        VKflag[12];     ///< Viking-chip flag
 
     TClonesArray *Track;        ///< fitted tracks
     TClonesArray *SingletX;     ///< x singlets
@@ -245,27 +260,28 @@
     void SetFromLevel2Struct()              { SetFromLevel2Struct(&level2event_);     };    
     void GetLevel2Struct(cTrkLevel2 *) const;
     void LoadField(TString);
-    float GetBX(float*);
-    float GetBY(float*);
-    float GetBZ(float*);
+    float GetBX(float* v){return TrkParams::GetBX(v);};///< Bx (kGauss)
+    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;};
     
+    Bool_t IsMaskedVK(int,int);
+    Bool_t GetVKMask(int,int);
+    Bool_t GetVKFlag(int,int);
+
     TrkSinglet   *GetSingletX(int);
     TrkSinglet   *GetSingletY(int);
     
     TrkTrack     *GetStoredTrack(int i);
     Int_t         GetSeqNo(Int_t i)  {return (((TrkTrack *)Track->At(i))->seqno);}; ///< Returns track sequential number
-//    TClonesArray *GetTracks_Chi2Sorted();
-//    TClonesArray *GetTracks_NFitSorted();
-//    TClonesArray *GetTracks();
+
     TRefArray *GetTracks_NFitSorted();
     TRefArray *GetTracks(){return this->GetTracks_NFitSorted();};
     
-//    int       GetNTracks(){return this->GetTracks()->GetEntries();}
     Int_t     GetNTracks();
     TrkTrack* GetTrack(int i);
     TrkTrack* GetTrackImage(int i);
@@ -273,7 +289,7 @@
     TrkLevel2*    GetTrkLevel2(){return this;}
     TClonesArray* GetTrackArray(){return Track;};///< returns pointer to the track array
     
-    ClassDef(TrkLevel2,2);
+    ClassDef(TrkLevel2,3);
 
 };