Setting "const" to member functions of AliPHOSEMCAGeometry

[u/mrichter/AliRoot.git] / PHOS / AliPHOSDigit.cxx

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index 500b2fcd2ac184becca7fa04346c6a9bb864fc9a..193c61e21570461b5f9f158b3b97a571b91c19cd 100644 (file)
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -18,6 +18,12 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.39  2006/04/22 15:04:24  hristov
+ * Effective C++ initialization of data members in the default constructor
+ *
+ * Revision 1.38  2006/04/22 10:30:17  hristov
+ * Add fEnergy to AliPHOSDigit and operate with EMC amplitude in energy units (Yu.Kharlov)
+ *
  * Revision 1.37  2005/05/28 14:19:04  schutz
  * Compilation warnings fixed by T.P.
  *
@@ -48,19 +54,25 @@
 ClassImp(AliPHOSDigit)
 
 //____________________________________________________________________________
-  AliPHOSDigit::AliPHOSDigit() 
+AliPHOSDigit::AliPHOSDigit() :
+  AliDigitNew(),
+  fNprimary(0),  
+  fPrimary(0x0),
+  fEnergy(0.),
+  fTime(0.),
+  fTimeR(0.) 
+  
 {
   // default ctor 
-
-  fIndexInList = -1 ; 
-  fNprimary    = 0 ;  
-  fPrimary = 0;
-  fTime = 0. ; 
-  fTimeR = 0. ; 
 }
 
 //____________________________________________________________________________
-AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t time, Int_t index) 
+AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t time, Int_t index) :
+  fNprimary(0),
+  fPrimary(0),
+  fEnergy(0.f),
+  fTime(0.f),
+  fTimeR(0.f)
 {  
   // ctor with all data 
 
@@ -82,7 +94,12 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t tim
 }
 
 //____________________________________________________________________________
-AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time, Int_t index) 
+AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time, Int_t index) :
+  fNprimary(0),
+  fPrimary(0),
+  fEnergy(0.f),
+  fTime(0.f),
+  fTimeR(0.f)
 {  
   // ctor with all data 
 
@@ -104,11 +121,16 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Float_t energy, Float_t time
 }
 
 //____________________________________________________________________________
-AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit)
+AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : 
+  AliDigitNew(digit),
+  fNprimary(digit.fNprimary),
+  fPrimary(0),
+  fEnergy(digit.fEnergy),
+  fTime(digit.fTime),
+  fTimeR(digit.fTimeR)
+
 {
   // copy ctor
-
-  fNprimary = digit.fNprimary ;  
   if(fNprimary){
     fPrimary = new Int_t[fNprimary] ;
     for (Int_t i = 0; i < fNprimary ; i++)
@@ -117,9 +139,6 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit)
   else
     fPrimary = 0 ;
   fAmp         = digit.fAmp ;
-  fEnergy      = digit.fEnergy ;
-  fTime        = digit.fTime ;
-  fTimeR       = digit.fTimeR ;
   fId          = digit.fId;
   fIndexInList = digit.fIndexInList ; 
 }
@@ -196,7 +215,7 @@ Bool_t AliPHOSDigit::operator==(AliPHOSDigit const & digit) const
 }
  
 //____________________________________________________________________________
-AliPHOSDigit& AliPHOSDigit::operator+(AliPHOSDigit const & digit) 
+AliPHOSDigit& AliPHOSDigit::operator+=(AliPHOSDigit const & digit) 
 {
 
   // Adds the amplitude of digits and completes the list of primary particles
@@ -227,7 +246,7 @@ AliPHOSDigit& AliPHOSDigit::operator+(AliPHOSDigit const & digit)
    return *this ;
 }
 //____________________________________________________________________________
-AliPHOSDigit& AliPHOSDigit::operator*(Float_t factor) 
+AliPHOSDigit& AliPHOSDigit::operator *= (Float_t factor) 
 {
   // Multiplies the amplitude by a factor