--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2006/11/14 16:20:53	1.13
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/02/16 14:56:00	1.18
@@ -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
@@ -55,7 +56,9 @@
     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;};
@@ -82,8 +85,6 @@
 	
 public:
 
-//	TRef clx[6];
-//	TRef cly[6];
     TRefArray *clx;
     TRefArray *cly;
 
@@ -106,16 +107,18 @@
     float dedx_x[6];       ///<signal in MIP (scaled to 300 micrometer)
     float dedx_y[6];       ///<signal in MIP (scaled to 300 micrometer)
 
-
     TrkTrack();
     TrkTrack(const TrkTrack&);
 
-    ~TrkTrack(){Delete();};
+    ~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
     Bool_t HasImage(){return !(image==-1);} ///< Returns true if the track has an image
@@ -142,6 +145,9 @@
     void LoadField(TString s);
     void Fit(double pfixed, int& fail, int iprint);
     void FitReset();
+
+    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;};
@@ -165,7 +171,7 @@
 
 public:
 	
-	TRef cls;
+    TRef cls;
 
     int plane;       ///<plane 
     float coord[2];  ///<coordinate (on sensor 1 and 2)
@@ -173,8 +179,12 @@
 
     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;};
 
@@ -198,14 +208,10 @@
 class TrkLevel2 : public TObject {
 
  private:
-	
-//	TRefArray    *PhysicalTrack;  ///< physical tracks (no image) - 
-	 
+ 
  public:
 
-	Int_t         good[12];       ///< event status
-//	Int_t good2;
-//    Int_t crc[12];
+    Int_t         good[12];       ///< event status
 
     TClonesArray *Track;        ///< fitted tracks
     TClonesArray *SingletX;     ///< x singlets
@@ -216,17 +222,24 @@
     ~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 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;};