Initialized to a large size enough for dN/deta =80000 the array of primaries

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

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index f90e10f152a88d8fd763a5e1c362ffec54a35c17..1e50ab7986cd5e23693a16e78064959f300f06d8 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -42,15 +42,15 @@
 ClassImp(AliEMCALDigit)
 
 //____________________________________________________________________________
-  AliEMCALDigit::AliEMCALDigit() 
+  AliEMCALDigit::AliEMCALDigit()  
 {
   // default ctor 
 
   fIndexInList = -1 ; 
   fNprimary    = 0 ;  
-  fNMaxPrimary = 5 ; 
+  fNMaxPrimary = 20 ; 
   fNiparent     = 0 ;
-  fNMaxiparent = fNMaxPrimary*10;
+  fNMaxiparent = 40; //fNMaxPrimary*10;
   fPrimary = new Int_t[fNMaxPrimary] ;
   fIparent = new Int_t[fNMaxiparent] ; 
 }
@@ -60,8 +60,8 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
 {  
   // ctor with all data 
 
-  fNMaxPrimary = 5 ; 
-  fNMaxiparent = fNMaxPrimary*10;
+  fNMaxPrimary = 20 ; 
+  fNMaxiparent = 40 ; //fNMaxPrimary*10;
   fPrimary = new Int_t[fNMaxPrimary] ;
   fIparent = new Int_t[fNMaxiparent] ; 
   fAmp         = DigEnergy ;
@@ -70,11 +70,10 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
   fIndexInList = index ; 
   if( primary != -1){
     fNprimary    = 1 ; 
-    fPrimary[0]  = primary ;
+    fPrimary[0]  = primary ;  
     fNiparent   = 1 ;
     fIparent[0] = iparent ;    
-
-  }
+}
   else{  //If the contribution of this primary smaller than fDigitThreshold (AliEMCALv1)
     fNprimary    = 0 ; 
     fPrimary[0]  = -1 ;
@@ -86,8 +85,8 @@ 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 ;  
 }
 
 //____________________________________________________________________________
@@ -149,7 +148,9 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
 const Float_t AliEMCALDigit::GetEta() const
 {
   Float_t eta=-10., phi=-10.;
-  AliEMCALGeometry::GetInstance()->EtaPhiFromIndex(fId,eta,phi);
+  Int_t id = GetId();
+  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
 }
 
@@ -157,7 +158,9 @@ const Float_t AliEMCALDigit::GetEta() const
 const Float_t AliEMCALDigit::GetPhi() const
 {
   Float_t eta=-10., phi=-10.;
-  AliEMCALGeometry::GetInstance()->EtaPhiFromIndex(fId,eta,phi);
+  Int_t id = GetId();
+  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  g->EtaPhiFromIndex(id,eta,phi);
   return phi ;
 }
 
@@ -226,22 +229,27 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
   fAmp += digit.fAmp ;
   if(fTime > digit.fTime)
     fTime = digit.fTime ;
-  
+
   Int_t max1 = fNprimary ; 
   Int_t max2 = fNiparent ;  
   Int_t index ; 
-  for (index = 0 ; index < digit.fNprimary ; index++){
+  for (index = 0 ; index < digit.fNprimary  ; index++){
     Bool_t deja = kTRUE ;
     Int_t old ;
     for ( old = 0 ; (old < max1) && deja; old++) { //already have this primary?
-      if(fPrimary[old] == (digit.fPrimary)[index])
+      if(fPrimary[old] == digit.fPrimary[index])
        deja = kFALSE;
     }
     if(deja){
-      fPrimary[fNprimary] = (digit.fPrimary)[index] ; 
+      if(max1<fNMaxPrimary){ fPrimary[max1] = digit.fPrimary[index] ; 
       fNprimary++ ;
-      if(fNprimary>fNMaxPrimary) {
-       cout << "AliEMCALDigit >> Increase NMaxPrimary "<< endl ;
+      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 ;
       }
     }
@@ -251,13 +259,18 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
     Bool_t dejavu = kTRUE ;
     Int_t old ;
     for ( old = 0 ; (old < max2) && dejavu; old++) { //already have this primary?
-      if(fIparent[old] == (digit.fIparent)[index])
+      if(fIparent[old] == digit.fIparent[index])
        dejavu = kFALSE;
     }
     if(dejavu){
-      fIparent[fNiparent] = (digit.fIparent)[index] ; 
+     if(max2<fNMaxiparent){ fIparent[max2] = digit.fIparent[index] ; 
       fNiparent++ ;
-      if(fNiparent>fNMaxiparent) {
+      max2++;}
+      if(fNiparent==fNMaxiparent) {
+       Int_t printindex ;
+       for (printindex = 0 ; printindex < max2 ; printindex++)
+         cout << "printindex = " << printindex << "  parent  = " << fIparent[printindex];
+       cout <<endl;
        cout << "AliEMCALDigit >> Increase NMaxiparent "<< endl ;
        return *this ;
       }
@@ -267,6 +280,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)
 {