--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2006/07/21 11:03:14	1.6
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/03/15 12:17:09	1.20
@@ -8,8 +8,12 @@
 #include <TObject.h>
 #include <TObjArray.h>
 #include <TClonesArray.h>
+#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
 #define ZINI 23.5   
@@ -52,12 +56,15 @@
     Trajectory();
     Trajectory(int n);
     Trajectory(int n, float* pz);
+    ~Trajectory(){Delete();};
     void Dump();
+    void Delete();
 
+    int DoTrack2(float* al);
     float GetLength(){float l=0; for(int i=0; i<npoint;i++)l=l+tl[i]; return l;};
     float GetLength(int,int);
 
-    ClassDef(Trajectory,1);
+    ClassDef(Trajectory,2);
 
 };
 /**
@@ -75,8 +82,11 @@
     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 coval[5][5];     ///<covariance matrix 
@@ -88,19 +98,26 @@
     float resx[6];         ///<spatial resolution on X view
     float resy[6];         ///<spatial resolution on y view
     float chi2;            ///<chi2
+    int   nstep;           ///<n. step
     float xv[6];           ///<calculated x coordinates
     float yv[6];           ///<calculated y coordinates
     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&);
 
+    ~TrkTrack(){ Delete(); };
+	
     void Dump();
+    void Clear();
+    void Clear(Option_t *option){Clear();};
+    void Delete();
+    void Copy(TrkTrack&);
+//    void Set();
 
     Int_t  GetSeqNo(){return seqno;}        ///< Returns the track sequential number
     Int_t  GetImageSeqNo(){return image;}   ///< Returns the track image sequential number
@@ -114,12 +131,37 @@
     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]);};
+    // 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;};
+    
+
+    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 FitReset();
+    void SetTrackingMode(int trackmode);
 
+    void FillMiniStruct(cMini2track&);
+    void SetFromMiniStruct(cMini2track*);
+    
+    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;};
 
     friend class TrkLevel2;
 
-    ClassDef(TrkTrack,1);
+    ClassDef(TrkTrack,2);
 
 };
 /**
@@ -130,8 +172,11 @@
 class TrkSinglet : public TObject {
 
 private:
+	
 
 public:
+	
+    TRef cls;
 
     int plane;       ///<plane 
     float coord[2];  ///<coordinate (on sensor 1 and 2)
@@ -139,12 +184,18 @@
 
     TrkSinglet();
     TrkSinglet(const TrkSinglet&);
+    ~TrkSinglet(){Delete();};
 
     void Dump();
+    void Clear();
+    void Clear(Option_t *option){Clear();};
+    void Delete(){Clear();};
+	
+    TrkCluster *GetCluster(){TrkCluster *pt = (TrkCluster*)cls.GetObject(); return pt;};
 
     friend class TrkLevel2;
 
-    ClassDef(TrkSinglet,1);
+    ClassDef(TrkSinglet,2);
 
 };
 
@@ -162,13 +213,10 @@
 class TrkLevel2 : public TObject {
 
  private:
-	
-//	TRefArray    *PhysicalTrack;  ///< physical tracks (no image) - 
-	 
+ 
  public:
 
-    Int_t good2;
-    Int_t crc[12];
+    Int_t         good[12];       ///< event status
 
     TClonesArray *Track;        ///< fitted tracks
     TClonesArray *SingletX;     ///< x singlets
@@ -176,16 +224,27 @@
 
     TrkLevel2();
 //    TrkLevel2(cTrkLevel2 *);
-
+    ~TrkLevel2(){Delete();};
+	
+    void Clear();
+    void Clear(Option_t *option){Clear();};
+    void Delete();
+    void Set();
+    
     int ntrk() {return Track->GetEntries();}    ///< number of stored track
     int nclsx(){return SingletX->GetEntries();} ///< number of x singlets 
     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 Clear();
     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;};
@@ -198,21 +257,21 @@
     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();
-
+//    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);
+    Int_t     GetNTracks();
+    TrkTrack* GetTrack(int i);
     TrkTrack* GetTrackImage(int i);
-
+    
     TrkLevel2*    GetTrkLevel2(){return this;}
     TClonesArray* GetTrackArray(){return Track;};///< returns pointer to the track array
     
-    ClassDef(TrkLevel2,1);
+    ClassDef(TrkLevel2,2);
 
 };
 
-
-
 #endif