X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSDigit.cxx;h=c11d050ef332bb54419dec39faf0494e0a963294;hb=a4983dcedc61346c9fed70fc72f1cb3c77a41028;hp=ede855ecc2c7b098e00a310b0b3e43eb952db7ad;hpb=2e5c30417a456bd06c0db4fb590ccee49d85108a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index ede855ecc2c..c11d050ef33 100644
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -20,23 +20,23 @@
 //              energy
 //              3 identifiers for the primary particle(s) at the origine of the digit
 //  The digits are made in FinishEvent() by summing all the hits in a single PHOS crystal or PPSD gas cell
-//  It would be nice to replace the 3 identifiers by an array, but, because digits are kept in a TClonesQArray,
-//   it is not possible to stream such an array... (beyond my understqnding!)
 //
-//*-- Author: Laurent Aphecetche & Yves Schutz (SUBATECH)
+//*-- Author: Laurent Aphecetche & Yves Schutz (SUBATECH) & Dmitri Peressounko (RRC KI & SUBATECH)
 
 
 // --- ROOT system ---
 
-// --- Standard library ---
+#include "TMath.h"
 
-#include <iostream.h>
+// --- Standard library ---
 
 // --- AliRoot header files ---
 
 #include "AliPHOSDigit.h"
 
 
+
+
 ClassImp(AliPHOSDigit)
 
 //____________________________________________________________________________
@@ -46,60 +46,58 @@ ClassImp(AliPHOSDigit)
 
   fIndexInList = -1 ; 
   fNprimary    = 0 ;  
-  fNMaxPrimary = 5 ; 
-  fPrimary     = new Int_t[fNMaxPrimary] ;
+  fPrimary = 0;
 }
 
 //____________________________________________________________________________
-AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t DigEnergy, Int_t index) 
+AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t time, Int_t index) 
 {  
   // ctor with all data 
 
-  fNMaxPrimary = 5 ; 
-  fPrimary     = new Int_t[fNMaxPrimary] ;
-  fAmp         = DigEnergy ;
+  fAmp         = digEnergy ;
+  fTime        = time ;
   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]  = -1 ;
+    fNprimary = 0 ; 
+    fPrimary  = 0 ;
   }
-  Int_t i ;
-  for ( i = 1; i < fNMaxPrimary ; i++)
-    fPrimary[i]  = -1 ; 
 }
 
 //____________________________________________________________________________
-AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) 
+AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit)
 {
   // copy ctor
-  
-  fNMaxPrimary = 5 ; 
-  fPrimary     = new Int_t[fNMaxPrimary] ;
+
+  fNprimary = digit.fNprimary ;  
+  if(fNprimary){
+    fPrimary = new Int_t[fNprimary] ;
+    for (Int_t i = 0; i < fNprimary ; i++)
+       fPrimary[i]  = digit.fPrimary[i] ;
+  }
+  else
+    fPrimary = 0 ;
   fAmp         = digit.fAmp ;
+  fTime        = digit.fTime ;
   fId          = digit.fId;
   fIndexInList = digit.fIndexInList ; 
-  fNprimary    = digit.fNprimary ;
-  fNMaxPrimary = digit.fNMaxPrimary ;
-  Int_t i ;
-  for ( i = 0; i < fNMaxPrimary ; i++)
-    fPrimary[i]  = digit.fPrimary[i] ;
 }
 
 //____________________________________________________________________________
-  AliPHOSDigit::~AliPHOSDigit() 
+AliPHOSDigit::~AliPHOSDigit() 
 {
   // Delete array of primiries if any
-
-  delete fPrimary;
+  if(fPrimary)
+    delete [] fPrimary ;
 }
 
 //____________________________________________________________________________
-Int_t AliPHOSDigit::Compare(TObject * obj)
+Int_t AliPHOSDigit::Compare(const TObject * obj) const
 {
   // Compares two digits with respect to its Id
   // to sort according increasing Id
@@ -124,18 +122,32 @@ Int_t AliPHOSDigit::Compare(TObject * obj)
 //____________________________________________________________________________
 Int_t AliPHOSDigit::GetPrimary(Int_t index) const
 {
-  // Returns the primary particle id index =1,2,3
- 
-  Int_t rv = -1 ; 
-  if ( index > fNMaxPrimary )
-    cout << "AliPHOSDigit  ERROR > only " << fNMaxPrimary << " primaries allowed" << endl ; 
-  else 
-    rv = fPrimary[index-1] ; 
+  // retrieves the primary particle number given its index in the list 
+  Int_t rv = -1 ;
+  if ( index <= fNprimary && index > 0){
+    rv = fPrimary[index-1] ;
+  } 
 
   return rv ; 
   
 }
-
+//____________________________________________________________________________
+void AliPHOSDigit::Print() const
+{
+  // Print the digit together with list of primaries
+  printf("PHOS digit: Amp=%d, Id=%d, Time=%f, NPrim=%d ",fAmp,fId,fTime,fNprimary);
+  for(Int_t index = 0; index <fNprimary; index ++ )
+    printf(" %d ",fPrimary[index]); 
+  printf("\n") ;
+}
+//____________________________________________________________________________
+void AliPHOSDigit::ShiftPrimary(Int_t shift)
+{
+  //shifts primary number to BIG offset, to separate primary in different TreeK
+  for(Int_t index = 0; index <fNprimary; index ++ ){
+    fPrimary[index]+= shift ;
+  } 
+}
 //____________________________________________________________________________
 Bool_t AliPHOSDigit::operator==(AliPHOSDigit const & digit) const 
 {
@@ -150,27 +162,40 @@ Bool_t AliPHOSDigit::operator==(AliPHOSDigit const & digit) const
 //____________________________________________________________________________
 AliPHOSDigit& AliPHOSDigit::operator+(AliPHOSDigit const & digit) 
 {
-  // Adds the amplitude of digits and completes the list of primary particles
-  // if amplitude is larger than 
-
-  fAmp += digit.fAmp ;
-
-  Int_t max1 = fNprimary ; 
-  Int_t max2 = digit.fNprimary ; 
- 
-  if ( fNprimary >= fNMaxPrimary ) 
-    cout << "AliPHOSDigit + operator  ERROR > too many primaries, modify AliPHOSDigit" << endl ;
-  else {
-    fNprimary += digit.fNprimary ; 
-    if ( fNprimary > fNMaxPrimary ) {
-      cout << "AliPHOSDigit + operator  ERROR > too many primaries, modify AliPHOSDigit" << endl ; 
-      fNprimary = fNMaxPrimary ;
-    }
-    Int_t index ; 
-    for (index = 0 ; index < max2 ; index++)
-      fPrimary[index+max1] = (digit.fPrimary)[index] ; 
-  }
 
+  // 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
+        for (Int_t index = 0 ; index < digit.fNprimary ; index++)
+           tmp[index]=(digit.fPrimary)[index] ;
+        for (Int_t index = 0 ; index < fNprimary ; index++)
+           tmp[index+digit.fNprimary]=fPrimary[index] ;
+     }
+     else{ //add new primaries to the end
+        for (Int_t index = 0 ; index < fNprimary ; index++)
+           tmp[index]=fPrimary[index] ;
+        for (Int_t index = 0 ; index < digit.fNprimary ; index++)
+           tmp[index+fNprimary]=(digit.fPrimary)[index] ;
+     }
+     if(fPrimary)
+       delete []fPrimary ;
+     fPrimary = tmp ;
+   }
+   fNprimary+=digit.fNprimary ;
+   fAmp += digit.fAmp ;
+   if(fTime > digit.fTime)
+      fTime = digit.fTime ;
+   return *this ;
+}
+//____________________________________________________________________________
+AliPHOSDigit& AliPHOSDigit::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 ;
 }
 
@@ -179,13 +204,12 @@ ostream& operator << ( ostream& out , const AliPHOSDigit & digit)
 {
   // Prints the data of the digit
   
-  out << "ID " << digit.fId << " Energy = " << digit.fAmp << endl 
-      << "Primary 1 = " << digit.fPrimary[0] << endl 
-      << "Primary 2 = " << digit.fPrimary[1] << endl 
-      << "Primary 3 = " << digit.fPrimary[2] << endl 
-      << "Primary 4 = " << digit.fPrimary[3] << endl 
-      << "Primary 5 = " << digit.fPrimary[4] << endl 
-       << "Position in list = " << digit.fIndexInList << endl ; 
+//   out << "ID " << digit.fId << " Energy = " << digit.fAmp << " Time = " << digit.fTime << endl ; 
+//   Int_t i ;
+//   for(i=0;i<digit.fNprimary;i++)
+//     out << "Primary " << i+1 << " = " << digit.fPrimary[i] << endl ;
+//   out << "Position in list = " << digit.fIndexInList << endl ; 
+  digit.Warning("operator <<", "Implement differently") ; 
   return out ;
 }