Possibility for partial TOF geometry (S.Arcelli)

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALDigit.cxx

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index a5664c3df51cfd9a678a927aa50d6889a8809e15..40eab12f58855c9fcc6a03bbdfa744328749af28 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -36,26 +36,25 @@
 
 #include "AliEMCALDigit.h"
 #include "AliEMCALGeometry.h"
-#include "AliEMCALGetter.h"
-
 
 ClassImp(AliEMCALDigit)
 
 //____________________________________________________________________________
-  AliEMCALDigit::AliEMCALDigit()  
+AliEMCALDigit::AliEMCALDigit() :  
+  AliDigitNew(),
+  fNprimary(0),
+  fNMaxPrimary(5),
+  fPrimary(0x0),
+  fNiparent(0),
+  fNMaxiparent(5), 
+  fIparent(0x0),
+  fMaxIter(0),
+  fTime(0.), 
+  fTimeR(0.) 
+
 {
   // default ctor 
 
-  fIndexInList = -1 ; 
-  fNprimary    = 0 ;  
-  fNMaxPrimary = 5 ; 
-  fNiparent    = 0 ;
-  fNMaxiparent = 5; 
-  fPrimary = 0 ;
-  fIparent = 0 ;
-  fMaxIter = 0;
-  fTime = 0. ; 
-  fTimeR = 0. ; 
 }
 
 //____________________________________________________________________________
@@ -63,15 +62,18 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
 {  
   // ctor with all data 
 
+  // data memebrs of the base class (AliNewDigit)
+  fAmp         = DigEnergy ;
+  fId          = id ;
+  fIndexInList = index ; 
+
+  // data members
   fNMaxPrimary = 25 ; 
   fNMaxiparent = 150 ; 
   fPrimary = new Int_t[fNMaxPrimary] ;
   fIparent = new Int_t[fNMaxiparent] ; 
-  fAmp         = DigEnergy ;
   fTime        = time ;
   fTimeR       = fTime ;
-  fId          = id ;
-  fIndexInList = index ; 
   fMaxIter     = 5;
   if( primary != -1){
     fNprimary    = 1 ; 
@@ -99,7 +101,12 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit)
 {
   // copy ctor
   
+  // data memebrs of the base class (AliNewDigit)
+  fAmp         = digit.fAmp ;
+  fId          = digit.fId;
+  fIndexInList = digit.fIndexInList ; 
 
+  // data members
   fNMaxPrimary = digit.fNMaxPrimary ;  
   fNMaxiparent = digit.fNMaxiparent ;
   fPrimary = new Int_t[fNMaxPrimary] ;
@@ -110,12 +117,9 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit)
   Int_t j ;
   for (j = 0; j< fNMaxiparent ; j++)
   fIparent[j]  = digit.fIparent[j] ;
-  fAmp         = digit.fAmp ;
   fTime        = digit.fTime ;
   fTimeR       = digit.fTimeR ;
-  fId          = digit.fId;
   fMaxIter     = digit.fMaxIter;
-  fIndexInList = digit.fIndexInList ; 
   fNprimary    = digit.fNprimary ;
   fNiparent    = digit.fNiparent ;
 }
@@ -153,20 +157,24 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
 
 //____________________________________________________________________________
 Float_t AliEMCALDigit::GetEta() const
-{
+{ 
+  //return pseudorapidity for this digit
+  // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
 }
 
 //____________________________________________________________________________
 Float_t AliEMCALDigit::GetPhi() const
-{
+{ 
+  //return phi coordinate of digit
+  // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return phi ;
 }