--- DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/02/05 16:01:50	1.17
+++ DarthVader/TrackerLevel2/inc/TrkLevel2.h	2007/02/19 16:28:39	1.19
@@ -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
@@ -144,6 +145,7 @@
     void LoadField(TString s);
     void Fit(double pfixed, int& fail, int iprint);
     void FitReset();
+    void SetTrackingMode(int trackmode);
 
     void FillMiniStruct(cMini2track&);
     void SetFromMiniStruct(cMini2track*);
@@ -230,8 +232,10 @@
     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*);