X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PMD%2FAliPMDDigitizer.cxx;h=d77c940d4097a40d4e2ba42434259466fcbee49c;hb=bc7a3220317e400f77f282d71c4e4a5ce4dd5e92;hp=3bb052adfb398b76828c3b90c625fde0dfd52405;hpb=d934d2578e7cb4b77f8144a7153aa6e478f64809;p=u%2Fmrichter%2FAliRoot.git diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx index 3bb052adfb3..d77c940d409 100644 --- a/PMD/AliPMDDigitizer.cxx +++ b/PMD/AliPMDDigitizer.cxx @@ -21,7 +21,10 @@ //-----------------------------------------------------// #include +#include +#include #include +#include #include #include #include @@ -37,7 +40,7 @@ #include "AliLoader.h" #include "AliConfig.h" #include "AliMagF.h" -#include "AliRunDigitizer.h" +#include "AliDigitizationInput.h" #include "AliDigitizer.h" #include "AliHeader.h" #include "AliCDBManager.h" @@ -81,12 +84,14 @@ AliPMDDigitizer::AliPMDDigitizer() : { for (Int_t k = 0; k < fgkCol; k++) { - fCPV[i][j][k] = 0.; - fPRE[i][j][k] = 0.; - fCPVCounter[i][j][k] = 0; - fPRECounter[i][j][k] = 0; - fCPVTrackNo[i][j][k] = -1; - fPRETrackNo[i][j][k] = -1; + fCPV[i][j][k] = 0.; + fPRE[i][j][k] = 0.; + fCPVCounter[i][j][k] = 0; + fPRECounter[i][j][k] = 0; + fCPVTrackNo[i][j][k] = -1; + fPRETrackNo[i][j][k] = -1; + fCPVTrackPid[i][j][k] = -1; + fPRETrackPid[i][j][k] = -1; } } } @@ -123,8 +128,8 @@ AliPMDDigitizer & AliPMDDigitizer::operator=(const AliPMDDigitizer& /*digitizer* return *this; } //____________________________________________________________________________ -AliPMDDigitizer::AliPMDDigitizer(AliRunDigitizer* manager): - AliDigitizer(manager), +AliPMDDigitizer::AliPMDDigitizer(AliDigitizationInput* digInput): + AliDigitizer(digInput), fRunLoader(0), fPMDHit(0), fPMD(0), @@ -149,12 +154,14 @@ AliPMDDigitizer::AliPMDDigitizer(AliRunDigitizer* manager): { for (Int_t k = 0; k < fgkCol; k++) { - fCPV[i][j][k] = 0.; - fPRE[i][j][k] = 0.; - fCPVCounter[i][j][k] = 0; - fPRECounter[i][j][k] = 0; - fCPVTrackNo[i][j][k] = -1; - fPRETrackNo[i][j][k] = -1; + fCPV[i][j][k] = 0.; + fPRE[i][j][k] = 0.; + fCPVCounter[i][j][k] = 0; + fPRECounter[i][j][k] = 0; + fCPVTrackNo[i][j][k] = -1; + fPRETrackNo[i][j][k] = -1; + fCPVTrackPid[i][j][k] = -1; + fPRETrackPid[i][j][k] = -1; } } } @@ -254,16 +261,16 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) const Int_t kPi0 = 111; const Int_t kGamma = 22; - Int_t npmd; - Int_t trackno; - Int_t smnumber; - Int_t trackpid; - Int_t mtrackno; - Int_t mtrackpid; - - Float_t xPos, yPos, zPos; + Int_t npmd = 0; + Int_t trackno = 0; + Int_t smnumber = 0; + Int_t trackpid = 0; + Int_t mtrackno = 0; + Int_t mtrackpid = 0; + + Float_t xPos = 0., yPos = 0., zPos = 0.; Int_t xpad = -1, ypad = -1; - Float_t edep; + Float_t edep = 0.; Float_t vx = -999.0, vy = -999.0, vz = -999.0; @@ -273,6 +280,9 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) AliDebug(1,Form("Event Number = %d",ievt)); Int_t nparticles = fRunLoader->GetHeader()->GetNtrack(); AliDebug(1,Form("Number of Particles = %d",nparticles)); + + // + fRunLoader->GetEvent(ievt); // ------------------------------------------------------- // // Pointer to specific detector hits. @@ -322,9 +332,8 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) statusOld = -1; } Int_t igstatus = 0; - //------------------modified by Mriganka ---------------------- - Int_t trnotemp = trackno; - + + Int_t trnotemp = trackno; // Modified on 25th Nov 2009 if(ks==1||(imo = mparticle->GetFirstMother())<0 ){ vx = mparticle->Vx(); vy = mparticle->Vy(); @@ -333,6 +342,8 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) if(trackpid==kGamma||trackpid==11||trackpid==-11|| trackpid==kPi0)igstatus=1; } + + while(((imo = mparticle->GetFirstMother()) >= 0)&& (ks = mparticle->GetStatusCode() <1) ) { @@ -342,6 +353,9 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) vx = mparticle->Vx(); vy = mparticle->Vy(); vz = mparticle->Vz(); + + // Modified on 25th Nov 2009 + trnotemp = trackno; if(trackpid == 111) { @@ -349,27 +363,30 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) } if(trackpid != 111) { - trackno = imo; + trackno=imo; } + // end of modification on 25th Nov 2009 } - + if(trackpid==kGamma||trackpid==11||trackpid==-11|| trackpid==kPi0)igstatus=1; mtrackpid=trackpid; mtrackno=trackno; trackpid=trackpidOld; trackno=tracknoOld; - //-----------------end of modification---------------- + //-----------------end of modification---------------- + Float_t ptime = fPMDHit->GetTime()*1e6; // time in microsec + if (ptime < 0. || ptime > 1.2) continue; + xPos = fPMDHit->X(); yPos = fPMDHit->Y(); zPos = fPMDHit->Z(); - + edep = fPMDHit->GetEnergy(); Int_t vol1 = fPMDHit->GetVolume(1); // Column Int_t vol2 = fPMDHit->GetVolume(2); // Row - Int_t vol7 = fPMDHit->GetVolume(7); // UnitModule - Int_t vol8 = fPMDHit->GetVolume(8); // SuperModule + Int_t vol7 = fPMDHit->GetVolume(4); // Serial Module No // -----------------------------------------// @@ -380,9 +397,15 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) // nrow = 96, ncol = 48 // // -----------------------------------------// - - - smnumber = (vol8-1)*6 + vol7; + if (vol7 < 24) + { + smnumber = vol7; + } + else + { + smnumber = vol7 - 24; + } + Int_t vol8 = smnumber/6 + 1; // fake supermodule if (vol8 == 1 || vol8 == 2) { @@ -396,18 +419,19 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) } AliDebug(2,Form("Zposition = %f Edeposition = %f",zPos,edep)); - //Float_t zposition = TMath::Abs(zPos); - if (zPos < fZPos) + + if (vol7 < 24) { - // CPV - fDetNo = 1; + // PRE + fDetNo = 0; } - else if (zPos > fZPos) + else { - // PMD - fDetNo = 0; + // CPV + fDetNo = 1; } - Int_t smn = smnumber - 1; + + Int_t smn = smnumber; Int_t ixx = xpad - 1; Int_t iyy = ypad - 1; if (fDetNo == 0) @@ -435,6 +459,7 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) Float_t deltaE = 0.; Int_t detno = 0; Int_t trno = -1; + Int_t trpid = -99; for (Int_t idet = 0; idet < 2; idet++) { @@ -458,7 +483,10 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt) } if (deltaE > 0.) { - AddSDigit(trno,detno,ism,jrow,kcol,deltaE); + // Natasha + TParticle *mparticle = gAlice->GetMCApp()->Particle(trno); + trpid = mparticle->GetPdgCode(); + AddSDigit(trno,trpid,detno,ism,jrow,kcol,deltaE); } } } @@ -478,16 +506,16 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) // const Int_t kPi0 = 111; const Int_t kGamma = 22; - Int_t npmd; - Int_t trackno; - Int_t smnumber; - Int_t trackpid; - Int_t mtrackno; - Int_t mtrackpid; - - Float_t xPos, yPos, zPos; + Int_t npmd = 0; + Int_t trackno = 0; + Int_t smnumber = 0; + Int_t trackpid = 0; + Int_t mtrackno = 0; + Int_t mtrackpid = 0; + + Float_t xPos = 0., yPos = 0., zPos = 0.; Int_t xpad = -1, ypad = -1; - Float_t edep; + Float_t edep = 0.; Float_t vx = -999.0, vy = -999.0, vz = -999.0; if (!fDigits) fDigits = new TClonesArray("AliPMDdigit", 1000); @@ -496,6 +524,7 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) AliDebug(1,Form("Event Number = %d",ievt)); Int_t nparticles = fRunLoader->GetHeader()->GetNtrack(); AliDebug(1,Form("Number of Particles = %d", nparticles)); + fRunLoader->GetEvent(ievt); // ------------------------------------------------------- // // Pointer to specific detector hits. @@ -554,8 +583,8 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) } Int_t igstatus = 0; - //-----------------------modified by Mriganka ------------------ - Int_t trnotemp = trackno; + + Int_t trnotemp = trackno; // modified on 25th Nov 2009 if(ks==1||(imo = mparticle->GetFirstMother())<0 ){ vx = mparticle->Vx(); vy = mparticle->Vy(); @@ -575,6 +604,9 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) vx = mparticle->Vx(); vy = mparticle->Vy(); vz = mparticle->Vz(); + + // Modified on 25th Nov 2009 + trnotemp = trackno; if(trackpid == 111) { @@ -582,7 +614,7 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) } if(trackpid != 111) { - trackno = imo; + trackno=imo; } } @@ -592,17 +624,17 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) mtrackno=trackno; trackpid=trackpidOld; trackno=tracknoOld; + + Float_t ptime = fPMDHit->GetTime()*1e6; + if (ptime < 0. || ptime > 1.2) continue; - //-----------------end of modification---------------- xPos = fPMDHit->X(); yPos = fPMDHit->Y(); zPos = fPMDHit->Z(); edep = fPMDHit->GetEnergy(); Int_t vol1 = fPMDHit->GetVolume(1); // Column Int_t vol2 = fPMDHit->GetVolume(2); // Row - Int_t vol7 = fPMDHit->GetVolume(7); // UnitModule - Int_t vol8 = fPMDHit->GetVolume(8); // SuperModule - + Int_t vol7 = fPMDHit->GetVolume(4); // Serial Module No // -----------------------------------------// // In new geometry after adding electronics // @@ -612,7 +644,15 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) // nrow = 96, ncol = 48 // // -----------------------------------------// - smnumber = (vol8-1)*6 + vol7; + if (vol7 < 24) + { + smnumber = vol7; + } + else + { + smnumber = vol7 - 24; + } + Int_t vol8 = smnumber/6 + 1; // fake supermodule if (vol8 == 1 || vol8 == 2) { @@ -625,21 +665,19 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) ypad = vol2; } - AliDebug(2,Form("ZPosition = %f Edeposition = %d",zPos,edep)); - //Float_t zposition = TMath::Abs(zPos); + AliDebug(2,Form("ZPosition = %f Edeposition = %f",zPos,edep)); - if (zPos < fZPos) + if (vol7 < 24) { - // CPV - fDetNo = 1; + // PRE + fDetNo = 0; } - else if (zPos > fZPos) + else { - // PMD - fDetNo = 0; + fDetNo = 1; } - Int_t smn = smnumber - 1; + Int_t smn = smnumber; Int_t ixx = xpad - 1; Int_t iyy = ypad - 1; if (fDetNo == 0) @@ -665,11 +703,13 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) TrackAssignment2Cell(); ResetCell(); - Float_t gain1; - Float_t adc; + Float_t gain1 = 1.; + Float_t adc = 0. ; Float_t deltaE = 0.; - Int_t detno = 0; - Int_t trno = 1; + Int_t detno = 0; + Int_t trno = 1; + Int_t trpid = -99; + for (Int_t idet = 0; idet < 2; idet++) { for (Int_t ism = 0; ism < fgkTotUM; ism++) @@ -682,13 +722,13 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) { deltaE = fPRE[ism][jrow][kcol]; trno = fPRETrackNo[ism][jrow][kcol]; - detno = 0; + detno = 0; } else if (idet == 1) { deltaE = fCPV[ism][jrow][kcol]; trno = fCPVTrackNo[ism][jrow][kcol]; - detno = 1; + detno = 1; } if (deltaE > 0.) { @@ -717,7 +757,11 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) if (adc > 0.) { adc += (pedmean + 3.0*pedrms); - AddDigit(trno,detno,ism,jrow,kcol,adc); + TParticle *mparticle + = gAlice->GetMCApp()->Particle(trno); + trpid = mparticle->GetPdgCode(); + + AddDigit(trno,trpid,detno,ism,jrow,kcol,adc); } } } // column loop @@ -729,7 +773,7 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt) fPMDLoader->WriteDigits("OVERWRITE"); ResetCellADC(); - + } //____________________________________________________________________________ @@ -763,9 +807,9 @@ void AliPMDDigitizer::SDigits2Digits(Int_t ievt) if (!fDigits) fDigits = new TClonesArray("AliPMDdigit", 1000); treeD->Branch("PMDDigit", &fDigits, bufsize); - Int_t trno, det, smn; - Int_t irow, icol; - Float_t edep, adc; + Int_t trno = 1, trpid = 0, det = 0, smn = 0; + Int_t irow = 0, icol = 0; + Float_t edep = 0., adc = 0.; Int_t nmodules = (Int_t) treeS->GetEntries(); AliDebug(1,Form("Number of modules = %d",nmodules)); @@ -779,6 +823,7 @@ void AliPMDDigitizer::SDigits2Digits(Int_t ievt) { pmdsdigit = (AliPMDsdigit*)fSDigits->UncheckedAt(ient); trno = pmdsdigit->GetTrackNumber(); + trpid = pmdsdigit->GetTrackPid(); det = pmdsdigit->GetDetector(); smn = pmdsdigit->GetSMNumber(); irow = pmdsdigit->GetRow(); @@ -807,7 +852,7 @@ void AliPMDDigitizer::SDigits2Digits(Int_t ievt) if(adc > 0.) { adc += (pedmean + 3.0*pedrms); - AddDigit(trno,det,smn,irow,icol,adc); + AddDigit(trno,trpid,det,smn,irow,icol,adc); } } @@ -818,7 +863,7 @@ void AliPMDDigitizer::SDigits2Digits(Int_t ievt) } //____________________________________________________________________________ -void AliPMDDigitizer::Exec(Option_t *option) +void AliPMDDigitizer::Digitize(Option_t *option) { // Does the event merging and digitization const char *cdeb = strstr(option,"deb"); @@ -827,17 +872,17 @@ void AliPMDDigitizer::Exec(Option_t *option) AliDebug(100," *** PMD Exec is called ***"); } - Int_t ninputs = fManager->GetNinputs(); + Int_t ninputs = fDigInput->GetNinputs(); AliDebug(1,Form("Number of files to be processed = %d",ninputs)); ResetCellADC(); for (Int_t i = 0; i < ninputs; i++) { - Int_t troffset = fManager->GetMask(i); + Int_t troffset = fDigInput->GetMask(i); MergeSDigits(i, troffset); } - fRunLoader = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName()); + fRunLoader = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName()); fPMD = (AliPMD*)gAlice->GetDetector("PMD"); fPMDLoader = fRunLoader->GetLoader("PMDLoader"); if (fPMDLoader == 0x0) @@ -855,10 +900,11 @@ void AliPMDDigitizer::Exec(Option_t *option) if (!fDigits) fDigits = new TClonesArray("AliPMDdigit", 1000); treeD->Branch("PMDDigit", &fDigits, bufsize); - Float_t adc; + Float_t adc = 0.; Float_t deltaE = 0.; - Int_t detno = 0; - Int_t trno = 1; + Int_t detno = 0; + Int_t trno = 1; + Int_t trpid = -99; for (Int_t idet = 0; idet < 2; idet++) { @@ -872,13 +918,15 @@ void AliPMDDigitizer::Exec(Option_t *option) { deltaE = fPRE[ism][jrow][kcol]; trno = fPRETrackNo[ism][jrow][kcol]; - detno = 0; + trpid = fPRETrackPid[ism][jrow][kcol]; + detno = 0; } else if (idet == 1) { deltaE = fCPV[ism][jrow][kcol]; trno = fCPVTrackNo[ism][jrow][kcol]; - detno = 1; + trpid = fCPVTrackPid[ism][jrow][kcol]; + detno = 1; } if (deltaE > 0.) { @@ -908,7 +956,7 @@ void AliPMDDigitizer::Exec(Option_t *option) if (adc > 0.) { adc += (pedmean + 3.0*pedrms); - AddDigit(trno,detno,ism,jrow,kcol,adc); + AddDigit(trno,trpid,detno,ism,jrow,kcol,adc); } } @@ -931,7 +979,7 @@ void AliPMDDigitizer::TrackAssignment2CPVCell() // This method added by Ajay Bool_t jsort = false; - Int_t i, j, k; + Int_t i = 0, j = 0, k = 0; Int_t *status1; Int_t *status2; @@ -984,8 +1032,8 @@ void AliPMDDigitizer::TrackAssignment2CPVCell() Int_t nentries = fCPVCell.GetEntries(); - Int_t mtrackno, ism, ixp, iyp; - Float_t edep; + Int_t mtrackno = 0, ism = 0, ixp = 0, iyp = 0; + Float_t edep = 0.; for (i = 0; i < nentries; i++) { AliPMDcell* cpvcell = (AliPMDcell*)fCPVCell.UncheckedAt(i); @@ -1001,9 +1049,9 @@ void AliPMDDigitizer::TrackAssignment2CPVCell() fCPVCounter[ism][ixp][iyp]++; } - Int_t iz, il; - Int_t im, ix, iy; - Int_t nn; + Int_t iz = 0, il = 0; + Int_t im = 0, ix = 0, iy = 0; + Int_t nn = 0; for (im=0; imGetInputFolderName(filenumber)); + fRunLoader = AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(filenumber)); fPMDLoader = fRunLoader->GetLoader("PMDLoader"); fPMDLoader->LoadSDigits("read"); TTree* treeS = fPMDLoader->TreeS(); @@ -1136,9 +1184,9 @@ void AliPMDDigitizer::MergeSDigits(Int_t filenumber, Int_t troffset) if (!fSDigits) fSDigits = new TClonesArray("AliPMDsdigit", 1000); branch->SetAddress(&fSDigits); - Int_t itrackno, idet, ism; - Int_t ixp, iyp; - Float_t edep; + Int_t itrackno = 1, itrackpid = 0, idet = 0, ism = 0; + Int_t ixp = 0, iyp = 0; + Float_t edep = 0.; Int_t nmodules = (Int_t) treeS->GetEntries(); AliDebug(1,Form("Number of Modules in the treeS = %d",nmodules)); AliDebug(1,Form("Track Offset = %d",troffset)); @@ -1151,6 +1199,7 @@ void AliPMDDigitizer::MergeSDigits(Int_t filenumber, Int_t troffset) { pmdsdigit = (AliPMDsdigit*)fSDigits->UncheckedAt(ient); itrackno = pmdsdigit->GetTrackNumber(); + itrackpid = pmdsdigit->GetTrackPid(); idet = pmdsdigit->GetDetector(); ism = pmdsdigit->GetSMNumber(); ixp = pmdsdigit->GetRow(); @@ -1161,6 +1210,7 @@ void AliPMDDigitizer::MergeSDigits(Int_t filenumber, Int_t troffset) if (fPRE[ism][ixp][iyp] < edep) { fPRETrackNo[ism][ixp][iyp] = troffset + itrackno; + fPRETrackPid[ism][ixp][iyp] = itrackpid; } fPRE[ism][ixp][iyp] += edep; } @@ -1169,6 +1219,7 @@ void AliPMDDigitizer::MergeSDigits(Int_t filenumber, Int_t troffset) if (fCPV[ism][ixp][iyp] < edep) { fCPVTrackNo[ism][ixp][iyp] = troffset + itrackno; + fCPVTrackPid[ism][ixp][iyp] = itrackpid; } fCPV[ism][ixp][iyp] += edep; } @@ -1186,7 +1237,7 @@ void AliPMDDigitizer::TrackAssignment2Cell() // Bool_t jsort = false; - Int_t i, j, k; + Int_t i = 0, j = 0, k = 0; Int_t *status1; Int_t *status2; @@ -1258,9 +1309,9 @@ void AliPMDDigitizer::TrackAssignment2Cell() fPRECounter[ism][ixp][iyp]++; } - Int_t iz, il; - Int_t im, ix, iy; - Int_t nn; + Int_t iz = 0, il = 0; + Int_t im = 0, ix = 0, iy = 0; + Int_t nn = 0; for (im=0; imGaus(kConstant,kErConstant); - Float_t slop = gRandom->Gaus(kSlope,kErSlope); + // MPV data used for the fit and taken here + + // constants are from Test Beam 2010 - Float_t adc12bit = slop*mev*0.001 + cons; + const Float_t kConstant = 0.612796; + const Float_t kSlope = 130.158; - - if(adc12bit < 1600.0) + Float_t adc12bit = kSlope*mev*0.001 + kConstant; + if (adc12bit < 0.) adc12bit = 0.; + + //Introducing Readout Resolution for ALICE-PMD + + Float_t sigrr = 0.605016 - 0.000273*adc12bit + 6.54e-8*adc12bit*adc12bit; + Float_t adcwithrr = gRandom->Gaus(adc12bit,sigrr); + + if(adcwithrr < 0.) + { + adc = 0.; + } + else if(adcwithrr >= 0. && adcwithrr < 1600.0) { - adc = (Float_t) adc12bit; + adc = adcwithrr; } - else if (adc12bit >= 1600.0) + else if (adcwithrr >= 1600.0) { adc = 1600.0; } + } //____________________________________________________________________________ -void AliPMDDigitizer::AddSDigit(Int_t trnumber, Int_t det, Int_t smnumber, - Int_t irow, Int_t icol, Float_t adc) +void AliPMDDigitizer::AddSDigit(Int_t trnumber, Int_t trpid, Int_t det, + Int_t smnumber, Int_t irow, Int_t icol, + Float_t adc) { // Add SDigit // if (!fSDigits) fSDigits = new TClonesArray("AliPMDsdigit", 1000); TClonesArray &lsdigits = *fSDigits; - new(lsdigits[fNsdigit++]) AliPMDsdigit(trnumber,det,smnumber,irow,icol,adc); + new(lsdigits[fNsdigit++]) AliPMDsdigit(trnumber,trpid,det,smnumber,irow,icol,adc); } //____________________________________________________________________________ -void AliPMDDigitizer::AddDigit(Int_t trnumber, Int_t det, Int_t smnumber, - Int_t irow, Int_t icol, Float_t adc) +void AliPMDDigitizer::AddDigit(Int_t trnumber, Int_t trpid, Int_t det, + Int_t smnumber, Int_t irow, Int_t icol, + Float_t adc) { // Add Digit // if (!fDigits) fDigits = new TClonesArray("AliPMDdigit", 1000); TClonesArray &ldigits = *fDigits; - new(ldigits[fNdigit++]) AliPMDdigit(trnumber,det,smnumber,irow,icol,adc); + new(ldigits[fNdigit++]) AliPMDdigit(trnumber,trpid, det,smnumber,irow,icol,adc); } //____________________________________________________________________________ @@ -1486,10 +1546,12 @@ void AliPMDDigitizer::ResetCellADC() { for (Int_t k = 0; k < fgkCol; k++) { - fCPV[i][j][k] = 0.; - fPRE[i][j][k] = 0.; - fCPVTrackNo[i][j][k] = 0; - fPRETrackNo[i][j][k] = 0; + fCPV[i][j][k] = 0.; + fPRE[i][j][k] = 0.; + fCPVTrackNo[i][j][k] = 0; + fPRETrackNo[i][j][k] = 0; + fCPVTrackPid[i][j][k] = -1; + fPRETrackPid[i][j][k] = -1; } } }