--- DarthVader/TrackerLevel2/inc/TrkParams.h	2008/03/05 17:00:18	1.13
+++ DarthVader/TrackerLevel2/inc/TrkParams.h	2008/10/22 15:17:33	1.16
@@ -74,6 +74,8 @@
     static TString      calibpathf; //full
     static Bool_t       calib104;
     static Bool_t       calibload;
+    static TrkCalib*    calib1;
+    static TrkCalib*    calib2;
     // ---------------------------------------------
     // variables to store loaded-parameters info
     // ---------------------------------------------
@@ -115,8 +117,8 @@
     static Bool_t LoadCalib( );
     static Bool_t CalibIsLoaded(){ return calibload; };
     static UInt_t ValidateTrkCalib( CalibTrk1Event* );
-    static void FillFCalibFrom(TFile* , Int_t , Int_t );//full
-    static void FillTCalibFrom(TFile* , Int_t , Int_t );//truncated
+//    static void FillFCalibFrom(TFile* , Int_t , Int_t );//full
+//    static void FillTCalibFrom(TFile* , Int_t , Int_t );//truncated
     static void FillTCalibFrom(TString path);
     static void FillACalibFrom(TFile* , Int_t , Int_t );//all
     static void FillMask(TFile* , Int_t , Int_t );
@@ -138,6 +140,8 @@
     static Bool_t IsLoaded( UInt_t type ){return glload[TrkParams::GetIndex(type)];};
     static Bool_t IsLoaded( );
 
+    static GL_PARAM GetParams( UInt_t type ){ return gl[TrkParams::GetIndex(type)]; }; 
+
     // ---------------------------------------------
     // retrieve parameters
     // ---------------------------------------------
@@ -146,6 +150,17 @@
     static float GetBZ(float*);
     static float GetResolution(int,float);
     static int   GetPFA(){return sw_.pfaid;};
+    static int GetPFA_NbinsAngle();
+    static int GetPFA_NbinsETA();
+    static int GetPFA_NbinsCharge(){return 0;};
+    static int GetPFA_AngleBin(float);
+    static float* GetPFA_ETAcorr(TString,int,int,int);
+    static float* GetPFA_ETAabs(TString,int);
+    static float  GetPFA_ETAlandi(int,int,int);
+    static float  GetPFA_ETAlandi(int nv,int nl,float ang)
+	{ return TrkParams::GetPFA_ETAlandi(nv,nl,TrkParams::GetPFA_AngleBin(ang)); };
+
+
 
     // ---------------------------------------------
     // debug mode