--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/01/16 10:03:49	1.16
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/03/29 17:06:39	1.23
@@ -11,7 +11,8 @@
 #include <TRefArray.h>
 #include <TRef.h>
 
-#include <TrkStruct.h>
+//#include <TrkStruct.h>
+#include <TrkParams.h>
 #include <TrkLevel1.h>
 
 // z-coordinate of track state-vector reference-plane
@@ -87,6 +88,7 @@
     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 
@@ -103,8 +105,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];       ///<signal in MIP (scaled to 300 micrometer)
-    float dedx_y[6];       ///<signal in MIP (scaled to 300 micrometer)
+    float dedx_x[6];       ///<dE/dx in MIP 
+    float dedx_y[6];       ///<dE/dx in MIP 
 
     TrkTrack();
     TrkTrack(const TrkTrack&);
@@ -124,19 +126,20 @@
     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+=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 GetNtot(){return GetNX()+GetNY();};
     Float_t GetRigidity();
     Float_t GetDeflection();
     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]);};
+    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]==1;};
-    Bool_t YGood(int ip){ return ygood[ip]==1;};
+    Bool_t XGood(int ip){ return xgood[ip]> 0;};
+    Bool_t YGood(int ip){ return ygood[ip]> 0;};
+    
 
     void SetMeasure(double *xmeas, double *ymeas, double *zmeas);
     void SetResolution(double *rx, double *ry);
@@ -144,12 +147,18 @@
     void LoadField(TString s);
     void Fit(double pfixed, int& fail, int iprint);
     void FitReset();
+    void SetTrackingMode(int trackmode);
+    void SetPrecisionFactor(double fact);
+    void SetStepMin(int istepmin);
 
     void FillMiniStruct(cMini2track&);
     void SetFromMiniStruct(cMini2track*);
     
-    TrkCluster *GetClusterX(int ip){TrkCluster *pt = (TrkCluster*)(clx->At(ip)); return pt;};
-    TrkCluster *GetClusterY(int ip){TrkCluster *pt = (TrkCluster*)(cly->At(ip)); return pt;};
+    TrkCluster *GetClusterX(int ip);
+    TrkCluster *GetClusterY(int ip);
+
+    Int_t GetClusterX_ID(int ip){return xgood[ip];};
+    Int_t GetClusterY_ID(int ip){return ygood[ip];};
     
     TrkTrack* GetTrkTrack(){return this;};
 
@@ -230,10 +239,15 @@
     int nclsy(){return SingletY->GetEntries();} ///< number of y singlets 
 
     void Dump();
-    void SetFromLevel2Struct(cTrkLevel2 *);
     void SetFromLevel2Struct(cTrkLevel2 *, TrkLevel1 *);
+    void SetFromLevel2Struct(cTrkLevel2 *s2){ SetFromLevel2Struct(s2, NULL);          };
+    void SetFromLevel2Struct(TrkLevel1 *l1) { SetFromLevel2Struct(&level2event_, l1); };    
+    void SetFromLevel2Struct()              { SetFromLevel2Struct(&level2event_);     };    
     void GetLevel2Struct(cTrkLevel2 *) const;
     void LoadField(TString);
+    float GetBX(float*);
+    float GetBY(float*);
+    float GetBZ(float*);
     Float_t GetZTrk(Int_t);
     Float_t GetXTrkLeft(){return XTRKL;};
     Float_t GetXTrkRight(){return XTRKR;};