Avoid compiler warnings.

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

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index ea9b0682d20d171d81e0b8b8f5c380779679e759..602eab8410cd5ca20452538248d5611e9d079d25 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -30,7 +30,7 @@
 
 // --- Standard library ---
 
-#include <iostream.h>
+#include <Riostream.h>
 
 // --- AliRoot header files ---
 
@@ -42,17 +42,20 @@
 ClassImp(AliEMCALDigit)
 
 //____________________________________________________________________________
-  AliEMCALDigit::AliEMCALDigit() 
+  AliEMCALDigit::AliEMCALDigit()  
 {
   // default ctor 
 
   fIndexInList = -1 ; 
   fNprimary    = 0 ;  
-  fNMaxPrimary = 20 ; 
-  fNiparent     = 0 ;
-  fNMaxiparent = fNMaxPrimary*10;
-  fPrimary = new Int_t[fNMaxPrimary] ;
-  fIparent = new Int_t[fNMaxiparent] ; 
+  fNMaxPrimary = 5 ; 
+  fNiparent    = 0 ;
+  fNMaxiparent = 5; 
+  fPrimary = 0 ;
+  fIparent = 0 ;
+  fMaxIter = 0;
+  fTime = 0. ; 
+  fTimeR = 0. ; 
 }
 
 //____________________________________________________________________________
@@ -60,14 +63,16 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
 {  
   // ctor with all data 
 
-  fNMaxPrimary = 20 ; 
-  fNMaxiparent = fNMaxPrimary*10;
+  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 ; 
     fPrimary[0]  = primary ;  
@@ -85,12 +90,12 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
   for ( i = 1; i < fNMaxPrimary ; i++)
     fPrimary[i]  = -1 ; 
 
-  for ( Int_t j =1; j< fNMaxiparent ; j++)
-    fIparent[j] = -1 ;  
+  for ( i =1; i< fNMaxiparent ; i++)
+    fIparent[i] = -1 ;  
 }
 
 //____________________________________________________________________________
-AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) 
+AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit)
 {
   // copy ctor
   
@@ -107,7 +112,9 @@ 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 ; 
   fNprimary    = digit.fNprimary ;
   fNiparent    = digit.fNiparent ;
@@ -145,18 +152,22 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
 }
 
 //____________________________________________________________________________
-const Float_t AliEMCALDigit::GetEta() const
-{
+Float_t AliEMCALDigit::GetEta() const
+{ // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
-  AliEMCALGeometry::GetInstance()->EtaPhiFromIndex(fId,eta,phi);
+  Int_t id = GetId();
+  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
+  g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
 }
 
 //____________________________________________________________________________
-const Float_t AliEMCALDigit::GetPhi() const
-{
+Float_t AliEMCALDigit::GetPhi() const
+{ // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
-  AliEMCALGeometry::GetInstance()->EtaPhiFromIndex(fId,eta,phi);
+  Int_t id = GetId();
+  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
+  g->EtaPhiFromIndex(id,eta,phi);
   return phi ;
 }
 
@@ -165,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] ;
   } 
 
@@ -186,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   ;}
@@ -225,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 ;  
@@ -241,12 +243,12 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
       fNprimary++ ;
       max1++;}
       if(fNprimary==fNMaxPrimary) {
-      Int_t printindex ;
-      for (printindex = 0 ; printindex < max1 ; printindex++)
-       cout << "printindex = " << printindex << "  primary = " << fPrimary[printindex];
-      cout <<endl;
-      cout << "AliEMCALDigit >> Increase NMaxPrimary "<< endl ;
-//     return *this ;
+
+       TString mess = " NMaxPrimary  =  " ; 
+       mess += fNMaxPrimary ; 
+       mess += " is too small" ; 
+       Fatal("AliEMCALDigit::Operator+ -->" , mess.Data()) ; 
+
       }
     }
   }
@@ -263,12 +265,12 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
       fNiparent++ ;
       max2++;}
       if(fNiparent==fNMaxiparent) {
-       Int_t printindex ;
-       for (printindex = 0 ; printindex < max1 ; printindex++)
-         cout << "printindex = " << printindex << "  primary = " << fPrimary[printindex];
-       cout <<endl;
-       cout << "AliEMCALDigit >> Increase NMaxiparent "<< endl ;
-       return *this ;
+
+       TString mess = " NMaxiparent  =  " ; 
+       mess += fNMaxiparent ; 
+       mess += " is too small" ; 
+       Fatal("AliEMCALDigit::Operator+ -->", mess.Data()) ; 
+
       }
     }
   }
@@ -276,6 +278,17 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
   return *this ;
 }
 
+//____________________________________________________________________________
+AliEMCALDigit& AliEMCALDigit::operator*(Float_t factor) 
+{
+  // Multiplies the amplitude by a factor
+  
+  Float_t tempo = static_cast<Float_t>(fAmp) ; 
+  tempo *= factor ; 
+  fAmp = static_cast<Int_t>(TMath::Ceil(tempo)) ; 
+  return *this ;
+}
+
 //____________________________________________________________________________
 ostream& operator << ( ostream& out , const AliEMCALDigit & digit)
 {