X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALDigit.cxx;h=d61b9fb7c2809521fe8ccafe35ab35e971c9f22c;hb=73aa79d48ee4f25022a5560e95979a450222c02e;hp=eebb930db24bf366d0cd39eb46d9bbb915c71d65;hpb=451bc3c55100a9035845267a4ac2edb33c8080b0;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index eebb930db24..d61b9fb7c28 100644
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -30,7 +30,7 @@
 
 // --- Standard library ---
 
-#include <iostream.h>
+#include <Riostream.h>
 
 // --- AliRoot header files ---
 
@@ -46,12 +46,11 @@ 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;
@@ -63,7 +62,7 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
   // ctor with all data 
 
   fNMaxPrimary = 25 ; 
-  fNMaxiparent = 40 ; 
+  fNMaxiparent = 150 ; 
   fPrimary = new Int_t[fNMaxPrimary] ;
   fIparent = new Int_t[fNMaxiparent] ; 
   fAmp         = DigEnergy ;
@@ -149,21 +148,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 ;
 }
@@ -194,16 +193,6 @@ 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
@@ -249,10 +238,12 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
       fNprimary++ ;
       max1++;}
       if(fNprimary==fNMaxPrimary) {
+
 	TString mess = " NMaxPrimary  =  " ; 
 	mess += fNMaxPrimary ; 
 	mess += " is too small" ; 
 	Fatal("AliEMCALDigit::Operator+ -->" , mess.Data()) ; 
+
       }
     }
   }
@@ -269,10 +260,12 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
       fNiparent++ ;
       max2++;}
       if(fNiparent==fNMaxiparent) {
+
 	TString mess = " NMaxiparent  =  " ; 
 	mess += fNMaxiparent ; 
 	mess += " is too small" ; 
 	Fatal("AliEMCALDigit::Operator+ -->", mess.Data()) ; 
+
       }
     }
   }