--- DarthVader/TrackerLevel2/inc/TrkParams.h	2007/11/27 11:43:49	1.11
+++ DarthVader/TrackerLevel2/inc/TrkParams.h	2008/10/22 15:17:33	1.16
@@ -16,6 +16,7 @@
 #include <TrkCalib.h>
 
 #define NTYPES 10
+#define NGF 14
 
 /**
  * \brief Class to store tracker parameter information
@@ -73,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
     // ---------------------------------------------
@@ -92,10 +95,21 @@
     static float init__pfa_e234ay[6]; // angle intervals for eta2-3-4
     static double init__deltab_0; 
     static double init__deltab_1;
+    static double init__dlt;
+
+    // ------------------------------------------
+    // nominal z-coordinates to define acceptance
+    // ------------------------------------------
+    static int   nGF;
+    static float zGF[NGF];
+    static float xGF_min[NGF];
+    static float xGF_max[NGF];
+    static float yGF_min[NGF];
+    static float yGF_max[NGF];
+    static TString GF_element[NGF];
 
     TrkParams();
-    
-   
+       
     // ---------------------------------------------
     // calibration (PED-SIG-BAD)
     // ---------------------------------------------
@@ -103,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 );
@@ -126,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
     // ---------------------------------------------
@@ -134,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 
@@ -157,11 +184,13 @@
     static void SetStepMin()        {track_.istepmin  = init__mini_istepmin; };
     static void SetDeltaB()         {deltab_.delta0   = init__deltab_0;
                                      deltab_.delta1   = init__deltab_1;};    
+    static void SetDLT()            {deltab_.dlt   = init__dlt;};
     static void SetMiniDefault()    {
 	SetTrackingMode(); 
 	SetPrecisionFactor(); 
 	SetStepMin(); 
 	SetDeltaB(); 
+	SetDLT();
     }; //
     static void SetPFA();
     
@@ -170,6 +199,7 @@
     static void SetPrecisionFactor(double);
     static void SetStepMin(int);
     static void SetDeltaB(int,double);    
+    static void SetDLT(double);
     static void SetPFA(int);
     static void SetPFA(float *);