syst. check that reads the MC information for the case of TPC-only

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

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index c39203b062b873f034c2da256bcd738827ab8d6e..193c61e21570461b5f9f158b3b97a571b91c19cd 100644 (file)
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -15,6 +15,20 @@
 
 /* $Id$ */
 
+/* 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.
+ *
+ */
+
 //_________________________________________________________________________
 //  PHOS digit: Id
 //              energy
@@ -40,23 +54,57 @@
 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 
 
   fAmp         = digEnergy ;
+  fEnergy      = 0 ;
+  fTime        = time ;
+  fTimeR       = fTime ;
+  fId          = id ;
+  fIndexInList = index ; 
+  if( primary != -1){
+    fNprimary    = 1 ; 
+    fPrimary = new Int_t[fNprimary] ;
+    fPrimary[0]  = primary ;
+  }
+  else{  //If the contribution of this primary smaller than fDigitThreshold (AliPHOSv1)
+    fNprimary = 0 ; 
+    fPrimary  = 0 ;
+  }
+}
+
+//____________________________________________________________________________
+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 
+
+  fAmp         = 0 ;
+  fEnergy      = energy ;
   fTime        = time ;
   fTimeR       = fTime ;
   fId          = id ;
@@ -73,11 +121,16 @@ AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t tim
 }
 
 //____________________________________________________________________________
-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++)
@@ -86,8 +139,6 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit)
   else
     fPrimary = 0 ;
   fAmp         = digit.fAmp ;
-  fTime        = digit.fTime ;
-  fTimeR       = digit.fTimeR ;
   fId          = digit.fId;
   fIndexInList = digit.fIndexInList ; 
 }
@@ -136,10 +187,10 @@ Int_t AliPHOSDigit::GetPrimary(Int_t index) const
   
 }
 //____________________________________________________________________________
-void AliPHOSDigit::Print() const
+void AliPHOSDigit::Print(const Option_t *) const
 {
   // Print the digit together with list of primaries
-  printf("PHOS digit: Amp=%d, Id=%d, Time=%e, TimeR=%e, NPrim=%d ",fAmp,fId,fTime,fTimeR,fNprimary);
+  printf("PHOS digit: Amp=%d/E=%.3f, Id=%d, Time=%.3e, TimeR=%.3e, NPrim=%d ",fAmp,fEnergy,fId,fTime,fTimeR,fNprimary);
   for(Int_t index = 0; index <fNprimary; index ++ )
     printf(" %d ",fPrimary[index]); 
   printf("\n") ;
@@ -164,13 +215,13 @@ 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
   if(digit.fNprimary>0){
      Int_t *tmp = new Int_t[fNprimary+digit.fNprimary] ;
-     if(fAmp < digit.fAmp){//most energetic primary in second digit => first primaries in list from second digit
+     if(fAmp < digit.fAmp || fEnergy < digit.fEnergy){//most energetic primary in second digit => first primaries in list from second digit
         for (Int_t index = 0 ; index < digit.fNprimary ; index++)
            tmp[index]=(digit.fPrimary)[index] ;
         for (Int_t index = 0 ; index < fNprimary ; index++)
@@ -187,14 +238,15 @@ AliPHOSDigit& AliPHOSDigit::operator+(AliPHOSDigit const & digit)
      fPrimary = tmp ;
    }
    fNprimary+=digit.fNprimary ;
-   fAmp += digit.fAmp ;
+   fAmp     += digit.fAmp ;
+   fEnergy  += digit.fEnergy ;
    if(fTime > digit.fTime)
       fTime = digit.fTime ;
    fTimeR = fTime ; 
    return *this ;
 }
 //____________________________________________________________________________
-AliPHOSDigit& AliPHOSDigit::operator*(Float_t factor) 
+AliPHOSDigit& AliPHOSDigit::operator *= (Float_t factor) 
 {
   // Multiplies the amplitude by a factor