--- DarthVader/ToFLevel2/inc/ToFLevel2.h 2010/02/05 12:51:41 1.26 +++ DarthVader/ToFLevel2/inc/ToFLevel2.h 2014/08/07 16:04:09 1.32 @@ -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 @@ -93,6 +94,8 @@ Float_t adc; ///At(ipmt); } // 0-47 dEdx for each PMT for tracked events // ToFdEdx* GetToFdEdx(){return this;}; - ClassDef(ToFdEdx,2); + ClassDef(ToFdEdx,3); }; @@ -255,10 +258,12 @@ TClonesArray *ToFTrk; /// bit 0 = discharging flag on at least one PMT (adc OR tdc), bit 1 = there is at least one PMT off (no tdc nor adc) which is included in the patterntrig, bit 2 = PMTs hit are not enough to match trigger configuration, bit 3 = pattern trig does not match trigger configuration Int_t default_calib; ///< one if the default calibration has been used to process the data, zero otherwise // Float_t GetdEdx(Int_t notrack, Int_t plane, Int_t adcfl); // gf Apr 07 + Float_t GetdEdx(ToFTrkVar *trk, Int_t plane, Int_t adcfl); // gf Apr 07 Float_t CalcBeta(Int_t notrack, Float_t resmax, Float_t qualitycut, Float_t chi2cut); // wm feb 08 @@ -284,8 +289,9 @@ // gf Apr 07 void GetdEdxPaddle(Int_t notrack, Int_t paddleid, Int_t adcfl, Float_t &PadEdx, Int_t &SatWarning); // gf Apr 07 + void GetdEdxPaddle(ToFTrkVar *trk, Int_t paddleid, Int_t adcfl, Float_t &PadEdx, Int_t &SatWarning); // gf Apr 07 TString GetPMTName(Int_t ind, Int_t &iplane, Int_t &ipaddle,Int_t &ipmt); - Int_t GetPaddleIdOfTrack(Float_t xtr, Float_t ytr, Int_t plane); // gf Apr 07 + Int_t GetPaddleIdOfTrack(Float_t xtr, Float_t ytr, Int_t plane); // gf Apr 07 //EMXX Int_t GetPaddleIdOfTrack(Float_t xtr, Float_t ytr, Int_t plane, Float_t margin); // wm jun 2008 void GetPMTPaddle(Int_t pmt_id, Int_t &plane, Int_t &paddle); // gf Apr 07 void GetPaddlePMT(Int_t paddle, Int_t &pmtleft, Int_t &pmtright); // gf Apr 07 @@ -297,7 +303,15 @@ // // Int_t Process(TrkLevel2 *trk, TrigLevel2 *trg, GL_RUN *run, OrbitalInfo *orb, Bool_t force); // Emiliano - + + // + // + bool bit(int decimal, char pos); + bool checkPMT(TString givenpmt); + bool checkPMTpatternPMThit(TrigLevel2 *trg, int &pmtpattern, int &pmtnosignal); + bool checkPMTpmttrig(TrigLevel2 *trg); + void printPMT(); + // // constructor // @@ -339,11 +353,12 @@ Int_t GetToFPlaneID(Int_t ip); Int_t GetToFPlaneIndex(Int_t plane_id); - Bool_t HitPaddle(Int_t ,Int_t); + Bool_t HitPaddle(Int_t ,Int_t); // EMXX Int_t GetNHitPaddles(Int_t plane); + Int_t GetTrueNHitPaddles(Int_t plane); void Clear(Option_t *t=""); // - ClassDef(ToFLevel2,4); + ClassDef(ToFLevel2,6); }; #endif