X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSDigit.cxx;h=193c61e21570461b5f9f158b3b97a571b91c19cd;hb=b671cde111ea27cfcc84c2768d76414018c75c38;hp=c137b5896e74c1e2193692eaffb9b0d2cb167351;hpb=2f04ed65d5949adfed4f99b4cc36732eeca851d9;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx index c137b5896e7..193c61e2157 100644 --- a/PHOS/AliPHOSDigit.cxx +++ b/PHOS/AliPHOSDigit.cxx @@ -15,87 +15,144 @@ /* $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 // 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 +// --- Standard library --- // --- AliRoot header files --- #include "AliPHOSDigit.h" + + ClassImp(AliPHOSDigit) //____________________________________________________________________________ - AliPHOSDigit::AliPHOSDigit() +AliPHOSDigit::AliPHOSDigit() : + AliDigitNew(), + fNprimary(0), + fPrimary(0x0), + fEnergy(0.), + fTime(0.), + fTimeR(0.) + { // default ctor +} + +//____________________________________________________________________________ +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 - fIndexInList = -1 ; - fNprimary = 0 ; - fNMaxPrimary = 5 ; + 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, Int_t DigEnergy, Int_t index) +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 - fNMaxPrimary = 5 ; - fAmp = DigEnergy ; + fAmp = 0 ; + fEnergy = energy ; + 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] = -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), + fNprimary(digit.fNprimary), + fPrimary(0), + fEnergy(digit.fEnergy), + fTime(digit.fTime), + fTimeR(digit.fTimeR) + { // copy ctor - - - fNMaxPrimary = digit.fNMaxPrimary ; - Int_t i ; - for ( i = 0; i < fNMaxPrimary ; i++) - fPrimary[i] = digit.fPrimary[i] ; + 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 ; fId = digit.fId; fIndexInList = digit.fIndexInList ; - fNprimary = digit.fNprimary ; } //____________________________________________________________________________ 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 @@ -122,14 +179,30 @@ 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(const Option_t *) const +{ + // Print the digit together with list of primaries + 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 0){ + Int_t *tmp = new Int_t[fNprimary+digit.fNprimary] ; + 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++) + 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 ; + fEnergy += digit.fEnergy ; + 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 index ; - for (index = 0 ; index < max2 ; index++) - fPrimary[index+max1] = (digit.fPrimary)[index] ; - } - else{ - cout << "AliPHOSDigit >> Increase NMaxPrimary"<< endl ; - Int_t index ; - for (index = max1; index < fNMaxPrimary ; index++) - fPrimary[index] = (digit.fPrimary)[index-max1] ; - fNprimary = fNMaxPrimary ; - } + Float_t tempo = static_cast(fAmp) ; + tempo *= factor ; + fAmp = static_cast(TMath::Ceil(tempo)) ; return *this ; } @@ -174,11 +261,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