--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2006/07/21 11:03:14	1.6
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2006/10/11 06:53:01	1.10
@@ -8,8 +8,11 @@
 #include <TObject.h>
 #include <TObjArray.h>
 #include <TClonesArray.h>
+#include <TRefArray.h>
+#include <TRef.h>
 
 #include <TrkStruct.h>
+#include <TrkLevel1.h>
 
 // z-coordinate of track state-vector reference-plane
 #define ZINI 23.5   
@@ -57,7 +60,7 @@
     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 +78,13 @@
     int   seqno;           ///<stored track sequential number
     int   image;           ///<sequential number of track-image
 
+	
 public:
 
+//	TRef clx[6];
+//	TRef cly[6];
+	TRefArray *clx;
+	TRefArray *cly;
 
     float al[5];           ///<TRACK STATE VECTOR 
     float coval[5][5];     ///<covariance matrix 
@@ -88,7 +96,8 @@
     float resx[6];         ///<spatial resolution on X view
     float resy[6];         ///<spatial resolution on y view
     float chi2;            ///<chi2
-    float xv[6];           ///<calculated x coordinates
+	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
@@ -100,8 +109,12 @@
     TrkTrack();
     TrkTrack(const TrkTrack&);
 
+	~TrkTrack(){Delete();};
+	
     void Dump();
-
+	void Clear();
+	void Delete();
+	
     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
@@ -114,12 +127,22 @@
     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]==1;};
+	Bool_t YGood(int ip){ return ygood[ip]==1;};
+	
+	TrkCluster *GetClusterX(int ip){TrkCluster *pt = (TrkCluster*)(clx->At(ip)); return pt;};
+	TrkCluster *GetClusterY(int ip){TrkCluster *pt = (TrkCluster*)(cly->At(ip)); return pt;};
+	
     TrkTrack* GetTrkTrack(){return this;};
 
     friend class TrkLevel2;
 
-    ClassDef(TrkTrack,1);
+    ClassDef(TrkTrack,2);
 
 };
 /**
@@ -130,8 +153,11 @@
 class TrkSinglet : public TObject {
 
 private:
+	
 
 public:
+	
+	TRef cls;
 
     int plane;       ///<plane 
     float coord[2];  ///<coordinate (on sensor 1 and 2)
@@ -141,10 +167,12 @@
     TrkSinglet(const TrkSinglet&);
 
     void Dump();
+	
+	TrkCluster *GetCluster(){TrkCluster *pt = (TrkCluster*)cls.GetObject(); return pt;};
 
     friend class TrkLevel2;
 
-    ClassDef(TrkSinglet,1);
+    ClassDef(TrkSinglet,2);
 
 };
 
@@ -167,8 +195,9 @@
 	 
  public:
 
-    Int_t good2;
-    Int_t crc[12];
+	Int_t         good[12];       ///< event status
+//	Int_t good2;
+//    Int_t crc[12];
 
     TClonesArray *Track;        ///< fitted tracks
     TClonesArray *SingletX;     ///< x singlets
@@ -176,15 +205,19 @@
 
     TrkLevel2();
 //    TrkLevel2(cTrkLevel2 *);
-
-    int ntrk() {return Track->GetEntries();}    ///< number of stored track
+	~TrkLevel2(){Delete();};
+	
+	void Clear();
+	void Delete();
+	
+	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 GetLevel2Struct(cTrkLevel2 *) const;
-    void Clear();
+	void SetFromLevel2Struct(cTrkLevel2 *, TrkLevel1 *);
+	void GetLevel2Struct(cTrkLevel2 *) const;
     void LoadField(TString);
     Float_t GetZTrk(Int_t);
     Float_t GetXTrkLeft(){return XTRKL;};
@@ -198,8 +231,10 @@
     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();
@@ -209,10 +244,8 @@
     TrkLevel2*    GetTrkLevel2(){return this;}
     TClonesArray* GetTrackArray(){return Track;};///< returns pointer to the track array
     
-    ClassDef(TrkLevel2,1);
+    ClassDef(TrkLevel2,2);
 
 };
 
-
-
 #endif