--- DarthVader/ToFLevel2/inc/ToFLevel2.h	2009/11/20 11:05:21	1.23
+++ 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
@@ -90,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
     //
@@ -100,8 +100,6 @@
     ToFPMT* GetToFPMT(){return this;};
     void Clear(Option_t *t="");
 
-
-
     ClassDef(ToFPMT,2);
 };
 
@@ -114,29 +112,14 @@
 
  private:
     //
-
     ToFGeom  eGeom;  // ToF geometry
     //
-
     Float_t  adc_he;
-    
     TArrayF eDEDXpmt;  // 0-47  pmt dEdx
-    TArrayF eZpmt;     // 0-47  pmt charge
-    TArrayF eDEDXpad;  // 0-23  paddle dEdx
-    TArrayF eZpad;     // 0-23  paddle charge
-    TArrayF eDEDXlayer;  // 0-5 layer dEdx
-    TArrayF eZlayer;     // 0-5 layer charge
-    TArrayF eDEDXplane;  // 0-2 plane dEdx
-    TArrayF eZplane;     // 0-2 plane charge
-
-    TArrayF INFOpmt;  // 0-47 pmt status
-    TArrayF INFOlayer;  //0-5 layer status
-     
     // parameters:
     TArrayF PMTsat;  // 0-47  saturation parameters
-
-    TArrayF TDx[48];  // 200 x 48  define an array of 200 elements per each pmt
-    TArrayF TDy[48];
+    Float_t adc[48];
+    //
 
     TArrayF parAtt[48];      // 48 x 6
     TArrayF parPos[48];      // 48 x 4
@@ -168,9 +151,9 @@
     void Clear(Option_t *option="");
     void Delete(Option_t *option="") { Clear(); }
 
-    //    void InitPar(const char *pardir);  // init parameters
+    void Init(pamela::tof::TofEvent *tofl0 );  // init parameters
+    void Init(Int_t i, Int_t j, Float_t adce);
     void Define_PMTsat();
-    //void ReadParTD( Int_t ipmt, const char *fname  );
 
     void ReadParAtt(            const char *fname  );
     void ReadParPos(            const char *fname  );
@@ -180,33 +163,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, pamela::tof::TofEvent *tofl0 ); //
+    void Process( UInt_t atime, Float_t betamean, Float_t *xtr_tof, Float_t *ytr_tof); //
     void Print(Option_t *option="");
-    void PrintTD();
-
 
     Float_t GetdEdx_pmt(Int_t ipmt) { return eDEDXpmt[ipmt]; }  // 0-47 dEdx for each PMT for tracked events
-    Float_t GetCharge_pmt(Int_t ipmt) {return eZpmt[ipmt];}  // 0-47 Z for each PMT for tracked events
-    Float_t GetdEdx_pad(Int_t ipad) {return eDEDXpad[ipad];}  // 0-23 dEdx for each paddle for tracked events (no request of consistency between PMT's response when both on!)
-    Float_t GetCharge_pad(Int_t ipad) {return  eZpad[ipad];}  // 0-23 Z for each paddle for tracked events (no request of consistency)
-    Float_t GetdEdx_layer(Int_t ilay) {return eDEDXlayer[ilay];}  // 0-5 dEdx for each layer for tracked events
-    Float_t GetCharge_layer(Int_t ilay) {return eZlayer[ilay];}  // 0-5 Z for each layer for tracked events
-    Float_t GetdEdx_plane(Int_t ipl) {return eDEDXplane[ipl];}  // 0-2 dEdx for each plane for tracked events
-    Float_t GetCharge_plane(Int_t ipl) {return eZplane[ipl];}  // 0-2 Z for each plane for tracked events N.B.: here there is a soft request of consistency between the two layers...to be discussed!!
-    
-    Float_t GetInfo_pmt(Int_t ipmt) {return INFOpmt[ipmt];} // 0-47 pmt status
-    Float_t GetInfo_layer(Int_t ilay) {return INFOlayer[ilay];}  // 0-5 layer status
-
-
-
-    //
+    //    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,1);
+    ClassDef(ToFdEdx,2);
 };