Corrected protection

[u/mrichter/AliRoot.git] / TOF / AliTOFcluster.cxx

diff --git a/TOF/AliTOFcluster.cxx b/TOF/AliTOFcluster.cxx
index 66d26be6f3b8577f6aaa8fc5dbd2d2e8b6d93690..f2ff14182451c748105cb3c3011067c6d0b0404e 100644 (file)
--- a/TOF/AliTOFcluster.cxx
+++ b/TOF/AliTOFcluster.cxx
@@ -23,94 +23,101 @@ Revision 0.01 2005/07/25 A. De Caro
         (originally implemented by S. Arcelli and C. Zampolli)
 */
 
-// AliTOFcluster Class
-// Description: class for TOF cluster definition
+////////////////////////////////////////////////////////
+//                                                    //
+//    AliTOFcluster Class                             //
+//    Description: class for TOF cluster definition   //
+//                                                    //
+////////////////////////////////////////////////////////
 
 #include "AliTOFcluster.h"
+//#include "AliLog.h"
+//#include "AliGeomManager.h"
+//#include "TGeoMatrix.h"
 
 ClassImp(AliTOFcluster)
 
-AliTOFcluster::AliTOFcluster() {
+AliTOFcluster::AliTOFcluster():
+  AliCluster3D(),
+  fIdx(-1),
+  fQuality(-100), 
+  fR(0),
+  fPhi(0),
+  fTDC(0),
+  fToT(0),
+  fADC(0),
+  fTdcND(0),
+  fTdcRAW(0),
+  fStatus(kTRUE) 
+ {
   //
   // default ctor
   //
 
   Int_t ii;
-  fR   = 0.;
-  fPhi = 0.;
-  fZ   = 0.;
-  fTDC = 0.;
-  fADC = 0.;
-  for (ii=0; ii<3; ii++) fLab[ii]      = -1;
-  fIdx = -1;
   for (ii=0; ii<5; ii++) fdetIndex[ii] = -1;
-
 }
 //-------------------------------------------------------------------------
 
-AliTOFcluster::AliTOFcluster(Double_t *h, Int_t *l, Int_t *ind, Int_t idx)
-:TObject() {
+AliTOFcluster::AliTOFcluster(UShort_t volId, 
+   Float_t x,   Float_t y,   Float_t z,
+   Float_t sx2, Float_t sxy, Float_t sxz,
+                Float_t sy2, Float_t syz,
+                             Float_t sz2, Int_t *lab, Int_t *ind, Int_t *par, Bool_t status, Int_t idx):
+  AliCluster3D(volId,x,y,z,sx2,sxy,sxz,sy2,syz,sz2,lab),
+  fIdx(idx),
+  fQuality(-100), 
+  fR(0),
+  fPhi(0),
+  fTDC(par[0]),
+  fToT(par[1]),
+  fADC(par[2]),
+  fTdcND(par[3]),
+  fTdcRAW(par[4]),
+  fStatus(status) 
+ {
   //
   // constructor
   //
-
-  Int_t ii;
-  fR   = h[0];
-  fPhi = h[1];
-  fZ   = h[2];
-  fTDC = h[3];
-  fADC = h[4];
-  for (ii=0; ii<3; ii++) fLab[ii]      = l[ii];
-  fIdx = idx;
-  for (ii=0; ii<5; ii++) fdetIndex[ii] = ind[ii];
+   Int_t ii;
+   for (ii=0; ii<5; ii++) fdetIndex[ii] = ind[ii];
+   
+   Float_t xyz[3];
+   GetGlobalXYZ(xyz);
+   fR   = TMath::Sqrt(xyz[0]*xyz[0] + xyz[1]*xyz[1]);   
+   fPhi = TMath::ATan2(xyz[1], xyz[0]);
 
 }
 //-------------------------------------------------------------------------
 
-AliTOFcluster::AliTOFcluster(Double_t *h, Int_t *ind)
-:TObject() {
-  //
-  // constructor
-  //
-
-  Int_t ii;
-  fR   = h[0];
-  fPhi = h[1];
-  fZ   = h[2];
-  fTDC = h[3];
-  fADC = h[4];
-  for (ii=0; ii<3; ii++) fLab[ii]      = -1;
-  fIdx = -1;
-  for (ii=0; ii<5; ii++) fdetIndex[ii] = ind[ii];
-
-}
-//-------------------------------------------------------------------------
-
-AliTOFcluster::AliTOFcluster(const AliTOFcluster & cluster)
-:TObject() {
+AliTOFcluster::AliTOFcluster(const AliTOFcluster & cluster):
+  AliCluster3D(cluster),
+  fIdx(cluster.fIdx),
+  fQuality(cluster.fQuality), 
+  fR(cluster.fR),
+  fPhi(cluster.fPhi),
+  fTDC(cluster.fTDC),
+  fToT(cluster.fToT),
+  fADC(cluster.fADC),
+  fTdcND(cluster.fTdcND),
+  fTdcRAW(cluster.fTdcRAW),
+  fStatus(cluster.fStatus) 
+ {
   //
   // copy ctor for AliTOFcluster object
   //
 
   Int_t ii;
-  fR        = cluster.fR;
-  fPhi      = cluster.fPhi;
-  fZ        = cluster.fZ;
-  fTDC      = cluster.fTDC;
-  fADC      = cluster.fADC;
-  for (ii=0; ii<3; ii++) fLab[ii]      = cluster.fLab[ii];
-  fIdx      = cluster.fIdx;
   for (ii=0; ii<5; ii++) fdetIndex[ii] = cluster.fdetIndex[ii];
-
 }
 //-------------------------------------------------------------------------
 
 AliTOFcluster::~AliTOFcluster() {
+
   //
   // dtor
   //
 
-  //delete fLab;
-  //delete fdetIndex;
-
 }
+
+