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

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index ede855ecc2c..9b624fa6f0f 100644
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -20,10 +20,8 @@
 //              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 ---
@@ -47,19 +45,20 @@ ClassImp(AliPHOSDigit)
   fIndexInList = -1 ; 
   fNprimary    = 0 ;  
   fNMaxPrimary = 5 ; 
-  fPrimary     = new Int_t[fNMaxPrimary] ;
+  fShiftOffset = 10000000 ;
 }
 
 //____________________________________________________________________________
-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 ; 
+  fShiftOffset = 10000000 ;
   if( primary != -1){
     fNprimary    = 1 ; 
     fPrimary[0]  = primary ;
@@ -78,28 +77,28 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit)
 {
   // copy ctor
   
-  fNMaxPrimary = 5 ; 
-  fPrimary     = new Int_t[fNMaxPrimary] ;
+
+  fNMaxPrimary = digit.fNMaxPrimary ;  
+  Int_t i ;
+  fShiftOffset = 10000000 ;
+  for ( i = 0; i < fNMaxPrimary ; i++)
+    fPrimary[i]  = digit.fPrimary[i] ;
   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;
+  
 }
 
 //____________________________________________________________________________
-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 +123,29 @@ 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(Option_t *option) const
+{
+  printf("PHOS digit: Amp=%d, Id=%d\n",fAmp,fId);
+}
+//____________________________________________________________________________
+void AliPHOSDigit::ShiftPrimary(Int_t shift)
+{
+  //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 * fShiftOffset ;
+  } 
+}
 //____________________________________________________________________________
 Bool_t AliPHOSDigit::operator==(AliPHOSDigit const & digit) const 
 {
@@ -152,25 +162,31 @@ 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 ;
-
+  if(fTime > digit.fTime)
+    fTime = digit.fTime ;
+  
   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 < 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])
+	deja = kFALSE;
+    }
+    if(deja){
+      fPrimary[fNprimary] = (digit.fPrimary)[index] ; 
+      fNprimary++ ;
+      if(fNprimary>fNMaxPrimary) {
+	cout << "AliPHOSDigit >> Increase NMaxPrimary "<< endl ;
+	return *this ;
+      }
     }
-    Int_t index ; 
-    for (index = 0 ; index < max2 ; index++)
-      fPrimary[index+max1] = (digit.fPrimary)[index] ; 
   }
-
+  
   return *this ;
 }
 
@@ -179,13 +195,11 @@ 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 ; 
   return out ;
 }