--- DarthVader/TrackerLevel2/inc/TrkParams.h	2008/03/22 08:32:49	1.14
+++ DarthVader/TrackerLevel2/inc/TrkParams.h	2011/11/29 13:24:15	1.17
@@ -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 );
@@ -126,9 +128,11 @@
     // ---------------------------------------------
     static Bool_t Set( GL_RUN* glrun, TSQLServer* dbc, UInt_t type);
     static Bool_t Set( GL_RUN* glrun, TSQLServer* dbc){ 
-	for(Int_t i=0; i<NTYPES; i++) 
-	    if( !TrkParams::Set(glrun,dbc,trkparamtype[i]) )return false; 
-	return true; 
+      Bool_t result = true;
+	  for(Int_t i=0; i<NTYPES; i++)
+        if( !TrkParams::Set(glrun,dbc,trkparamtype[i]) )
+        	result = false;
+	  return result;
     };
     static Bool_t Set( TString, UInt_t );
     static Bool_t Set( UInt_t );
@@ -138,6 +142,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
     // ---------------------------------------------
@@ -156,6 +162,8 @@
     static float  GetPFA_ETAlandi(int nv,int nl,float ang)
 	{ return TrkParams::GetPFA_ETAlandi(nv,nl,TrkParams::GetPFA_AngleBin(ang)); };
 
+
+
     // ---------------------------------------------
     // debug mode 
     // ---------------------------------------------