--- DarthVader/TrackerLevel2/inc/TrkParams.h 2008/04/11 13:44:36 1.15 +++ 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 // ---------------------------------------------