--- DarthVader/ToFLevel2/inc/ToFLevel2.h	2010/10/25 13:22:10	1.27
+++ DarthVader/ToFLevel2/inc/ToFLevel2.h	2014/09/16 08:05:40	1.33
@@ -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;      ///<raw ADC value for this PMT
     Float_t tdc;      ///<raw TDC value for this PMT
     Float_t tdc_tw;   ///<time-walk corrected TDC value for this PMT
+    Float_t l0flag_adc; ///< warning flags from unpacking
+    Float_t l0flag_tdc; ///< warning flags from unpacking
     //
     ToFPMT();
     ToFPMT(const ToFPMT&);
@@ -100,7 +103,7 @@
     ToFPMT* GetToFPMT(){return this;};
     void Clear(Option_t *t="");
 
-    ClassDef(ToFPMT,2);
+    ClassDef(ToFPMT,3);
 };
 
 /**
@@ -115,7 +118,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 +149,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);
@@ -166,8 +169,8 @@
     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,3);
@@ -255,10 +258,12 @@
   TClonesArray *ToFTrk; ///<track related variable class
   Int_t tof_j_flag[6];  ///<number of hitted paddle(s) for each ToF layer: flag = flag + 2**(paddlenumber-1)
   //
-  Int_t unpackError;///< zero if no error presente
+  Int_t unpackError;///< zero if no errors
+  Int_t unpackWarning;///< zero if no warnings | bitwise: ... 3 2 1 0 --> 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,18 @@
 
     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="");
+
+    //
+    TClonesArray *GetTrackArray(){return ToFTrk;} ///< returns a pointer to the track related variables array
+    TClonesArray** GetPointerToTrackArray(){return &ToFTrk;}///< returns pointer to pointer to the track array
+
+
     //
-    ClassDef(ToFLevel2,4);
+    ClassDef(ToFLevel2,6);
 };
 
 #endif