--- DarthVader/ToFLevel2/inc/ToFLevel2.h	2008/04/18 18:55:51	1.21
+++ DarthVader/ToFLevel2/inc/ToFLevel2.h	2010/02/05 12:51:41	1.26
@@ -1,6 +1,6 @@
 /**
  * \file ToFLevel2.h
- * \author Gianfranca DeRosa / Wolfgang Menn
+ * \author Gianfranca DeRosa / Wolfgang Menn / Rita Carbone with E. M. supervision
  */
 
 #ifndef ToFLevel2_h
@@ -25,6 +25,8 @@
 #include <GLTables.h> // Emiliano
 #include <OrbitalInfo.h> // Emiliano
 #include <ToFCore.h> // Emiliano
+#include <physics/tof/TofEvent.h>
+
 //
 // Declaration of the core fortran routines
 //
@@ -46,6 +48,35 @@
 #define ZTOF32 -24.34
 
 
+class ToFGeom : public TObject {
+
+private:
+  TArrayI  ePlane, eXY;
+
+public:
+  ToFGeom() {
+    int plane[24] = { 
+      0, 0, 0, 0, 0, 0, 0, 0,
+      1, 1, 1, 1, 1, 1, 
+      2, 2,             
+      3, 3,             
+      4, 4, 4,
+      5, 5, 5
+    };
+    int plXY[6]= {  2,  1,  1,  2,  2,  1 }; // X==1, Y==2 */
+    ePlane.Set(24,plane);
+    eXY.Set(6,plXY);
+  }
+
+  int GetPad(   int idpmt)  { return (int)((idpmt+0.5)/2.); }
+  int GetPlane( int idpmt)  { return ePlane[ GetPad(idpmt) ];  }
+  int GetXY(    int idpmt)  { return eXY[ GetPlane(idpmt) ]; }
+
+   ClassDef(ToFGeom,1);
+
+};
+
+
 /**
  * \brief  Class which contains the PMT data
  *
@@ -59,7 +90,7 @@
 
  public:
     Int_t pmt_id;     ///<the identification number of the PMT from 0 to 47
-    Float_t adc;      ///<raw ADC value for this PMT 
+    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
     //
@@ -69,9 +100,77 @@
     ToFPMT* GetToFPMT(){return this;};
     void Clear(Option_t *t="");
 
+    ClassDef(ToFPMT,2);
+};
+
+/**
+ * \brief  Class used to calibrate adc to dEdx for each PMT
+ *
+ * Class used to calibrate adc to dEdx for each PMT
+ */
+class ToFdEdx : public TObject {
+
+ private:
+    //
+    ToFGeom  eGeom;  // ToF geometry
+    //
+    Float_t  adc_he;
+    TArrayF eDEDXpmt;  // 0-47  pmt dEdx
+    // parameters:
+    TArrayF PMTsat;  // 0-47  saturation parameters
+    Float_t adc[48];
+    //
 
+    TArrayF parAtt[48];      // 48 x 6
+    TArrayF parPos[48];      // 48 x 4
+    TArrayF parDesatBB[48];  // 48 x 3
+    TArrayF parBBneg[48];    // 48 x 3
+    TArrayF  parBBpos;    // 48 x 1
+ 
+    double f_adcPC( float x );
+    double f_BB( TArrayF &p, float x );
+    double f_BB5B( float x );
+    double f_att( TArrayF &p, float x ) ;
+    double f_att5B( float x );
+    double f_desatBB( TArrayF &p, float x );  
+    double f_desatBB5B( float x );
+    double f_pos( TArrayF &p, float x );
+    double f_pos5B( float x );
+    float Get_adc_he( int id, float pl_x[6], float pl_y[6]);
+
+    Bool_t conn[12]; 
+
+    UInt_t ts[12];
+    UInt_t te[12];    
+   
+    
+ public:
+    ToFdEdx();   // class constructor
+    ~ToFdEdx(){ Delete(); };  // class distructor
+    //
+    void Clear(Option_t *option="");
+    void Delete(Option_t *option="") { Clear(); }
 
-    ClassDef(ToFPMT,2);
+    void Init(pamela::tof::TofEvent *tofl0 );  // init parameters
+    void Init(Int_t i, Int_t j, Float_t adce);
+    void Define_PMTsat();
+
+    void ReadParAtt(            const char *fname  );
+    void ReadParPos(            const char *fname  );
+    void ReadParBBneg(          const char *fname  );
+    void ReadParBBpos(          const char *fname  );
+    void ReadParDesatBB(        const char *fname  );
+
+    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 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
+    //
+    ToFdEdx* GetToFdEdx(){return this;};
+    ClassDef(ToFdEdx,2);
 };
 
 
@@ -187,6 +286,7 @@
   void GetdEdxPaddle(Int_t notrack, 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, 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
   void GetPaddleGeometry(Int_t plane, Int_t paddle, Float_t &xleft, Float_t &xright, Float_t &yleft, Float_t &yright); // gf Apr 07