changed eta, phi method; added * operator

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

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index b2b890b47f416ba30c65dd54c97a0ac425e5e75f..23108bcb0fcdfb92c4b43129bb3572869374e241 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -24,8 +24,7 @@
 //
 //*-- Author: Sahal Yacoob (LBL)
 // based on : AliPHOSDigit
-//__________________________________________________________________________ 
-
+//__________________________________________________________________________
 
 // --- ROOT system ---
 
@@ -36,6 +35,8 @@
 // --- AliRoot header files ---
 
 #include "AliEMCALDigit.h"
+#include "AliEMCALGeometry.h"
+#include "AliEMCALGetter.h"
 
 
 ClassImp(AliEMCALDigit)
@@ -47,28 +48,32 @@ ClassImp(AliEMCALDigit)
 
   fIndexInList = -1 ; 
   fNprimary    = 0 ;  
-  fNMaxPrimary = 21 ; 
+  fNMaxPrimary = 20 ; 
   fNiparent     = 0 ;
   fNMaxiparent = fNMaxPrimary*10;
+  fPrimary = new Int_t[fNMaxPrimary] ;
+  fIparent = new Int_t[fNMaxiparent] ; 
 }
 
 //____________________________________________________________________________
-AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEnergy, Int_t index) 
+AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEnergy, Float_t time, Int_t index) 
 {  
   // ctor with all data 
 
-  fNMaxPrimary = 21 ; 
+  fNMaxPrimary = 20 ; 
   fNMaxiparent = fNMaxPrimary*10;
+  fPrimary = new Int_t[fNMaxPrimary] ;
+  fIparent = new Int_t[fNMaxiparent] ; 
   fAmp         = DigEnergy ;
+  fTime        = time ;
   fId          = id ;
   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 ;
@@ -92,6 +97,8 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit)
 
   fNMaxPrimary = digit.fNMaxPrimary ;  
   fNMaxiparent = digit.fNMaxiparent ;
+  fPrimary = new Int_t[fNMaxPrimary] ;
+  fIparent = new Int_t[fNMaxiparent] ; 
   Int_t i ;
   for ( i = 0; i < fNMaxPrimary ; i++)
   fPrimary[i]  = digit.fPrimary[i] ;
@@ -99,6 +106,7 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit)
   for (j = 0; j< fNMaxiparent ; j++)
   fIparent[j]  = digit.fIparent[j] ;
   fAmp         = digit.fAmp ;
+  fTime        = digit.fTime ;
   fId          = digit.fId;
   fIndexInList = digit.fIndexInList ; 
   fNprimary    = digit.fNprimary ;
@@ -109,7 +117,8 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit)
 AliEMCALDigit::~AliEMCALDigit() 
 {
   // Delete array of primiries if any
-  
+    delete [] fPrimary ;
+    delete [] fIparent ; 
 }
 
 //____________________________________________________________________________
@@ -135,12 +144,32 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
 
 }
 
+//____________________________________________________________________________
+const Float_t AliEMCALDigit::GetEta() const
+{
+  Float_t eta=-10., phi=-10.;
+  Int_t id = GetId();
+  AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  g->EtaPhiFromIndex(id,eta,phi);
+  return eta ;
+}
+
+//____________________________________________________________________________
+const Float_t AliEMCALDigit::GetPhi() const
+{
+  Float_t eta=-10., phi=-10.;
+  Int_t id = GetId();
+  AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  g->EtaPhiFromIndex(id,eta,phi);
+  return phi ;
+}
+
 //____________________________________________________________________________
 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 ){
+  if ( index <= fNprimary && index > 0){
     rv = fPrimary[index-1] ;
   } 
 
@@ -161,6 +190,15 @@ 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){
@@ -189,23 +227,30 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
   // if amplitude is larger than 
   
   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 ;
-       return *this ;
+      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 ;
       }
     }
   }
@@ -214,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 < max1 ; printindex++)
+         cout << "printindex = " << printindex << "  primary = " << fPrimary[printindex];
+       cout <<endl;
        cout << "AliEMCALDigit >> Increase NMaxiparent "<< endl ;
        return *this ;
       }
@@ -230,12 +280,23 @@ 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)
 {
   // Prints the data of the digit
   
-  out << "ID " << digit.fId << " Energy = " << digit.fAmp << endl ; 
+  out << "ID " << digit.fId << " Energy = " << digit.fAmp <<  " Time = " << digit.fTime << endl ; 
   Int_t i,j ;
   for(i=0;i<digit.fNprimary;i++)
     out << "Primary " << i+1 << " = " << digit.fPrimary[i] << endl ;