X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSDigit.cxx;h=9b624fa6f0f440a3cafae7dfcd8539d85d3eda16;hb=382780d03323d825fd9e95f8eb3194b0d1ea5686;hp=1b3aeac89e58ef8e8f2e22b72ceb35004a037b67;hpb=de9ec31b399388ee561c458eaae1c4e22d829ff7;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSDigit.cxx b/PHOS/AliPHOSDigit.cxx index 1b3aeac89e5..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 --- @@ -44,21 +42,34 @@ ClassImp(AliPHOSDigit) { // default ctor - fNprimary = 0 ; - fPrimary1 = -1 ; - fPrimary2 = -1 ; - fPrimary3 = -1 ; + fIndexInList = -1 ; + fNprimary = 0 ; + fNMaxPrimary = 5 ; + fShiftOffset = 10000000 ; } //____________________________________________________________________________ -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 ; + fNMaxPrimary = 5 ; + fAmp = digEnergy ; + fTime = time ; + fId = id ; + fIndexInList = index ; + fShiftOffset = 10000000 ; + if( primary != -1){ + fNprimary = 1 ; + fPrimary[0] = primary ; + } + else{ //If the contribution of this primary smaller than fDigitThreshold (AliPHOSv1) + fNprimary = 0 ; + fPrimary[0] = -1 ; + } + Int_t i ; + for ( i = 1; i < fNMaxPrimary ; i++) + fPrimary[i] = -1 ; } //____________________________________________________________________________ @@ -66,21 +77,33 @@ AliPHOSDigit::AliPHOSDigit(const AliPHOSDigit & digit) { // copy ctor - fId = digit.fId; - fAmp = digit.fAmp ; - fNprimary = digit.fNprimary ; - fPrimary1 = digit.fPrimary1 ; - fPrimary2 = digit.fPrimary2 ; - fPrimary3 = digit.fPrimary3 ; + + 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 ; } //____________________________________________________________________________ -Int_t AliPHOSDigit::Compare(TObject * obj) +AliPHOSDigit::~AliPHOSDigit() +{ + // Delete array of primiries if any + +} + +//____________________________________________________________________________ +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 +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 > 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(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 digit.fTime) + fTime = digit.fTime ; - 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 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 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 - + return *this ; } @@ -193,11 +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.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