Moving to the new VMC naming convention

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

diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx
index c137b5896e74c1e2193692eaffb9b0d2cb167351..5c420613a212714dcd64af0e95dd417e57535457 100644 (file)
--- 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,18 +46,21 @@ ClassImp(AliPHOSDigit)
 
   fIndexInList = -1 ; 
   fNprimary    = 0 ;  
-  fNMaxPrimary = 5 ; 
+  fNMaxPrimary = 5 ;
+  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 ; 
-  fAmp         = DigEnergy ;
+  fAmp         = digEnergy ;
+  fTime        = time ;
   fId          = id ;
   fIndexInList = index ; 
+  fPrimary = new Int_t[fNMaxPrimary] ;
   if( primary != -1){
     fNprimary    = 1 ; 
     fPrimary[0]  = primary ;
@@ -78,10 +81,12 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit)
   
 
   fNMaxPrimary = digit.fNMaxPrimary ;  
+  fPrimary = new Int_t[fNMaxPrimary] ;
   Int_t i ;
   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 ;
@@ -91,11 +96,11 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit)
 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
@@ -122,14 +127,27 @@ Int_t AliPHOSDigit::GetPrimary(Int_t index) const
 {
   // retrieves the primary particle number given its index in the list 
   Int_t rv = -1 ;
-  if ( index <= fNprimary ){
+  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 ;
+  } 
+}
 //____________________________________________________________________________
 Bool_t AliPHOSDigit::operator==(AliPHOSDigit const & digit) const 
 {
@@ -148,24 +166,40 @@ AliPHOSDigit& AliPHOSDigit::operator+(AliPHOSDigit const & digit)
   // 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 + digit.fNprimary < fNMaxPrimary ) {
-    fNprimary += digit.fNprimary ; 
   
-    Int_t index ; 
-    for (index = 0 ; index < max2 ; index++)
-      fPrimary[index+max1] = (digit.fPrimary)[index] ; 
+  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) {
+       Error("Operator +", "Increase NMaxPrimary") ;
+       return *this ;
+      }
+    }
   }
-  else{
-    cout << "AliPHOSDigit >> Increase NMaxPrimary"<< endl ;
-    Int_t index ; 
-    for (index = max1; index < fNMaxPrimary ; index++)
-      fPrimary[index] = (digit.fPrimary)[index-max1] ; 
-    fNprimary = fNMaxPrimary ;
-  }  
+  
+  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 ;
 }
 
@@ -174,11 +208,12 @@ ostream& operator << ( ostream& out , const AliPHOSDigit & digit)
 {
   // Prints the data of the digit
   
-  out << "ID " << digit.fId << " Energy = " << digit.fAmp << 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 ; 
+//   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 ;
 }