X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSDigit.cxx;h=19bbf04e4613afa30a31bf2a0d75434e8068e062;hb=bfbd5665ee83ec5e12fe28ed27bff3182595f115;hp=1b3aeac89e58ef8e8f2e22b72ceb35004a037b67;hpb=de9ec31b399388ee561c458eaae1c4e22d829ff7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index 1b3aeac89e5..19bbf04e461 100644
--- a/PHOS/AliPHOSDigit.cxx
+++ b/PHOS/AliPHOSDigit.cxx
@@ -15,28 +15,33 @@
 
 /* $Id$ */
 
+/* History of cvs commits:
+ *
+ * $Log$
+ */
+
 //_________________________________________________________________________
 //  PHOS digit: Id
 //              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)
 
 //____________________________________________________________________________
@@ -44,43 +49,69 @@ ClassImp(AliPHOSDigit)
 {
   // default ctor 
 
-  fNprimary = 0 ;  
-  fPrimary1 = -1 ; 
-  fPrimary2 = -1 ; 
-  fPrimary3 = -1 ;
+  fIndexInList = -1 ; 
+  fNprimary    = 0 ;  
+  fPrimary = 0;
+  fTime = 0. ; 
+  fTimeR = 0. ; 
 }
 
 //____________________________________________________________________________
-AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t DigEnergy) 
+AliPHOSDigit::AliPHOSDigit(Int_t primary, Int_t id, Int_t digEnergy, Float_t time, Int_t index) 
 {  
   // ctor with all data 
 
-  fId         = id ;
-  fAmp        = DigEnergy ;
-  fPrimary1   = primary ;
-  fNprimary   = 1 ; 
+  fAmp         = digEnergy ;
+  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(const AliPHOSDigit & digit) 
+AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) : AliDigitNew(digit)
 {
   // copy ctor
-  
-  fId       = digit.fId;
-  fAmp      = digit.fAmp ;
-  fNprimary = digit.fNprimary ;
-  fPrimary1 = digit.fPrimary1 ;
-  fPrimary2 = digit.fPrimary2 ;
-  fPrimary3 = digit.fPrimary3 ;
+
+  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 ;
+  fTimeR       = digit.fTimeR ;
+  fId          = digit.fId;
+  fIndexInList = digit.fIndexInList ; 
+}
+
+//____________________________________________________________________________
+AliPHOSDigit::~AliPHOSDigit() 
+{
+  // Delete array of primiries if any
+  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
 
-  Int_t rv ; 
+  Int_t rv ;
 
   AliPHOSDigit * digit = (AliPHOSDigit *)obj ; 
 
@@ -100,29 +131,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 > 3 )
-    cout << "AliPHOSDigit  ERROR > only 3 primaries allowed" << endl ; 
-  else {
-    switch (index) {  
-    case 1 :
-      rv = fPrimary1 ; 
-      break ; 
-    case 2 :
-      rv = fPrimary2 ; 
-      break ; 
-    case 3 :
-      rv = fPrimary3 ; 
-      break ; 
-    }
+  // 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 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);
+  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 
 {
@@ -137,54 +171,41 @@ 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
 
-  fAmp += digit.fAmp ;
-  
-  // Here comes something crummy ... but I do not know how to stream pointers
-  // because AliPHOSDigit is in a TCLonesArray
+  // 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 ;
+   fTimeR = fTime ; 
+   return *this ;
+}
+//____________________________________________________________________________
+AliPHOSDigit& AliPHOSDigit::operator*(Float_t factor) 
+{
+  // Multiplies the amplitude by a factor
   
-  Int_t tempo1[3] ; 
-  tempo1[0] = fPrimary1 ; 
-  tempo1[1] = fPrimary2 ; 
-  tempo1[2] = fPrimary3 ; 
-
-  Int_t tempo2[3] ; 
-  tempo2[0] = digit.fPrimary1 ; 
-  tempo2[1] = digit.fPrimary2 ; 
-  tempo2[2] = digit.fPrimary3 ; 
-
-  Int_t max1 = fNprimary ; 
-  Int_t max2 = digit.fNprimary ; 
- 
-  if ( fNprimary >= 3 ) {
-    cout << "AliPHOSDigit + operator  ERROR > too many primaries, modify AliPHOSDigit" << endl ; 
-  } 
-  else {
-    fNprimary += digit.fNprimary ; 
-    if ( fNprimary > 3 ) {
-      cout << "AliPHOSDigit + operator  ERROR > too many primaries, modify AliPHOSDigit" << endl ; 
-      fNprimary = 3 ;
-    }
-    
-    Int_t tempo3[3] ;
-    Int_t index ; 
-    for (index = 0 ; index < 3 ; index++)
-      tempo3[index] = 0 ; 
-
-    for (index = 0 ; index < max1 ; index++)
-      tempo3[index] = tempo1[index] ;
-
-    for (index = 0 ; index < max2 ; index++)
-      tempo3[index+max1] = tempo2[index] ; 
-    
-    fPrimary1 = tempo3[0] ; 
-    fPrimary2 = tempo3[1] ; 
-    fPrimary3 = tempo3[2] ; 
-
-  }
- // end of crummy stuff      
-
+  Float_t tempo = static_cast<Float_t>(fAmp) ; 
+  tempo *= factor ; 
+  fAmp = static_cast<Int_t>(TMath::Ceil(tempo)) ; 
   return *this ;
 }
 
@@ -193,11 +214,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.fPrimary1 << endl 
-      << "Primary 2 = " << digit.fPrimary2 << endl 
-      << "Primary 3 = " << digit.fPrimary3 << 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 ;
 }