X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFcluster.cxx;h=f2ff14182451c748105cb3c3011067c6d0b0404e;hb=29c7a3d01fc2a35d44dd27f40ae7b1937919a179;hp=a147dde82d60b28106ad02815dd1d87f349a6a30;hpb=aa5476d82dd2130585b28d453db008d290fc7865;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFcluster.cxx b/TOF/AliTOFcluster.cxx
index a147dde82d6..f2ff1418245 100644
--- a/TOF/AliTOFcluster.cxx
+++ b/TOF/AliTOFcluster.cxx
@@ -31,18 +31,21 @@ Revision 0.01 2005/07/25 A. De Caro
 ////////////////////////////////////////////////////////
 
 #include "AliTOFcluster.h"
+//#include "AliLog.h"
+//#include "AliGeomManager.h"
+//#include "TGeoMatrix.h"
 
 ClassImp(AliTOFcluster)
 
 AliTOFcluster::AliTOFcluster():
+  AliCluster3D(),
   fIdx(-1),
+  fQuality(-100), 
   fR(0),
   fPhi(0),
-  fZ(0),
   fTDC(0),
-  fADC(0),
-  fQuality(-100), 
   fToT(0),
+  fADC(0),
   fTdcND(0),
   fTdcRAW(0),
   fStatus(kTRUE) 
@@ -52,136 +55,69 @@ AliTOFcluster::AliTOFcluster():
   //
 
   Int_t ii;
-  for (ii=0; ii<3; ii++) fLab[ii]      = -1;
   for (ii=0; ii<5; ii++) fdetIndex[ii] = -1;
 }
 //-------------------------------------------------------------------------
 
-AliTOFcluster::AliTOFcluster(Double_t *h, Int_t *l, Int_t *ind, Int_t idx, Float_t ToT, Double_t TdcND, Bool_t status):
-  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),
-  fR(0),
-  fPhi(0),
-  fZ(0),
-  fTDC(0),
-  fADC(0),
   fQuality(-100), 
-  fToT(ToT),
-  fTdcND(TdcND),
-  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];
-  for (ii=0; ii<5; ii++) fdetIndex[ii] = ind[ii];
-}
-//-------------------------------------------------------------------------
-
-AliTOFcluster::AliTOFcluster(Double_t *h, Int_t *l, Int_t *ind, Int_t idx, Float_t ToT, Double_t TdcND):
-  TObject(),
-  fIdx(idx),
   fR(0),
   fPhi(0),
-  fZ(0),
-  fTDC(0),
-  fADC(0),
-  fQuality(-100), 
-  fToT(ToT),
-  fTdcND(TdcND),
-  fStatus(kTRUE) 
+  fTDC(par[0]),
+  fToT(par[1]),
+  fADC(par[2]),
+  fTdcND(par[3]),
+  fTdcRAW(par[4]),
+  fStatus(status) 
  {
   //
   // constructor
   //
+   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]);
 
-  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];
-  for (ii=0; ii<5; ii++) fdetIndex[ii] = ind[ii];
-}
-//-------------------------------------------------------------------------
-
-AliTOFcluster::AliTOFcluster(Double_t *h, Int_t *ind):
-  TObject(), 
-  fIdx(-1),
-  fR(0),
-  fPhi(0),
-  fZ(0),
-  fTDC(0),
-  fADC(0),
-  fQuality(-100), 
-  fToT(0),
-  fTdcND(0),
-  fTdcRAW(0),
-  fStatus(kTRUE) 
-{
-  //
-  // 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;
-  for (ii=0; ii<5; ii++) fdetIndex[ii] = ind[ii];
 }
 //-------------------------------------------------------------------------
 
 AliTOFcluster::AliTOFcluster(const AliTOFcluster & cluster):
-  TObject(),
-  fIdx(-1),
-  fR(0),
-  fPhi(0),
-  fZ(0),
-  fTDC(0),
-  fADC(0),
-  fQuality(-100), 
-  fToT(0),
-  fTdcND(0),
-  fTdcRAW(0),
-  fStatus(kTRUE) 
+  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];
-  fQuality    = cluster.fQuality; 
-  fToT    = cluster.fToT; 
-  fTdcND    = cluster.fTdcND; 
-  fTdcRAW    = cluster.fTdcRAW; 
 }
 //-------------------------------------------------------------------------
 
 AliTOFcluster::~AliTOFcluster() {
+
   //
   // dtor
   //
 
-  //delete fLab;
-  //delete fdetIndex;
-
 }
+
+