--- DarthVader/TrackerLevel2/inc/TrkParams.h	2007/08/20 16:07:14	1.7
+++ DarthVader/TrackerLevel2/inc/TrkParams.h	2008/04/11 13:44:36	1.15
@@ -9,12 +9,14 @@
 #include <TString.h>
 #include <TSQLServer.h>
 #include <TSystem.h>
+#include <TROOT.h> // EMILIANO: needed to compile with ROOT > 5.16/x
 
 #include <GLTables.h>
 #include <TrkStruct.h>
 #include <TrkCalib.h>
 
 #define NTYPES 10
+#define NGF 14
 
 /**
  * \brief Class to store tracker parameter information
@@ -87,9 +89,25 @@
     static int init__mini_istepmin;
     static double init__mini_fact;
     static cDbg init__dbg_mode; //debug mode (for both c++ and F77 roiutines)
-    
+    static float init__pfa_e234ax[6]; // angle intervals for eta2-3-4
+    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)
     // ---------------------------------------------
@@ -127,6 +145,18 @@
     static float GetBY(float*);
     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 
@@ -148,13 +178,33 @@
     static void SetTrackingMode()   {track_.trackmode = init__mini_trackmode;};
     static void SetPrecisionFactor(){track_.fact      = init__mini_fact;     };
     static void SetStepMin()        {track_.istepmin  = init__mini_istepmin; };
-    static void SetPFA()            {sw_.pfaid        = init__pfa;           };
+    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();
+    
     // set to custom values
     static void SetTrackingMode(int);
     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 *);
     
+    // ---------------------------------------------
+    // varie ed eventuali...
+    // ---------------------------------------------
+    static TSQLServer* SetDBConnection();
+
+
     ClassDef(TrkParams,2);
 
 };