X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSDigitizer.cxx;h=69621c9f3636ec02d08e30c86f33b28c44b7f01e;hb=f01d4926336c69ae4e07ae146980554d2155ab5c;hp=e5f6cc9c6f319c4718c7e09bfe319d51fce63b39;hpb=351dd6348b2d6a89268f2717d98c08fc85e5dc79;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index e5f6cc9c6f3..69621c9f363 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -15,6 +15,70 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log: AliPHOSDigitizer.cxx,v $ + * Revision 1.104 2007/12/18 09:08:18 hristov + * Splitting of the QA maker into simulation and reconstruction dependent parts (Yves) + * + * Revision 1.103 2007/11/07 11:25:06 schutz + * Comment out the QA checking before starting digitization + * + * Revision 1.102 2007/10/19 18:04:29 schutz + * The standalone QA data maker is called from AliSimulation and AliReconstruction outside the event loop; i.e. re-reading the data. The QA data making in the event loop has been commented out. + * + * Revision 1.101 2007/10/14 21:08:10 schutz + * Introduced the checking of QA results from previous step before entering the event loop + * + * Revision 1.100 2007/10/10 09:05:10 schutz + * Changing name QualAss to QA + * + * Revision 1.99 2007/09/30 17:08:20 schutz + * Introducing the notion of QA data acquisition cycle (needed by online) + * + * Revision 1.98 2007/09/26 14:22:17 cvetan + * Important changes to the reconstructor classes. Complete elimination of the run-loaders, which are now steered only from AliReconstruction. Removal of the corresponding Reconstruct() and FillESD() methods. + * + * Revision 1.97 2007/08/07 14:12:03 kharlov + * Quality assurance added (Yves Schutz) + * + * Revision 1.96 2007/04/28 10:43:36 policheh + * Dead channels simulation: digit energy sets to 0. + * + * Revision 1.95 2007/04/10 07:20:52 kharlov + * Decalibration should use the same CDB as calibration in AliPHOSClusterizerv1 + * + * Revision 1.94 2007/02/01 10:34:47 hristov + * Removing warnings on Solaris x86 + * + * Revision 1.93 2006/10/17 13:17:01 kharlov + * Replace AliInfo by AliDebug + * + * Revision 1.92 2006/08/28 10:01:56 kharlov + * Effective C++ warnings fixed (Timur Pocheptsov) + * + * Revision 1.91 2006/04/29 20:25:30 hristov + * Decalibration is implemented (Yu.Kharlov) + * + * Revision 1.90 2006/04/22 10:30:17 hristov + * Add fEnergy to AliPHOSDigit and operate with EMC amplitude in energy units (Yu.Kharlov) + * + * Revision 1.89 2006/04/11 15:22:59 hristov + * run number in query set to -1: forces AliCDBManager to use its run number (A.Colla) + * + * Revision 1.88 2006/03/13 14:05:43 kharlov + * Calibration objects for EMC and CPV + * + * Revision 1.87 2005/08/24 15:33:49 kharlov + * Calibration data for raw digits + * + * Revision 1.86 2005/07/12 20:07:35 hristov + * Changes needed to run simulation and reconstrruction in the same AliRoot session + * + * Revision 1.85 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * + */ //_________________________________________________________________________ //*-- Author : Dmitri Peressounko (SUBATECH & Kurchatov Institute) @@ -60,6 +124,7 @@ #include "TSystem.h" #include "TBenchmark.h" #include "TRandom.h" +#include "TMath.h" // --- Standard library --- @@ -67,86 +132,125 @@ #include "AliLog.h" #include "AliRunDigitizer.h" #include "AliPHOSDigit.h" -#include "AliPHOSGetter.h" #include "AliPHOSDigitizer.h" -#include "AliPHOSSDigitizer.h" #include "AliPHOSGeometry.h" #include "AliPHOSTick.h" +#include "AliPHOSSimParam.h" +#include "AliPHOSCalibData.h" +#include "AliRunLoader.h" +#include "AliPHOSLoader.h" ClassImp(AliPHOSDigitizer) //____________________________________________________________________________ - AliPHOSDigitizer::AliPHOSDigitizer():AliDigitizer("",""), - fInput(0), - fInputFileNames(0x0), - fEventNames(0x0) +AliPHOSDigitizer::AliPHOSDigitizer() : + AliDigitizer("",""), + fDefaultInit(kTRUE), + fDigitsInRun(0), + fInit(kFALSE), + fInput(0), + fInputFileNames(0x0), + fEventNames(0x0), + fEmcCrystals(0), + fEventFolderName(""), + fFirstEvent(0), + fLastEvent(0), + fcdb(0x0), + fEventCounter(0) { // ctor InitParameters() ; - fDefaultInit = kTRUE ; fManager = 0 ; // We work in the standalong mode - fEventFolderName = "" ; } //____________________________________________________________________________ AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, TString eventFolderName): - AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(), - alirunFileName), - fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName) + AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(), alirunFileName), + fDefaultInit(kFALSE), + fDigitsInRun(0), + fInit(kFALSE), + fInput(0), + fInputFileNames(0x0), + fEventNames(0x0), + fEmcCrystals(0), + fEventFolderName(eventFolderName), + fFirstEvent(0), + fLastEvent(0), + fcdb(0x0), + fEventCounter(0) { // ctor InitParameters() ; Init() ; fDefaultInit = kFALSE ; fManager = 0 ; // We work in the standalong mode + fcdb = new AliPHOSCalibData(-1); } //____________________________________________________________________________ -AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d) - : AliDigitizer(d) +AliPHOSDigitizer::AliPHOSDigitizer(const AliPHOSDigitizer & d) : + AliDigitizer(d), + fDefaultInit(d.fDefaultInit), + fDigitsInRun(d.fDigitsInRun), + fInit(d.fInit), + fInput(d.fInput), + fInputFileNames(0x0),//? + fEventNames(0x0),//? + fEmcCrystals(d.fEmcCrystals), + fEventFolderName(d.fEventFolderName), + fFirstEvent(d.fFirstEvent), + fLastEvent(d.fLastEvent), + fcdb (0x0), + fEventCounter(0) { // copyy ctor - SetName(d.GetName()) ; SetTitle(d.GetTitle()) ; - fPinNoise = d.fPinNoise ; - fEMCDigitThreshold = d.fEMCDigitThreshold ; - fCPVNoise = d.fCPVNoise ; - fCPVDigitThreshold = d.fCPVDigitThreshold ; - fTimeResolution = d.fTimeResolution ; - fTimeThreshold = d.fTimeThreshold ; - fTimeSignalLength = d.fTimeSignalLength ; - fADCchanelEmc = d.fADCchanelEmc ; - fADCpedestalEmc = d.fADCpedestalEmc ; - fNADCemc = d.fNADCemc ; - fADCchanelCpv = d.fADCchanelCpv ; - fADCpedestalCpv = d.fADCpedestalCpv ; - fNADCcpv = d.fNADCcpv ; - fEventFolderName = d.fEventFolderName; + fcdb = new AliPHOSCalibData(-1); } //____________________________________________________________________________ -AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd): - AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()), - fEventFolderName(0) +AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd) : + AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()), + fDefaultInit(kFALSE), + fDigitsInRun(0), + fInit(kFALSE), + fInput(0), + fInputFileNames(0x0), + fEventNames(0x0), + fEmcCrystals(0), + fEventFolderName(fManager->GetInputFolderName(0)), + fFirstEvent(0), + fLastEvent(0), + fcdb (0x0), + fEventCounter(0) + { // ctor Init() is called by RunDigitizer fManager = rd ; - fEventFolderName = fManager->GetInputFolderName(0) ; SetTitle(dynamic_cast(fManager->GetInputStream(0))->GetFileName(0)); InitParameters() ; fDefaultInit = kFALSE ; + fcdb = new AliPHOSCalibData(-1); } //____________________________________________________________________________ AliPHOSDigitizer::~AliPHOSDigitizer() { // dtor + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + if(rl){ + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + phosLoader->CleanDigitizer() ; + } + delete [] fInputFileNames ; delete [] fEventNames ; - + + if(fcdb){ delete fcdb ; fcdb=0;} + } //____________________________________________________________________________ @@ -160,17 +264,33 @@ void AliPHOSDigitizer::Digitize(Int_t event) // This design avoids scanning over the list of digits to add // contribution to new SDigits only. - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - Int_t ReadEvent = event ; + + Bool_t toMakeNoise = kTRUE ; //Do not create noisy digits if merge with real data + + //First stream + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + + Int_t readEvent = event ; if (fManager) - ReadEvent = dynamic_cast(fManager->GetInputStream(0))->GetCurrentEventNumber() ; - AliInfo(Form("Adding event %d from input stream 0 %s %s", - ReadEvent, GetTitle(), fEventFolderName.Data())) ; - gime->Event(ReadEvent, "S") ; - TClonesArray * digits = gime->Digits() ; + readEvent = dynamic_cast(fManager->GetInputStream(0))->GetCurrentEventNumber() ; + AliDebug(1,Form("Adding event %d from input stream 0 %s %s", + readEvent, GetTitle(), fEventFolderName.Data())) ; + rl->GetEvent(readEvent) ; + phosLoader->CleanSDigits() ; + phosLoader->LoadSDigits("READ") ; + + //Prepare Output + TClonesArray * digits = phosLoader->Digits() ; + if( !digits ) { + phosLoader->MakeDigitsArray() ; + digits = phosLoader->Digits() ; + } + digits->Clear() ; - const AliPHOSGeometry *geom = gime->PHOSGeometry() ; + // + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; //Making digits with noise, first EMC Int_t nEMC = geom->GetNModules()*geom->GetNPhi()*geom->GetNZ(); @@ -181,35 +301,52 @@ void AliPHOSDigitizer::Digitize(Int_t event) digits->Expand(nCPV) ; - // get first the sdigitizer from the tasks list - if ( !gime->SDigitizer() ) - gime->LoadSDigitizer(); - AliPHOSSDigitizer * sDigitizer = gime->SDigitizer(); - - if ( !sDigitizer ) - AliFatal(Form("SDigitizer with name %s %s not found", - GetTitle(), fEventFolderName.Data() )) ; - //take all the inputs to add together and load the SDigits TObjArray * sdigArray = new TObjArray(fInput) ; - sdigArray->AddAt(gime->SDigits(), 0) ; - Int_t i ; - for(i = 1 ; i < fInput ; i++){ + sdigArray->AddAt(phosLoader->SDigits(), 0) ; + + for(Int_t i = 1 ; i < fInput ; i++){ TString tempo(fEventNames[i]) ; tempo += i ; - AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ; - if (fManager) - ReadEvent = dynamic_cast(fManager->GetInputStream(i))->GetCurrentEventNumber() ; - AliInfo(Form("Adding event %d from input stream %d %s %s", - ReadEvent, i, fInputFileNames[i].Data(), tempo.Data())) ; - gime->Event(ReadEvent,"S"); - sdigArray->AddAt(gime->SDigits(), i) ; + AliRunLoader* rl2 = AliRunLoader::GetRunLoader(tempo) ; + if(!rl2){ + rl2 = AliRunLoader::Open(fInputFileNames[i], tempo) ; + if (!rl2) { + Fatal("AliPHOSDigitizer", "Could not find the Run Loader for %s - %s",fInputFileNames[i].Data(), tempo.Data()) ; + return ; + } + rl2->LoadHeader(); + } + AliPHOSLoader * phosLoader2 = dynamic_cast(rl2->GetLoader("PHOSLoader")); + + if(fManager){ + readEvent = dynamic_cast(fManager->GetInputStream(i))->GetCurrentEventNumber() ; + } + TClonesArray * digs ; + if(AliPHOSSimParam::GetInstance()->IsStreamDigits(i)){ //This is Digits Stream + AliInfo(Form("Adding event %d from input stream %d %s %s", + readEvent, i, fInputFileNames[i].Data(), tempo.Data())) ; + rl2->GetEvent(readEvent) ; + phosLoader2->CleanDigits() ; + phosLoader2->LoadDigits("READ") ; + digs = phosLoader2->Digits() ; + toMakeNoise=0 ; //Do not add noise, it is already in stream + } + else{ + AliInfo(Form("Adding event %d (SDigits) from input stream %d %s %s", + readEvent, i, fInputFileNames[i].Data(), tempo.Data())) ; + rl2->GetEvent(readEvent) ; + phosLoader2->CleanSDigits() ; + phosLoader2->LoadSDigits("READ") ; + digs = phosLoader2->SDigits() ; + } + sdigArray->AddAt(digs, i) ; } - //Find the first crystall with signal + //Find the first crystal with signal Int_t nextSig = 200000 ; TClonesArray * sdigits ; - for(i = 0 ; i < fInput ; i++){ + for(Int_t i = 0 ; i < fInput ; i++){ sdigits = dynamic_cast(sdigArray->At(i)) ; if ( !sdigits->GetEntriesFast() ) continue ; @@ -224,28 +361,38 @@ void AliPHOSDigitizer::Digitize(Int_t event) AliPHOSDigit * digit ; AliPHOSDigit * curSDigit ; - TClonesArray * ticks = new TClonesArray("AliPHOSTick",1000) ; +// TClonesArray * ticks = new TClonesArray("AliPHOSTick",1000) ; //Put Noise contribution + Double_t apdNoise = 0. ; + if(toMakeNoise) + apdNoise = AliPHOSSimParam::GetInstance()->GetAPDNoise() ; + for(absID = 1 ; absID <= nEMC ; absID++){ - Float_t noise = gRandom->Gaus(0., fPinNoise) ; - new((*digits)[absID-1]) AliPHOSDigit( -1, absID, sDigitizer->Digitize(noise), TimeOfNoise() ) ; + Float_t noise = gRandom->Gaus(0.,apdNoise) ; + new((*digits)[absID-1]) AliPHOSDigit( -1, absID, noise, TimeOfNoise() ) ; //look if we have to add signal? digit = dynamic_cast(digits->At(absID-1)) ; if(absID==nextSig){ //Add SDigits from all inputs - ticks->Clear() ; - Int_t contrib = 0 ; - Float_t a = digit->GetAmp() ; - Float_t b = TMath::Abs( a / fTimeSignalLength) ; - //Mark the beginning of the signal - new((*ticks)[contrib++]) AliPHOSTick(digit->GetTime(),0, b); - //Mark the end of the ignal - new((*ticks)[contrib++]) AliPHOSTick(digit->GetTime()+fTimeSignalLength, -a, -b); +// ticks->Clear() ; +// Int_t contrib = 0 ; + +//New Timing model is necessary +// Float_t a = digit->GetEnergy() ; +// Float_t b = TMath::Abs( a / fTimeSignalLength) ; +// //Mark the beginning of the signal +// new((*ticks)[contrib++]) AliPHOSTick(digit->GetTime(),0, b); +// //Mark the end of the signal +// new((*ticks)[contrib++]) AliPHOSTick(digit->GetTime()+fTimeSignalLength, -a, -b); + +// Calculate time as time of the largest digit + Float_t time = digit->GetTime() ; + Float_t eTime= digit->GetEnergy() ; //loop over inputs - for(i = 0 ; i < fInput ; i++){ + for(Int_t i = 0 ; i < fInput ; i++){ if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) curSDigit = dynamic_cast(dynamic_cast(sdigArray->At(i))->At(index[i])) ; else @@ -260,13 +407,18 @@ void AliPHOSDigitizer::Digitize(Int_t event) primaryoffset = 10000000*i ; curSDigit->ShiftPrimary(primaryoffset) ; - a = curSDigit->GetAmp() ; - b = a /fTimeSignalLength ; - new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime(),0, b); - new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b); - - *digit = *digit + *curSDigit ; //add energies +//New Timing model is necessary +// a = curSDigit->GetEnergy() ; +// b = a /fTimeSignalLength ; +// new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime(),0, b); +// new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b); + if(curSDigit->GetEnergy()>eTime){ + eTime=curSDigit->GetEnergy() ; + time=curSDigit->GetTime() ; + } + *digit += *curSDigit ; //add energies + index[i]++ ; if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) curSDigit = dynamic_cast(dynamic_cast(sdigArray->At(i))->At(index[i])) ; @@ -276,12 +428,13 @@ void AliPHOSDigitizer::Digitize(Int_t event) } //calculate and set time - Float_t time = FrontEdgeTime(ticks) ; +//New Timing model is necessary +// Float_t time = FrontEdgeTime(ticks) ; digit->SetTime(time) ; //Find next signal module nextSig = 200000 ; - for(i = 0 ; i < fInput ; i++){ + for(Int_t i = 0 ; i < fInput ; i++){ sdigits = dynamic_cast(sdigArray->At(i)) ; Int_t curNext = nextSig ; if(sdigits->GetEntriesFast() > index[i] ){ @@ -291,19 +444,30 @@ void AliPHOSDigitizer::Digitize(Int_t event) } } } + + //distretize energy if necessary + if(AliPHOSSimParam::GetInstance()->IsEDigitizationOn()){ + Float_t adcW=AliPHOSSimParam::GetInstance()->GetADCchannelW() ; + for(Int_t i = 0 ; i < nEMC ; i++){ + digit = dynamic_cast( digits->At(i) ) ; + digit->SetEnergy(adcW*ceil(digit->GetEnergy()/adcW)) ; + } + } + - ticks->Delete() ; - delete ticks ; +// ticks->Delete() ; +// delete ticks ; //Now CPV digits (different noise and no timing) + Float_t cpvNoise = AliPHOSSimParam::GetInstance()->GetCPVNoise() ; for(absID = nEMC+1; absID <= nCPV; absID++){ - Float_t noise = gRandom->Gaus(0., fCPVNoise) ; - new((*digits)[absID-1]) AliPHOSDigit( -1,absID,sDigitizer->Digitize(noise), TimeOfNoise() ) ; + Float_t noise = gRandom->Gaus(0., cpvNoise) ; + new((*digits)[absID-1]) AliPHOSDigit( -1,absID,noise, TimeOfNoise() ) ; //look if we have to add signal? if(absID==nextSig){ digit = dynamic_cast(digits->At(absID-1)) ; //Add SDigits from all inputs - for(i = 0 ; i < fInput ; i++){ + for(Int_t i = 0 ; i < fInput ; i++){ if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) curSDigit = dynamic_cast( dynamic_cast(sdigArray->At(i))->At(index[i])) ; else @@ -320,7 +484,7 @@ void AliPHOSDigitizer::Digitize(Int_t event) curSDigit->ShiftPrimary(primaryoffset) ; //add energies - *digit = *digit + *curSDigit ; + *digit += *curSDigit ; index[i]++ ; if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) curSDigit = dynamic_cast( dynamic_cast(sdigArray->At(i))->At(index[i]) ) ; @@ -331,7 +495,7 @@ void AliPHOSDigitizer::Digitize(Int_t event) //Find next signal module nextSig = 200000 ; - for(i = 0 ; i < fInput ; i++){ + for(Int_t i = 0 ; i < fInput ; i++){ sdigits = dynamic_cast(sdigArray->At(i)) ; Int_t curNext = nextSig ; if(sdigits->GetEntriesFast() > index[i] ) @@ -344,49 +508,97 @@ void AliPHOSDigitizer::Digitize(Int_t event) delete sdigArray ; //We should not delete its contents + Int_t relId[4]; + + //set amplitudes in bad channels to zero + + for(Int_t i = 0 ; i GetEntries(); i++){ + digit = dynamic_cast( digits->At(i) ) ; + geom->AbsToRelNumbering(digit->GetId(),relId); + if(relId[1] == 0) // Emc + if(fcdb->IsBadChannelEmc(relId[0],relId[3],relId[2])) digit->SetEnergy(0.); + } + //remove digits below thresholds - for(i = 0 ; i < nEMC ; i++){ + Float_t emcThreshold = AliPHOSSimParam::GetInstance()->GetEmcDigitsThreshold() ; + for(Int_t i = 0 ; i < nEMC ; i++){ digit = dynamic_cast( digits->At(i) ) ; - if(sDigitizer->Calibrate( digit->GetAmp() ) < fEMCDigitThreshold) + + if(digit->GetEnergy() < emcThreshold){ digits->RemoveAt(i) ; - else - digit->SetTime(gRandom->Gaus(digit->GetTime(),fTimeResolution) ) ; + continue ; + } + Float_t tres = TimeResolution(digit->GetEnergy()) ; + digit->SetTime(gRandom->Gaus(digit->GetTime(), tres) ) ; } - - for(i = nEMC; i < nCPV ; i++) - if( sDigitizer->Calibrate( dynamic_cast(digits->At(i))->GetAmp() ) < fCPVDigitThreshold ) + Float_t cpvDigitThreshold = AliPHOSSimParam::GetInstance()->GetCpvDigitsThreshold() ; + for(Int_t i = nEMC; i < nCPV ; i++){ + if( dynamic_cast(digits->At(i))->GetEnergy() < cpvDigitThreshold ) digits->RemoveAt(i) ; + } digits->Compress() ; Int_t ndigits = digits->GetEntriesFast() ; digits->Expand(ndigits) ; + //Set indexes in list of digits and make true digitization of the energy - for (i = 0 ; i < ndigits ; i++) { + for (Int_t i = 0 ; i < ndigits ; i++) { digit = dynamic_cast( digits->At(i) ) ; digit->SetIndexInList(i) ; - Float_t energy = sDigitizer->Calibrate(digit->GetAmp()) ; - digit->SetAmp(DigitizeEnergy(energy,digit->GetId()) ) ; + if(digit->GetId() > fEmcCrystals){ //digitize CPV only + digit->SetAmp(DigitizeCPV(digit->GetEnergy(),digit->GetId()) ) ; + } } + } //____________________________________________________________________________ -Int_t AliPHOSDigitizer::DigitizeEnergy(Float_t energy, Int_t absId) +void AliPHOSDigitizer::DecalibrateEMC(AliPHOSDigit *digit) { - // Returns digitized value of the energy in a cell absId + // Decalibrate EMC digit, i.e. change its energy by a factor read from CDB + + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; + + //Determine rel.position of the cell absolute ID + Int_t relId[4]; + geom->AbsToRelNumbering(digit->GetId(),relId); + Int_t module=relId[0]; + Int_t row =relId[2]; + Int_t column=relId[3]; + Float_t decalibration = fcdb->GetADCchannelEmc(module,column,row); + Float_t energy = digit->GetEnergy() / decalibration; + digit->SetEnergy(energy); +} +//____________________________________________________________________________ +Int_t AliPHOSDigitizer::DigitizeCPV(Float_t charge, Int_t absId) +{ + // Returns digitized value of the CPV charge in a pad absId - Int_t chanel ; - if(absId <= fEmcCrystals){ //digitize as EMC - chanel = (Int_t) TMath::Ceil((energy - fADCpedestalEmc)/fADCchanelEmc) ; - if(chanel > fNADCemc ) chanel = fNADCemc ; - } - else{ //Digitize as CPV - chanel = (Int_t) TMath::Ceil((energy - fADCpedestalCpv)/fADCchanelCpv) ; - if(chanel > fNADCcpv ) chanel = fNADCcpv ; + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; + + //Determine rel.position of the cell absId + Int_t relId[4]; + geom->AbsToRelNumbering(absId,relId); + Int_t module=relId[0]; + Int_t row =relId[2]; + Int_t column=relId[3]; + + Int_t channel = 0; + + if(absId > fEmcCrystals){ //digitize CPV only + + //reading calibration data for cell absId. + Float_t adcPedestalCpv = fcdb->GetADCpedestalCpv(module,column,row); + Float_t adcChanelCpv = fcdb->GetADCchannelCpv( module,column,row); + + channel = (Int_t) TMath::Ceil((charge - adcPedestalCpv)/adcChanelCpv) ; + Int_t nMax = AliPHOSSimParam::GetInstance()->GetNADCcpv() ; + if(channel > nMax ) channel = nMax ; } - return chanel ; + return channel ; } //____________________________________________________________________________ @@ -409,16 +621,17 @@ void AliPHOSDigitizer::Exec(Option_t *option) return ; } - if(strstr(option,"tim")) - gBenchmark->Start("PHOSDigitizer"); + if(strstr(option,"tim")) + gBenchmark->Start("PHOSDigitizer"); - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle()) ; + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); // Post Digitizer to the white board - gime->PostDigitizer(this) ; + phosLoader->PostDigitizer(this) ; if (fLastEvent == -1) - fLastEvent = gime->MaxEvent() - 1 ; + fLastEvent = rl->GetNumberOfEvents() - 1 ; else if (fManager) fLastEvent = fFirstEvent ; @@ -427,8 +640,7 @@ void AliPHOSDigitizer::Exec(Option_t *option) Int_t ievent ; for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) { - - gime->Event(ievent,"S") ; + fEventCounter++ ; Digitize(ievent) ; //Add prepared SDigits to digits and add the noise @@ -438,10 +650,10 @@ void AliPHOSDigitizer::Exec(Option_t *option) PrintDigits(option); //increment the total number of Digits per run - fDigitsInRun += gime->Digits()->GetEntriesFast() ; + fDigitsInRun += phosLoader->Digits()->GetEntriesFast() ; } - - gime->PhosLoader()->CleanDigitizer(); + + phosLoader->CleanDigitizer(); if(strstr(option,"tim")){ gBenchmark->Stop("PHOSDigitizer"); @@ -452,52 +664,46 @@ void AliPHOSDigitizer::Exec(Option_t *option) gBenchmark->GetCpuTime("PHOSDigitizer")/nEvents )); } } - //____________________________________________________________________________ -Float_t AliPHOSDigitizer::FrontEdgeTime(TClonesArray * ticks) const -{ - // Returns the shortest time among all time ticks - - ticks->Sort() ; //Sort in accordance with times of ticks - TIter it(ticks) ; - AliPHOSTick * ctick = (AliPHOSTick *) it.Next() ; - Float_t time = ctick->CrossingTime(fTimeThreshold) ; - - AliPHOSTick * t ; - while((t=(AliPHOSTick*) it.Next())){ - if(t->GetTime() < time) //This tick starts before crossing - *ctick+=*t ; - else - return time ; - - time = ctick->CrossingTime(fTimeThreshold) ; - } - return time ; +Float_t AliPHOSDigitizer::TimeResolution(Float_t e){ + //calculate TOF resolution using beam-test resutls + Float_t a=AliPHOSSimParam::GetInstance()->GetTOFa() ; + Float_t b=AliPHOSSimParam::GetInstance()->GetTOFb() ; + return TMath::Sqrt(a*a+b*b/e) ; } +////____________________________________________________________________________ +//Float_t AliPHOSDigitizer::FrontEdgeTime(TClonesArray * ticks) const +//{ +// // Returns the shortest time among all time ticks +// +// ticks->Sort() ; //Sort in accordance with times of ticks +// TIter it(ticks) ; +// AliPHOSTick * ctick = (AliPHOSTick *) it.Next() ; +// Float_t time = ctick->CrossingTime(fTimeThreshold) ; +// +// AliPHOSTick * t ; +// while((t=(AliPHOSTick*) it.Next())){ +// if(t->GetTime() < time) //This tick starts before crossing +// *ctick+=*t ; +// else +// return time ; +// +// time = ctick->CrossingTime(fTimeThreshold) ; +// } +// return time ; +//} + //____________________________________________________________________________ Bool_t AliPHOSDigitizer::Init() { // Makes all memory allocations fInit = kTRUE ; - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - if ( gime == 0 ) { - AliFatal(Form("Could not obtain the Getter object for file %s and event %s !", - GetTitle(), fEventFolderName.Data())); - return kFALSE; - } - - const AliPHOSGeometry * geom = gime->PHOSGeometry() ; + + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; fEmcCrystals = geom->GetNModules() * geom->GetNCristalsInModule() ; - TString opt("Digits") ; - if(gime->VersionExists(opt) ) { - AliError(Form("Give a version name different from %s", - fEventFolderName.Data() )) ; - fInit = kFALSE ; - } - fFirstEvent = 0 ; fLastEvent = fFirstEvent ; if (fManager) @@ -517,7 +723,12 @@ Bool_t AliPHOSDigitizer::Init() } //to prevent cleaning of this object while GetEvent is called - gime->PhosLoader()->GetDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + if(!rl){ + rl = AliRunLoader::Open(GetTitle(), fEventFolderName) ; + } + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + phosLoader->GetDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); return fInit ; } @@ -527,80 +738,13 @@ void AliPHOSDigitizer::InitParameters() { // Set initial parameters Digitizer - fPinNoise = 0.004 ; - fEMCDigitThreshold = 0.012 ; - fCPVNoise = 0.01; - fCPVDigitThreshold = 0.09 ; - fTimeResolution = 0.5e-9 ; - fTimeSignalLength = 1.0e-9 ; fDigitsInRun = 0 ; - fADCchanelEmc = 0.0015; // width of one ADC channel in GeV - fADCpedestalEmc = 0.005 ; // - fNADCemc = (Int_t) TMath::Power(2,16) ; // number of channels in EMC ADC - - fADCchanelCpv = 0.0012 ; // width of one ADC channel in CPV 'popugais' - fADCpedestalCpv = 0.012 ; // - fNADCcpv = (Int_t) TMath::Power(2,12); // number of channels in CPV ADC - - fTimeThreshold = 0.001*10000000 ; //Means 1 MeV in terms of SDigits amplitude SetEventRange(0,-1) ; } //__________________________________________________________________ -void AliPHOSDigitizer::MixWith(TString alirunFileName, TString eventFolderName) -{ - // Allows to produce digits by superimposing background and signal event. - // It is assumed, that headers file with SIGNAL events is opened in - // the constructor. - // Sets the BACKGROUND event, with which the SIGNAL event is to be mixed - // Thus we avoid writing (changing) huge and expensive - // backgound files: all output will be writen into SIGNAL, i.e. - // opened in constructor file. - // - // One can open as many files to mix with as one needs. - // However only Sdigits with the same name (i.e. constructed with the same SDigitizer) - // can be mixed. - - if( strcmp(fEventFolderName, "") == 0 ) - Init() ; - - if(fManager){ - Warning("MixWith", "Cannot use this method with AliRunDigitizer\n" ) ; - return ; - } - // looking for file which contains AliRun - if (gSystem->AccessPathName(alirunFileName)) {// file does not exist - AliError(Form("File %s does not exist!", alirunFileName.Data())) ; - return ; - } - // looking for the file which contains SDigits - AliPHOSGetter * gime = AliPHOSGetter::Instance() ; - TString fileName( gime->GetSDigitsFileName() ) ; - if ( eventFolderName != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name - fileName = fileName.ReplaceAll(".root", "") + "_" + eventFolderName + ".root" ; - if ( (gSystem->AccessPathName(fileName)) ) { - AliError(Form("The file %s does not exist!", fileName.Data())) ; - return ; - } - // need to increase the arrays - TString tempo = fInputFileNames[fInput-1] ; - delete [] fInputFileNames ; - fInputFileNames = new TString[fInput+1] ; - fInputFileNames[fInput-1] = tempo ; - - tempo = fEventNames[fInput-1] ; - delete [] fEventNames ; - fEventNames = new TString[fInput+1] ; - fEventNames[fInput-1] = tempo ; - - fInputFileNames[fInput] = alirunFileName ; - fEventNames[fInput] = eventFolderName ; - fInput++ ; -} - -//__________________________________________________________________ -void AliPHOSDigitizer::Print()const +void AliPHOSDigitizer::Print(const Option_t *)const { // Print Digitizer's parameters AliInfo(Form("\n------------------- %s -------------", GetName() )) ; @@ -617,20 +761,14 @@ void AliPHOSDigitizer::Print()const for (index = 0 ; index < nStreams ; index++) { TString tempo(fEventNames[index]) ; tempo += index ; - AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[index], tempo) ; - TString fileName( gime->GetSDigitsFileName() ) ; - if ( fEventNames[index] != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name - fileName = fileName.ReplaceAll(".root", "") + "_" + fEventNames[index] + ".root" ; - printf ("Adding SDigits from %s %s\n", fInputFileNames[index].Data(), fileName.Data()) ; + printf ("Adding SDigits from %s \n", fInputFileNames[index].Data()) ; } - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - printf("\nWriting digits to %s", gime->GetDigitsFileName().Data()) ; - printf("\nWith following parameters:\n") ; - printf(" Electronics noise in EMC (fPinNoise) = %f\n", fPinNoise ) ; - printf(" Threshold in EMC (fEMCDigitThreshold) = %f\n", fEMCDigitThreshold ) ; - printf(" Noise in CPV (fCPVNoise) = %f\n", fCPVNoise ) ; - printf(" Threshold in CPV (fCPVDigitThreshold) = %f\n",fCPVDigitThreshold ) ; + // printf("\nWith following parameters:\n") ; + // printf(" Electronics noise in EMC (fPinNoise) = %f GeV\n", fPinNoise ) ; + // printf(" Threshold in EMC (fEMCDigitThreshold) = %f GeV\n", fEMCDigitThreshold ) ; + // printf(" Noise in CPV (fCPVNoise) = %f aux units\n", fCPVNoise ) ; + // printf(" Threshold in CPV (fCPVDigitThreshold) = %f aux units\n",fCPVDigitThreshold ) ; printf(" ---------------------------------------------------\n") ; } else @@ -643,8 +781,11 @@ void AliPHOSDigitizer::Print()const { // Print a table of digits - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - TClonesArray * digits = gime->Digits() ; + + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + TClonesArray * digits = phosLoader->Digits() ; + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; AliInfo(Form("%d", digits->GetEntriesFast())) ; printf("\nevent %d", gAlice->GetEvNumber()) ; @@ -656,15 +797,17 @@ void AliPHOSDigitizer::Print()const AliPHOSDigit * digit; printf("\nEMC digits (with primaries):\n") ; printf("\n Id Amplitude Time Index Nprim: Primaries list \n") ; - Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ; + Int_t maxEmc = geom->GetNModules()*geom->GetNCristalsInModule() ; Int_t index ; for (index = 0 ; (index < digits->GetEntriesFast()) && (dynamic_cast(digits->At(index))->GetId() <= maxEmc) ; index++) { digit = (AliPHOSDigit * ) digits->At(index) ; if(digit->GetNprimary() == 0) continue; - printf("%6d %8d %6.5e %4d %2d :", - digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; +// printf("%6d %8d %6.5e %4d %2d :", +// digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; // YVK + printf("%6d %.4f %6.5e %4d %2d :", + digit->GetId(), digit->GetEnergy(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; Int_t iprimary; for (iprimary=0; iprimaryGetNprimary(); iprimary++) { printf("%d ",digit->GetPrimary(iprimary+1) ) ; @@ -679,7 +822,7 @@ void AliPHOSDigitizer::Print()const AliPHOSDigit * digit; printf("\nCPV digits (with primaries):\n") ; printf("\n Id Amplitude Time Index Nprim: Primaries list \n") ; - Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ; + Int_t maxEmc = geom->GetNModules()*geom->GetNCristalsInModule() ; Int_t index ; for (index = 0 ; index < digits->GetEntriesFast(); index++) { digit = (AliPHOSDigit * ) digits->At(index) ; @@ -712,12 +855,14 @@ void AliPHOSDigitizer::Unload() for(i = 1 ; i < fInput ; i++){ TString tempo(fEventNames[i]) ; tempo += i ; - AliPHOSGetter * gime = AliPHOSGetter::Instance(fInputFileNames[i], tempo) ; - gime->PhosLoader()->UnloadSDigits() ; + AliRunLoader* rl = AliRunLoader::GetRunLoader(tempo) ; + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + phosLoader->UnloadSDigits() ; } - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - gime->PhosLoader()->UnloadDigits() ; + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + phosLoader->UnloadDigits() ; } //____________________________________________________________________________ @@ -732,18 +877,24 @@ void AliPHOSDigitizer::WriteDigits() // and branch "AliPHOSDigitizer", with the same title to keep all the parameters // and names of files, from which digits are made. - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - const TClonesArray * digits = gime->Digits() ; - TTree * treeD = gime->TreeD(); - + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = dynamic_cast(rl->GetLoader("PHOSLoader")); + + const TClonesArray * digits = phosLoader->Digits() ; + TTree * treeD = phosLoader->TreeD(); + if(!treeD){ + phosLoader->MakeTree("D"); + treeD = phosLoader->TreeD(); + } + // -- create Digits branch Int_t bufferSize = 32000 ; - TBranch * digitsBranch = treeD->Branch("PHOS",&digits,bufferSize); + TBranch * digitsBranch = treeD->Branch("PHOS","TClonesArray",&digits,bufferSize); digitsBranch->SetTitle(fEventFolderName); digitsBranch->Fill() ; - gime->WriteDigits("OVERWRITE"); - gime->WriteDigitizer("OVERWRITE"); + phosLoader->WriteDigits("OVERWRITE"); + phosLoader->WriteDigitizer("OVERWRITE"); Unload() ;