--- DarthVader/CalorimeterLevel2/inc/CaloLevel2.h	2006/05/19 13:15:49	1.1.1.1
+++ DarthVader/CalorimeterLevel2/inc/CaloLevel2.h	2006/07/21 10:56:22	1.5
@@ -9,6 +9,7 @@
 #include <TClonesArray.h>
 #include <TArrayF.h>
 //
+#include <CaloStruct.h>
 /**
  * \brief Calorimeter track-related variables class
  *
@@ -22,14 +23,14 @@
 
 public:
     //
-    Int_t trkseqno; ///< tracker entry coming from tracker, -1 if selftrigger event, 100 if image track is used, -100 if the track is not consistent with calorimeter one
+    Int_t trkseqno; ///< tracker entry coming from tracker, -1 if selftrigger event.
     //
     // track related variables
     //
     Int_t ncore;     ///< SUM(j=1,2)SUM(i=1,PLmax) Nhit(i,j)*i , where Nhit(i,j) is the number of hits in a cylinder of radius 2 Rm (Moliere radius) around the track in the i-th plane (where the top plane is number 1 and the sum runs up to plane number PLmax, closest to the calculated electromagnetic shower maximum of the j-th view)
     Int_t noint;      ///< SUM(j=1,2)SUM(i=1,22) TH(i,j)*i , where TH(i,j) = 1 if the i-th plane of the j-th view has a cluster along (less than 4 mm away) the track with a deposited energy typical of a proton (order of one MIP), otherwise TH(i,j) = 0
     Int_t ncyl;      ///< the number of strip hit in a cylinder of radius 8 strips around the shower axis
-    Int_t nlast;     ///< the same as "ncyl" but only for the last four planes.
+    Int_t nlast;     ///< the same as "ncyl" but only for the last four planes and radius 4 strips.
     Int_t npre;      ///< the same as "ncyl" but only for the first three planes
     Int_t npresh;    ///< the same as "ncyl" but with radius 2 strips and only in the first four planes
     Int_t ntr;       ///< the same as "ncyl" but with radius 4 strips
@@ -39,7 +40,7 @@
     Float_t tbar[22][2]; ///< position in cm as measured by the tracker
     Float_t qcore;   ///< SUM(j=1,2)SUM(i=1,PLmax) Qhit(i,j)*i , where Qhit(i,j) is the energy released (MIP) in a cylinder of radius 2 Rm (Moliere radius) around the track in the i-th plane (where the top plane is number 1 and the sum runs up to plane number PLmax, closest to the calculated electromagnetic shower maximum of the j-th view).
     Float_t qcyl;    ///< the measured energy deposited in a cylinder of radius 8 strips around the shower axis
-    Float_t qlast;   ///< the same as "qcyl" but only for the last four planes.
+    Float_t qlast;   ///< the same as "qcyl" but only for the last four planes and radius 4 strips.
     Float_t qpre;    ///< the same as "qcyl" but only for the first three planes
     Float_t qpresh;  ///< the same as "qcyl" but with radius 2 strips and only in the first four planes
     Float_t qtr;     ///< the same as "qcyl" but with radius 4 strips
@@ -50,7 +51,7 @@
     Float_t dytrack; ///< measured energy outside the clusters along the track in the y-view
     Float_t qmean;   ///< the energy truncated mean that is the average energy deposit for the five planes with the smaller energy deposit of the whole calorimeter
     Float_t qlow;    ///< the same as "qstrip" but below the calculated electromagnetic shower maximum
-    Float_t dX0l;    ///< traversed X0 lenght
+    Float_t dX0l;    ///< tranversed X0 lenght
     //
     CaloTrkVar(); ///< Constructor.
     /**
@@ -141,9 +142,9 @@
     Float_t dX0l(Int_t entry)                          {return (((CaloTrkVar *)CaloTrk->At(entry))->dX0l);}; ///< extract dX0l
     //
     // Number of strip with energy > emip and their value coded with view plane and strip number:
-    // view x(y) plane PP strip SS with energy mmmm.iip = +(-) ( PP*10^6 + SS*10^4 + mmmm.iip )
+    // view x[y] plane PP strip SS with energy mmmm.iip = +[-] ( PP*10^6 + SS*10^4 + mmmm.iip )
     //
-    TArrayF estrip; ///< MIP values for each strip with energy > emin 
+    TArrayF estrip; ///< MIP values for each strip with energy > emin coded with view plane and strip number; view x[y] plane PP strip SS with energy mmmm.iip = +[-] ( PP*10^6 + SS*10^4 + mmmm.iip )
     //
     // METHODS
     //
@@ -152,8 +153,12 @@
     Float_t DecodeEstrip(Int_t entry, Int_t &view, Int_t &plane, Int_t &strip); ///< returns saved MIP value for the entry number "entry" of the TArrayF.
     CaloTrkVar *GetCaloTrkVar(Int_t notrack);  ///< returns a pointer to the CaloTrkVar class containing track related variables
     //
+    TClonesArray *GetTrackArray(){return CaloTrk;};
     CaloLevel2* GetCaloLevel2(){return this;}; ///< returns pointer to this object
     //
+    void GetLevel2Struct(cCaloLevel2 *l2) const;
+    void Clear();
+    //
     // constructor
     //
     CaloLevel2();