X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALDigit.cxx;h=9617673738bec00ec01370fbcf954d64c4e7c46e;hb=b185eb38d4645d9ec081dd876e234f0a4a7805f9;hp=49ecc78f3cb4bef985a27306aa8649492f5e811c;hpb=61e0abb5c9bbd6e578ed6769602e4d9bb80ba13e;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx index 49ecc78f3cb..9617673738b 100644 --- a/EMCAL/AliEMCALDigit.cxx +++ b/EMCAL/AliEMCALDigit.cxx @@ -16,99 +16,165 @@ /* $Id$ */ //_________________________________________________________________________ -// EMCAL 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 EMCAL 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!) +// EMCAL digit: +// A Digit is the sum of the energy lost in an EMCAL Tower +// It also stores information on Primary, and enterring particle +// tracknumbers Digits are created using AliEMCALSDigitizer, followed +// by AliEMCALDigitizer // -//*-- Author: Laurent Aphecetche & Yves Schutz (SUBATECH) - +//*-- Author: Sahal Yacoob (LBL) +// based on : AliPHOSDigit +//__________________________________________________________________________ // --- ROOT system --- +#include +#include // --- Standard library --- -#include - // --- AliRoot header files --- #include "AliEMCALDigit.h" - +#include "AliEMCALGeometry.h" ClassImp(AliEMCALDigit) //____________________________________________________________________________ - AliEMCALDigit::AliEMCALDigit() +AliEMCALDigit::AliEMCALDigit() : + AliDigitNew(), + fNprimary(0), + fNMaxPrimary(5), + fPrimary(0x0), + fDEPrimary(0x0), + fNiparent(0), + fNMaxiparent(5), + fIparent(0x0), + fDEParent(0x0), + fMaxIter(0), + fTime(0.), + fTimeR(0.) + { // default ctor - fIndexInList = -1 ; - fNprimary = 0 ; - fNMaxPrimary = 5 ; - fNiparent = 0 ; - fNMaxiparent = fNMaxPrimary*10; + // Need to initialise for reading old files + fPrimary = new Int_t[fNMaxPrimary] ; + fDEPrimary = new Float_t[fNMaxPrimary] ; + fIparent = new Int_t[fNMaxiparent] ; + fDEParent = new Float_t[fNMaxiparent] ; + for ( Int_t i = 0; i < fNMaxPrimary ; i++) { + fPrimary[i] = -1 ; + fDEPrimary[i] = 0 ; + } + + for ( Int_t i = 0; i < fNMaxiparent ; i++) { + fIparent[i] = -1 ; + fDEParent[i] = 0 ; + } } //____________________________________________________________________________ -AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEnergy, Int_t index) +AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Int_t DigEnergy, Float_t time, Int_t index, Float_t dE) + : AliDigitNew(), + fNprimary(0), + fNMaxPrimary(25), + fPrimary(0x0), + fDEPrimary(0x0), + fNiparent(0), + fNMaxiparent(150), + fIparent(0x0), + fDEParent(0x0), + fMaxIter(5), + fTime(time), + fTimeR(time) { // ctor with all data - fNMaxPrimary = 5 ; - fNMaxiparent = fNMaxPrimary*10; + // data memebrs of the base class (AliNewDigit) fAmp = DigEnergy ; fId = id ; fIndexInList = index ; + + // data members + fPrimary = new Int_t[fNMaxPrimary] ; + fDEPrimary = new Float_t[fNMaxPrimary] ; + fIparent = new Int_t[fNMaxiparent] ; + fDEParent = new Float_t[fNMaxiparent] ; if( primary != -1){ fNprimary = 1 ; - fPrimary[0] = primary ; + fPrimary[0] = primary ; + fDEPrimary[0] = dE ; fNiparent = 1 ; fIparent[0] = iparent ; - + fDEParent[0] = dE ; } else{ //If the contribution of this primary smaller than fDigitThreshold (AliEMCALv1) fNprimary = 0 ; fPrimary[0] = -1 ; + fDEPrimary[0] = 0 ; fNiparent = 0 ; - fIparent[0] = -1 ; - + fIparent[0] = -1 ; + fDEParent[0] = 0 ; } Int_t i ; - for ( i = 1; i < fNMaxPrimary ; i++) + for ( i = 1; i < fNMaxPrimary ; i++) { fPrimary[i] = -1 ; + fDEPrimary[i] = 0 ; + } - for ( Int_t j =1; j< fNMaxiparent ; j++) - fIparent[j] = -1 ; + for ( i = 1; i< fNMaxiparent ; i++) { + fIparent[i] = -1 ; + fDEParent[i] = 0 ; + } } //____________________________________________________________________________ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) + : AliDigitNew(digit), + fNprimary(digit.fNprimary), + fNMaxPrimary(digit.fNMaxPrimary), + fPrimary(0x0), + fDEPrimary(0x0), + fNiparent(digit.fNiparent), + fNMaxiparent(digit.fNMaxiparent), + fIparent(0x0), + fDEParent(0x0), + fMaxIter(digit.fMaxIter), + fTime(digit.fTime), + fTimeR(digit.fTimeR) { // copy ctor - - fNMaxPrimary = digit.fNMaxPrimary ; - fNMaxiparent = digit.fNMaxiparent ; - Int_t i ; - for ( i = 0; i < fNMaxPrimary ; i++) - fPrimary[i] = digit.fPrimary[i] ; - Int_t j ; - for (j = 0; j< fNMaxiparent ; j++) - fIparent[j] = digit.fIparent[j] ; + // data memebrs of the base class (AliNewDigit) fAmp = digit.fAmp ; fId = digit.fId; fIndexInList = digit.fIndexInList ; - fNprimary = digit.fNprimary ; - fNiparent = digit.fNiparent ; + + // data members + fPrimary = new Int_t[fNMaxPrimary] ; + fDEPrimary = new Float_t[fNMaxPrimary] ; + fIparent = new Int_t[fNMaxiparent] ; + fDEParent = new Float_t[fNMaxiparent] ; + Int_t i ; + for ( i = 0; i < fNMaxPrimary ; i++) { + fPrimary[i] = digit.fPrimary[i] ; + fDEPrimary[i] = digit.fDEPrimary[i] ; + } + Int_t j ; + for (j = 0; j< fNMaxiparent ; j++) { + fIparent[j] = digit.fIparent[j] ; + fDEParent[j] = digit.fDEParent[j] ; + } } //____________________________________________________________________________ AliEMCALDigit::~AliEMCALDigit() { // Delete array of primiries if any - + delete [] fPrimary ; + delete [] fDEPrimary ; + delete [] fIparent ; + delete [] fDEParent ; } //____________________________________________________________________________ @@ -134,16 +200,51 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const } +//____________________________________________________________________________ +Float_t AliEMCALDigit::GetEta() const +{ + //return pseudorapidity for this digit + // should be change in EMCALGeometry - 19-nov-04 + Float_t eta=-10., phi=-10.; + Int_t id = GetId(); + const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance(); + g->EtaPhiFromIndex(id,eta,phi); + return eta ; +} + +//____________________________________________________________________________ +Float_t AliEMCALDigit::GetPhi() const +{ + //return phi coordinate of digit + // should be change in EMCALGeometry - 19-nov-04 + Float_t eta=-10., phi=-10.; + Int_t id = GetId(); + const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance(); + g->EtaPhiFromIndex(id,eta,phi); + return phi ; +} + //____________________________________________________________________________ Int_t AliEMCALDigit::GetPrimary(Int_t index) const { // retrieves the primary particle number given its index in the list - Int_t rv = -1 ; - if ( index <= fNprimary ){ - rv = fPrimary[index-1] ; + if ( (index <= fNprimary) && (index > 0)){ + return fPrimary[index-1] ; } - return rv ; + return -1 ; +} + +//____________________________________________________________________________ +Float_t AliEMCALDigit::GetDEPrimary(Int_t index) const +{ + // retrieves the primary particle energy contribution + // given its index in the list + if ( (index <= fNprimary) && (index > 0)){ + return fDEPrimary[index-1] ; + } + + return 0 ; } @@ -151,19 +252,29 @@ Int_t AliEMCALDigit::GetPrimary(Int_t index) const Int_t AliEMCALDigit::GetIparent(Int_t index) const { // retrieves the primary particle number given its index in the list - Int_t rv = -1 ; - if ( index <= fNiparent ){ - rv = fIparent[index-1] ; + if ( index <= fNiparent && index > 0){ + return fIparent[index-1] ; } - return rv ; + return -1 ; } +//____________________________________________________________________________ +Float_t AliEMCALDigit::GetDEParent(Int_t index) const +{ + // retrieves the parent particle energy contribution + // given its index in the list + if ( (index <= fNiparent) && (index > 0)){ + return fDEParent[index-1] ; + } + + return 0; +} //____________________________________________________________________________ void AliEMCALDigit::ShiftPrimary(Int_t shift){ - //shifts primary nimber to BIG offset, to separate primary in different TreeK + //shifts primary number to BIG offset, to separate primary in different TreeK Int_t index ; for(index = 0; index digit.fTime) + fTime = digit.fTime ; + if (digit.fTimeR < fTimeR) + fTimeR = digit.fTimeR ; + Int_t max1 = fNprimary ; Int_t max2 = fNiparent ; Int_t index ; - for (index = 0 ; index < digit.fNprimary ; index++){ - Bool_t deja = kTRUE ; + for (index = 0 ; index < digit.fNprimary ; index++){ + Bool_t newPrim = kTRUE ; Int_t old ; - for ( old = 0 ; (old < max1) && deja; old++) { //already have this primary? - if(fPrimary[old] == (digit.fPrimary)[index]) - deja = kFALSE; + for ( old = 0 ; (old < max1) && newPrim; old++) { //already have this primary? + if(fPrimary[old] == digit.fPrimary[index]) { + newPrim = kFALSE; + fDEPrimary[old] += digit.fDEPrimary[index]; + } } - if(deja){ - fPrimary[fNprimary] = (digit.fPrimary)[index] ; - fNprimary++ ; - if(fNprimary>fNMaxPrimary) { - cout << "AliEMCALDigit >> Increase NMaxPrimary "<< endl ; - return *this ; + if (newPrim) { + if(max1" , mess.Data()) ; + } } } for (index = 0 ; index < digit.fNiparent ; index++){ - Bool_t dejavu = kTRUE ; + Bool_t newParent = kTRUE ; Int_t old ; - for ( old = 0 ; (old < max2) && dejavu; old++) { //already have this primary? - if(fIparent[old] == (digit.fIparent)[index]) - dejavu = kFALSE; + for ( old = 0 ; (old < max2) && newParent; old++) { //already have this primary? + if(fIparent[old] == digit.fIparent[index]) { + newParent = kFALSE; + fDEParent[old] += digit.fDEParent[index]; + } } - if(dejavu){ - fIparent[fNiparent] = (digit.fIparent)[index] ; - fNiparent++ ; - if(fNiparent>fNMaxiparent) { - cout << "AliEMCALDigit >> Increase NMaxiparent "<< endl ; - return *this ; + if(newParent){ + if(max2", mess.Data()) ; + } } } @@ -229,19 +364,37 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit) return *this ; } +//____________________________________________________________________________ +AliEMCALDigit AliEMCALDigit::operator*(Float_t factor) +{ + // Multiplies the amplitude by a factor + + Float_t tempo = static_cast(fAmp) ; + tempo *= factor ; + fAmp = static_cast(TMath::Ceil(tempo)) ; + for(Int_t i=0; i < fNprimary; i++) + fDEPrimary[i] *= factor; + for(Int_t i=0; i < fNiparent; i++) + fDEParent[i] *= factor; + + return *this ; +} + //____________________________________________________________________________ ostream& operator << ( ostream& out , const AliEMCALDigit & digit) { // Prints the data of the digit - out << "ID " << digit.fId << " Energy = " << digit.fAmp << endl ; + out << "ID " << digit.fId << " Energy = " << digit.fAmp << " Time = " << digit.fTime << endl ; Int_t i,j ; - for(i=0;i