--- DarthVader/ToFLevel2/inc/ToFLevel2.h 2010/02/05 12:51:41 1.26 +++ DarthVader/ToFLevel2/inc/ToFLevel2.h 2011/12/20 14:16:35 1.29 @@ -35,7 +35,8 @@ #define toftrk toftrk_ extern "C" int toftrk(); #define rdtofcal rdtofcal_ -extern "C" int rdtofcal(char [], int *); +//extern "C" int rdtofcal(char [], int *); +extern "C" int rdtofcal(const char *, int *); // // class which contains track related variables @@ -115,7 +116,7 @@ ToFGeom eGeom; // ToF geometry // Float_t adc_he; - TArrayF eDEDXpmt; // 0-47 pmt dEdx + TArrayF *eDEDXpmt; // 0-47 pmt dEdx // parameters: TArrayF PMTsat; // 0-47 saturation parameters Float_t adc[48]; @@ -146,10 +147,10 @@ public: ToFdEdx(); // class constructor - ~ToFdEdx(){ Delete(); }; // class distructor + ~ToFdEdx(); // class distructor // void Clear(Option_t *option=""); - void Delete(Option_t *option="") { Clear(); } + void Delete(Option_t *option=""); void Init(pamela::tof::TofEvent *tofl0 ); // init parameters void Init(Int_t i, Int_t j, Float_t adce); @@ -163,14 +164,14 @@ void CheckConnectors(UInt_t atime, GL_PARAM *glparam, TSQLServer *dbc); - void Process( UInt_t atime, Float_t betamean, Float_t *xtr_tof, Float_t *ytr_tof); // + void Process( UInt_t atime, Float_t betamean, Float_t *xtr_tof, Float_t *ytr_tof, Int_t exitat=-1); // void Print(Option_t *option=""); - Float_t GetdEdx_pmt(Int_t ipmt) { return eDEDXpmt[ipmt]; } // 0-47 dEdx for each PMT for tracked events - // Float_t GetdEdx_pmt(Int_t ipmt) { return eDEDXpmt.At(ipmt); } // 0-47 dEdx for each PMT for tracked events + // Float_t GetdEdx_pmt(Int_t ipmt) { return (Float_t)eDEDXpmt[ipmt]; } // 0-47 dEdx for each PMT for tracked events + Float_t GetdEdx_pmt(Int_t ipmt) { return eDEDXpmt->At(ipmt); } // 0-47 dEdx for each PMT for tracked events // ToFdEdx* GetToFdEdx(){return this;}; - ClassDef(ToFdEdx,2); + ClassDef(ToFdEdx,3); };