Added new plots

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

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index f63754d95fa3e4141e4b10d998c64173af4c2b04..d61b9fb7c2809521fe8ccafe35ab35e971c9f22c 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 ---
 
@@ -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;
@@ -62,8 +61,8 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
 {  
   // ctor with all data 
 
-  fNMaxPrimary = 5 ; 
-  fNMaxiparent = 40 ; 
+  fNMaxPrimary = 25 ; 
+  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,20 +238,12 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
       fNprimary++ ;
       max1++;}
       if(fNprimary==fNMaxPrimary) {
-       fNMaxPrimary += fMaxIter ;
-       Int_t * tempo = new Int_t[fNprimary] ;
-       Int_t i ;
-       for (i=0; i < fNprimary; i++)
-         tempo[i] = fPrimary[i] ;
-       delete [] fPrimary ;
-       fPrimary = new Int_t[fNMaxPrimary];
-    for (i=0; i < fNprimary; i++)
-      fPrimary[i] = tempo[i] ;  
-    delete [] tempo ;
-       for (i=fNprimary; i < fNMaxPrimary; i++)
-         fPrimary[i] = -1 ;
-cout << "AliEMCALDigit >>  NMaxPrimary has been increased to "<<  fNMaxPrimary << endl ;
-       return *this ;
+
+       TString mess = " NMaxPrimary  =  " ; 
+       mess += fNMaxPrimary ; 
+       mess += " is too small" ; 
+       Fatal("AliEMCALDigit::Operator+ -->" , mess.Data()) ; 
+
       }
     }
   }
@@ -279,20 +260,12 @@ cout << "AliEMCALDigit >>  NMaxPrimary has been increased to "<<  fNMaxPrimary <
       fNiparent++ ;
       max2++;}
       if(fNiparent==fNMaxiparent) {
-       fNMaxiparent += fMaxIter ; 
-       Int_t * tempo = new Int_t[fNiparent] ;
-       Int_t i ;
-       for (i=0; i < fNiparent; i++)
-         tempo[i] = fIparent[i] ;
-       delete [] fIparent ;
-       fIparent = new Int_t[fNMaxiparent];
-    for (i=0; i < fNiparent; i++)
-      fIparent[i] = tempo[i] ;
-    delete [] tempo ;
-       for (i=fNiparent; i < fNMaxiparent; i++)
-         fIparent[i] = -1 ;
-       cout << "AliEMCALDigit >> Increasing fNMaxiparent to  " << fNMaxiparent << endl ;
-       return *this ;
+
+       TString mess = " NMaxiparent  =  " ; 
+       mess += fNMaxiparent ; 
+       mess += " is too small" ; 
+       Fatal("AliEMCALDigit::Operator+ -->", mess.Data()) ; 
+
       }
     }
   }