Removing extra semicolons (FedoraCore3, gcc 3.4.2)

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

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index eaa2f4ba916583251d247622929d856a1d9ea48c..a5664c3df51cfd9a678a927aa50d6889a8809e15 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -46,15 +46,16 @@ ClassImp(AliEMCALDigit)
 {
   // default ctor 
 
-  fIndexInList = 0 ; 
+  fIndexInList = -1 ; 
   fNprimary    = 0 ;  
-  fNMaxPrimary = 0 ; 
-  fNiparent     = 0 ;
-
-  fNMaxiparent = 0; 
+  fNMaxPrimary = 5 ; 
+  fNiparent    = 0 ;
+  fNMaxiparent = 5; 
   fPrimary = 0 ;
   fIparent = 0 ;
   fMaxIter = 0;
+  fTime = 0. ; 
+  fTimeR = 0. ; 
 }
 
 //____________________________________________________________________________
@@ -63,11 +64,12 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
   // ctor with all data 
 
   fNMaxPrimary = 25 ; 
-  fNMaxiparent = 50 ; 
+  fNMaxiparent = 150 ; 
   fPrimary = new Int_t[fNMaxPrimary] ;
   fIparent = new Int_t[fNMaxiparent] ; 
   fAmp         = DigEnergy ;
   fTime        = time ;
+  fTimeR       = fTime ;
   fId          = id ;
   fIndexInList = index ; 
   fMaxIter     = 5;
@@ -93,7 +95,7 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
 }
 
 //____________________________________________________________________________
-AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) 
+AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit)
 {
   // copy ctor
   
@@ -110,6 +112,7 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit)
   fIparent[j]  = digit.fIparent[j] ;
   fAmp         = digit.fAmp ;
   fTime        = digit.fTime ;
+  fTimeR       = digit.fTimeR ;
   fId          = digit.fId;
   fMaxIter     = digit.fMaxIter;
   fIndexInList = digit.fIndexInList ; 
@@ -149,21 +152,21 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
 }
 
 //____________________________________________________________________________
-const Float_t AliEMCALDigit::GetEta() const
+Float_t AliEMCALDigit::GetEta() const
 {
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
   g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
 }
 
 //____________________________________________________________________________
-const Float_t AliEMCALDigit::GetPhi() const
+Float_t AliEMCALDigit::GetPhi() const
 {
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
   g->EtaPhiFromIndex(id,eta,phi);
   return phi ;
 }
@@ -173,7 +176,7 @@ Int_t AliEMCALDigit::GetPrimary(Int_t index) const
 {
   // retrieves the primary particle number given its index in the list 
   Int_t rv = -1 ;
-  if ( index <= fNprimary && index > 0){
+  if ( (index <= fNprimary) && (index > 0)){
     rv = fPrimary[index-1] ;
   } 
 
@@ -194,19 +197,9 @@ Int_t AliEMCALDigit::GetIparent(Int_t index) const
   
 }
 
-//______________________________________________________________________
-const Bool_t AliEMCALDigit::IsInPreShower() const 
-{
-  Bool_t rv = kFALSE ;
-  const AliEMCALGeometry * geom = AliEMCALGetter::GetInstance()->EMCALGeometry() ;
-  if( GetId() > (geom->GetNZ() * geom->GetNPhi() )) 
-    rv = kTRUE; 
-  return rv; 
-} 
-
 //____________________________________________________________________________
 void AliEMCALDigit::ShiftPrimary(Int_t shift){
-  //shifts primary nimber to BIG offset, to separate primary in different TreeK
+  //shifts primary number to BIG offset, to separate primary in different TreeK
   Int_t index  ;
   for(index = 0; index <fNprimary; index++ ){
     fPrimary[index] = fPrimary[index]+ shift * 10000000   ;}
@@ -233,6 +226,7 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
   fAmp += digit.fAmp ;
   if(fTime > digit.fTime)
     fTime = digit.fTime ;
+  fTimeR = fTime ; 
 
   Int_t max1 = fNprimary ; 
   Int_t max2 = fNiparent ;