Removing AliMUONTransientDigit and adding AliMUONObjectPair class (Laurent)

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

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index af9fae846fbdb54463edc8c231887ad126133ece..a5cc66b4ff835c9b65b9126ea7739e09bd87f3b6 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -36,40 +36,50 @@
 
 #include "AliEMCALDigit.h"
 #include "AliEMCALGeometry.h"
-#include "AliEMCALGetter.h"
-
 
 ClassImp(AliEMCALDigit)
 
 //____________________________________________________________________________
-  AliEMCALDigit::AliEMCALDigit()  
+AliEMCALDigit::AliEMCALDigit() :  
+  AliDigitNew(),
+  fNprimary(0),
+  fNMaxPrimary(5),
+  fPrimary(0x0),
+  fNiparent(0),
+  fNMaxiparent(5), 
+  fIparent(0x0),
+  fMaxIter(0),
+  fTime(0.), 
+  fTimeR(0.) 
+
 {
   // default ctor 
 
-  fIndexInList = -1 ; 
-  fNprimary    = 0 ;  
-  fNMaxPrimary = 5 ; 
-  fNiparent    = 0 ;
-  fNMaxiparent = 5; 
-  fPrimary = 0 ;
-  fIparent = 0 ;
-  fMaxIter = 0;
 }
 
 //____________________________________________________________________________
 AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEnergy, Float_t time, Int_t index) 
+  : AliDigitNew(),
+    fNprimary(0),
+    fNMaxPrimary(25),
+    fPrimary(0x0),
+    fNiparent(0),
+    fNMaxiparent(150),
+    fIparent(0x0),
+    fMaxIter(5),
+    fTime(time),
+    fTimeR(time)
 {  
   // ctor with all data 
 
-  fNMaxPrimary = 25 ; 
-  fNMaxiparent = 150 ; 
-  fPrimary = new Int_t[fNMaxPrimary] ;
-  fIparent = new Int_t[fNMaxiparent] ; 
+  // data memebrs of the base class (AliNewDigit)
   fAmp         = DigEnergy ;
-  fTime        = time ;
   fId          = id ;
   fIndexInList = index ; 
-  fMaxIter     = 5;
+
+  // data members
+  fPrimary = new Int_t[fNMaxPrimary] ;
+  fIparent = new Int_t[fNMaxiparent] ; 
   if( primary != -1){
     fNprimary    = 1 ; 
     fPrimary[0]  = primary ;  
@@ -92,13 +102,26 @@ AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEn
 }
 
 //____________________________________________________________________________
-AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit)
+AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) 
+  : AliDigitNew(digit),
+    fNprimary(digit.fNprimary),
+    fNMaxPrimary(digit.fNMaxPrimary),
+    fPrimary(0x0),
+    fNiparent(digit.fNiparent),
+    fNMaxiparent(digit.fNMaxiparent),
+    fIparent(0x0),
+    fMaxIter(digit.fMaxIter),
+    fTime(digit.fTime),
+    fTimeR(digit.fTimeR)
 {
   // copy ctor
   
+  // data memebrs of the base class (AliNewDigit)
+  fAmp         = digit.fAmp ;
+  fId          = digit.fId;
+  fIndexInList = digit.fIndexInList ; 
 
-  fNMaxPrimary = digit.fNMaxPrimary ;  
-  fNMaxiparent = digit.fNMaxiparent ;
+  // data members
   fPrimary = new Int_t[fNMaxPrimary] ;
   fIparent = new Int_t[fNMaxiparent] ; 
   Int_t i ;
@@ -107,13 +130,6 @@ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) : AliDigitNew(digit)
   Int_t j ;
   for (j = 0; j< fNMaxiparent ; j++)
   fIparent[j]  = digit.fIparent[j] ;
-  fAmp         = digit.fAmp ;
-  fTime        = digit.fTime ;
-  fId          = digit.fId;
-  fMaxIter     = digit.fMaxIter;
-  fIndexInList = digit.fIndexInList ; 
-  fNprimary    = digit.fNprimary ;
-  fNiparent    = digit.fNiparent ;
 }
 
 //____________________________________________________________________________
@@ -149,20 +165,24 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const
 
 //____________________________________________________________________________
 Float_t AliEMCALDigit::GetEta() const
-{
+{ 
+  //return pseudorapidity for this digit
+  // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
 }
 
 //____________________________________________________________________________
 Float_t AliEMCALDigit::GetPhi() const
-{
+{ 
+  //return phi coordinate of digit
+  // should be change in EMCALGeometry - 19-nov-04
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  const AliEMCALGeometry *g = AliEMCALGetter::Instance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance();
   g->EtaPhiFromIndex(id,eta,phi);
   return phi ;
 }
@@ -172,7 +192,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] ;
   } 
 
@@ -195,7 +215,7 @@ Int_t AliEMCALDigit::GetIparent(Int_t index) const
 
 //____________________________________________________________________________
 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   ;}
@@ -214,7 +234,7 @@ Bool_t AliEMCALDigit::operator==(AliEMCALDigit const & digit) const
 }
  
 //____________________________________________________________________________
-AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit) 
+AliEMCALDigit AliEMCALDigit::operator+(const AliEMCALDigit &digit) 
 {
   // Adds the amplitude of digits and completes the list of primary particles
   // if amplitude is larger than 
@@ -222,6 +242,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 ;  
@@ -274,7 +295,7 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit)
 }
 
 //____________________________________________________________________________
-AliEMCALDigit& AliEMCALDigit::operator*(Float_t factor) 
+AliEMCALDigit AliEMCALDigit::operator*(Float_t factor) 
 {
   // Multiplies the amplitude by a factor