X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=EMCAL%2FAliEMCALDigit.cxx;h=aac4743df10ab6903a0ad3ecdfa6e0e982923b38;hp=d02c196909a350f226451f1693fe4754c92960c1;hb=571d8329f83121a29e7e706a97c164dc70d4af70;hpb=ef73307738195c46240d27adb6fa526703ac6919 diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx index d02c196909a..aac4743df10 100644 --- a/EMCAL/AliEMCALDigit.cxx +++ b/EMCAL/AliEMCALDigit.cxx @@ -13,7 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* $Id: */ +/* $Id$ */ //_________________________________________________________________________ // EMCAL digit: @@ -27,98 +27,222 @@ //__________________________________________________________________________ // --- ROOT system --- +#include +#include // --- Standard library --- -#include - // --- AliRoot header files --- #include "AliEMCALDigit.h" #include "AliEMCALGeometry.h" -#include "AliEMCALGetter.h" - +#include "AliLog.h" +using std::cout; +using std::endl; ClassImp(AliEMCALDigit) //____________________________________________________________________________ - AliEMCALDigit::AliEMCALDigit() +AliEMCALDigit::AliEMCALDigit() : +AliDigitNew(), + fAmpFloat(0.), + fNSamples(0), + fSamples(0x0), + fNSamplesHG(0), + fSamplesHG(0x0), + fNprimary(0), + fNMaxPrimary(5), + fPrimary(0x0), + fDEPrimary(0x0), + fNiparent(0), + fNMaxiparent(5), + fIparent(0x0), + fDEParent(0x0), + fMaxIter(0), + fTime(0.), + fTimeR(0.), + fChi2(0.), + fNDF(0), + fDigitType(kUnknown), + fAmpCalib(-1) { // default ctor - fIndexInList = -1 ; - fNprimary = 0 ; - fNMaxPrimary = 0 ; - fNiparent = 0 ; - fNMaxiparent = 0; - fPrimary = 0 ; - fIparent = 0 ; + // 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, Float_t time, Int_t index) +AliEMCALDigit::AliEMCALDigit(Int_t primary, Int_t iparent, Int_t id, Float_t digEnergy, Float_t time, Int_t type, Int_t index, Float_t chi2, Int_t ndf, Float_t dE) + : AliDigitNew(), + fAmpFloat(digEnergy), + fNSamples(0), + fSamples(0x0), + fNSamplesHG(0), + fSamplesHG(0x0), + fNprimary(0), + fNMaxPrimary(25), + fPrimary(0x0), + fDEPrimary(0x0), + fNiparent(0), + fNMaxiparent(150), + fIparent(0x0), + fDEParent(0x0), + fMaxIter(5), + fTime(time), + fTimeR(time), + fChi2(chi2), + fNDF(ndf), + fDigitType(type), + fAmpCalib(-1) { // ctor with all data - fNMaxPrimary = 20 ; - fNMaxiparent = 40 ; //fNMaxPrimary*10; - fPrimary = new Int_t[fNMaxPrimary] ; - fIparent = new Int_t[fNMaxiparent] ; - fAmp = DigEnergy ; - fTime = time ; + // data memebrs of the base class (AliNewDigit) + fAmp = 0; fId = id ; fIndexInList = index ; + + // data member + 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 ; + 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 ( i =1; i< fNMaxiparent ; i++) + for ( i = 1; i< fNMaxiparent ; i++) { fIparent[i] = -1 ; + fDEParent[i] = 0 ; + } } //____________________________________________________________________________ AliEMCALDigit::AliEMCALDigit(const AliEMCALDigit & digit) + : AliDigitNew(digit), + fAmpFloat(digit.fAmpFloat), + fNSamples(digit.fNSamples), + fSamples(), + fNSamplesHG(digit.fNSamplesHG), + fSamplesHG(), + fNprimary(digit.fNprimary), + fNMaxPrimary(digit.fNMaxPrimary), + fPrimary(), + fDEPrimary(), + fNiparent(digit.fNiparent), + fNMaxiparent(digit.fNMaxiparent), + fIparent(), + fDEParent(), + fMaxIter(digit.fMaxIter), + fTime(digit.fTime), + fTimeR(digit.fTimeR), + fChi2(digit.fChi2), + fNDF(digit.fNDF), + fDigitType(digit.fDigitType), + fAmpCalib(digit.fAmpCalib) { // copy ctor - - - fNMaxPrimary = digit.fNMaxPrimary ; - fNMaxiparent = digit.fNMaxiparent ; - fPrimary = new Int_t[fNMaxPrimary] ; - fIparent = new Int_t[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 ; - fTime = digit.fTime ; fId = digit.fId; fIndexInList = digit.fIndexInList ; - fNprimary = digit.fNprimary ; - fNiparent = digit.fNiparent ; + + // data members + if (fSamples ) delete [] fSamples ; fSamples = NULL ; + if (fSamplesHG ) delete [] fSamplesHG ; fSamplesHG = NULL ; + if (fPrimary ) delete [] fPrimary ; fPrimary = NULL ; + if (fDEPrimary) delete [] fDEPrimary ; fDEPrimary = NULL ; + if (fIparent ) delete [] fIparent ; fIparent = NULL ; + if (fDEParent) delete [] fDEParent ; fDEParent = NULL ; + + if (fNSamples){ + fSamples = new Int_t[fNSamples]; + for (Int_t i=0; i < digit.fNSamples; i++) fSamples[i] = digit.fSamples[i]; + } + + if (fNSamplesHG){ + fSamplesHG = new Int_t[fNSamplesHG]; + for (Int_t i=0; i < digit.fNSamplesHG; i++) fSamplesHG[i] = digit.fSamplesHG[i]; + } + + + if (fNMaxPrimary){ + fPrimary = new Int_t [fNMaxPrimary] ; + fDEPrimary = new Float_t[fNMaxPrimary] ; + for ( Int_t i = 0; i < fNMaxPrimary ; i++) { + fPrimary[i] = digit.fPrimary[i] ; + fDEPrimary[i] = digit.fDEPrimary[i] ; + } + } + + if (fNMaxiparent){ + fIparent = new Int_t [fNMaxiparent] ; + fDEParent = new Float_t[fNMaxiparent] ; + for (Int_t 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 [] fIparent ; + // Delete array of primaries if any + + if (fSamples ) delete [] fSamples ; fSamples = NULL ; + if (fSamplesHG ) delete [] fSamplesHG ; fSamplesHG = NULL ; + if (fPrimary ) delete [] fPrimary ; fPrimary = NULL ; + if (fDEPrimary) delete [] fDEPrimary ; fDEPrimary = NULL ; + if (fIparent ) delete [] fIparent ; fIparent = NULL ; + if (fDEParent) delete [] fDEParent ; fDEParent = NULL ; + +} + + +//____________________________________________________________________________ +void AliEMCALDigit::Clear(const Option_t*) +{ + // Delete array of primaries if any + if (fSamples ) delete [] fSamples ; fSamples = NULL ; + if (fSamplesHG ) delete [] fSamplesHG ; fSamplesHG = NULL ; + if (fPrimary ) delete [] fPrimary ; fPrimary = NULL ; + if (fDEPrimary) delete [] fDEPrimary ; fDEPrimary = NULL ; + if (fIparent ) delete [] fIparent ; fIparent = NULL ; + if (fDEParent) delete [] fDEParent ; fDEParent = NULL ; + } //____________________________________________________________________________ @@ -127,7 +251,7 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const // Compares two digits with respect to its Id // to sort according increasing Id - Int_t rv ; + Int_t rv = 2 ; AliEMCALDigit * digit = (AliEMCALDigit *)obj ; @@ -145,35 +269,105 @@ Int_t AliEMCALDigit::Compare(const TObject * obj) const } //____________________________________________________________________________ -const Float_t AliEMCALDigit::GetEta() 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 = AliEMCALGetter::GetInstance()->EMCALGeometry(); + const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance(); g->EtaPhiFromIndex(id,eta,phi); return eta ; } //____________________________________________________________________________ -const Float_t AliEMCALDigit::GetPhi() const -{ +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 = AliEMCALGetter::GetInstance()->EMCALGeometry(); + const AliEMCALGeometry *g = AliEMCALGeometry::GetInstance(); g->EtaPhiFromIndex(id,eta,phi); return phi ; } +//____________________________________________________________________________ +Bool_t AliEMCALDigit::GetFALTROSample(const Int_t iSample, Int_t& timeBin, Int_t& amp) const +{ + //Get FALTRO sample in time bin iSample + if (iSample >= fNSamples || iSample < 0 || fDigitType==kTrigger) return kFALSE; + + amp = fSamples[iSample] & 0xFFF; + timeBin = (fSamples[iSample] >> 12) & 0xFF; + + return kTRUE; +} +//____________________________________________________________________________ +Bool_t AliEMCALDigit::GetALTROSampleLG(const Int_t iSample, Int_t& timeBin, Int_t& amp) const +{ + //Get Low Gain ALTRO sample in time bin iSample + if (iSample >= fNSamples || iSample < 0 || fDigitType==kLG) return kFALSE; + + amp = fSamples[iSample] & 0xFFF; + timeBin = (fSamples[iSample] >> 12) & 0xFF; + + return kTRUE; +} + +//____________________________________________________________________________ +void AliEMCALDigit::SetALTROSamplesLG(const Int_t nSamples, Int_t *samples) +{ + //Set array of ALTRO samples, Low Gain or FALTRO + fNSamples = nSamples; + fSamples = new Int_t[fNSamples]; + for (Int_t i=0; i < fNSamples; i++) fSamples[i] = samples[i]; +} + +//____________________________________________________________________________ +void AliEMCALDigit::SetALTROSamplesHG(const Int_t nSamples, Int_t *samples) +{ + //Set array of ALTRO samples, High Gain. + fNSamplesHG = nSamples; + fSamplesHG = new Int_t[fNSamplesHG]; + for (Int_t i=0; i < fNSamplesHG; i++) fSamplesHG[i] = samples[i]; +} + + +//____________________________________________________________________________ +Bool_t AliEMCALDigit::GetALTROSampleHG(const Int_t iSample, Int_t& timeBin, Int_t& amp) const +{ + //Get High Gain ALTRO sample in time bin iSample + if (iSample >= fNSamplesHG || iSample < 0 || fDigitType==kHG) return kFALSE; + + amp = fSamplesHG[iSample] & 0xFFF; + timeBin = (fSamplesHG[iSample] >> 12) & 0xFF; + + return kTRUE; +} + + //____________________________________________________________________________ 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 && index > 0){ - 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 ; } @@ -181,34 +375,103 @@ 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 ; } -//______________________________________________________________________ -const Bool_t AliEMCALDigit::IsInPreShower() const +//____________________________________________________________________________ +Float_t AliEMCALDigit::GetDEParent(Int_t index) const { - Bool_t rv = kFALSE ; - const AliEMCALGeometry * geom = AliEMCALGetter::GetInstance()->EMCALGeometry() ; - if( GetId() > (geom->GetNZ() * geom->GetNPhi() )) - rv = kTRUE; - return rv; -} + // 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 ; + 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){ - if(max1> Increase NMaxPrimary "<< endl ; - return *this ; + + TString mess = " NMaxPrimary = " ; + mess += fNMaxPrimary ; + mess += " is too small" ; + AliFatal(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){ - if(max2> Increase NMaxiparent "<< endl ; - return *this ; + + TString mess = " NMaxiparent = " ; + mess += fNMaxiparent ; + mess += " is too small" ; + AliFatal(mess.Data()) ; + } } } @@ -281,13 +560,23 @@ AliEMCALDigit& AliEMCALDigit::operator+(AliEMCALDigit const & digit) } //____________________________________________________________________________ -AliEMCALDigit& AliEMCALDigit::operator*(Float_t factor) +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)) ; + //Float_t tempo = static_cast(fAmp) ; + //tempo *= factor ; + //fAmp = static_cast(TMath::Floor(tempo)) ; + + fAmpFloat *= factor; + for (Int_t i=0; i < fNSamples ; i++) fSamples[i] = Int_t(factor*fSamples[i]); + for (Int_t i=0; i < fNSamplesHG; i++) fSamplesHG[i] = Int_t(factor*fSamplesHG[i]); + + for(Int_t i=0; i < fNprimary; i++) + fDEPrimary[i] *= factor; + for(Int_t i=0; i < fNiparent; i++) + fDEParent[i] *= factor; + return *this ; } @@ -297,14 +586,53 @@ ostream& operator << ( ostream& out , const AliEMCALDigit & digit) // Prints the data of the digit out << "ID " << digit.fId << " Energy = " << digit.fAmp << " Time = " << digit.fTime << endl ; - Int_t i,j ; - for(i=0;i