X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSDigitizer.cxx;h=f19f3bfbd7272f9e25b41da3bb84ebb69746fe6e;hb=80ae507c2c5853c2bdde4df716840ddfd505e487;hp=944d1dbe8c3bbaed5570739c04184accfb5b8a11;hpb=8661738e6ccd58aecb87fdc00e1c1ec45058aa10;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSDigitizer.cxx b/PHOS/AliPHOSDigitizer.cxx index 944d1dbe8c3..f19f3bfbd72 100644 --- a/PHOS/AliPHOSDigitizer.cxx +++ b/PHOS/AliPHOSDigitizer.cxx @@ -17,7 +17,19 @@ /* History of cvs commits: * - * $Log$ + * $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 * @@ -71,12 +83,12 @@ //_________________________________________________________________________ //*-- Author : Dmitri Peressounko (SUBATECH & Kurchatov Institute) ////////////////////////////////////////////////////////////////////////////// -// This TTask performs digitization of Summable digits (in the PHOS case it is just +// This class performs digitization of Summable digits (in the PHOS case it is just // the sum of contributions from all primary particles into a given cell). // In addition it performs mixing of summable digits from different events. -// The name of the TTask is also the title of the branch that will contain +// The name of the class is also the title of the branch that will contain // the created SDigits -// The title of the TTAsk is the name of the file that contains the hits from +// The title of the class is the name of the file that contains the hits from // which the SDigits are created // // For each event two branches are created in TreeD: @@ -88,7 +100,7 @@ // // Use case: // root[0] AliPHOSDigitizer * d = new AliPHOSDigitizer() ; -// root[1] d->ExecuteTask() +// root[1] d->Digitize() // Warning in : object already instantiated // //Digitizes SDigitis in all events found in file galice.root // @@ -99,7 +111,7 @@ // // Reads another set of sdigits from galice2.root // root[3] d1->MixWith("galice3.root") // // Reads another set of sdigits from galice3.root -// root[4] d->ExecuteTask("deb timing") +// root[4] d->Digitize("deb timing") // // Reads SDigits from files galice1.root, galice2.root .... // // mixes them and stores produced Digits in file galice1.root // // deb - prints number of produced digits @@ -112,19 +124,23 @@ #include "TSystem.h" #include "TBenchmark.h" #include "TRandom.h" +#include "TMath.h" // --- Standard library --- // --- AliRoot header files --- +#include #include "AliLog.h" -#include "AliRunDigitizer.h" +#include "AliDigitizationInput.h" #include "AliPHOSDigit.h" -#include "AliPHOSGetter.h" #include "AliPHOSDigitizer.h" -#include "AliPHOSSDigitizer.h" #include "AliPHOSGeometry.h" #include "AliPHOSTick.h" -#include "AliPHOSQADataMaker.h" +#include "AliPHOSSimParam.h" +#include "AliPHOSCalibData.h" +#include "AliRunLoader.h" +#include "AliPHOSLoader.h" +#include "AliPHOSPulseGenerator.h" ClassImp(AliPHOSDigitizer) @@ -139,34 +155,24 @@ AliPHOSDigitizer::AliPHOSDigitizer() : fInputFileNames(0x0), fEventNames(0x0), fEmcCrystals(0), - fPinNoise(0.f), - fEMCDigitThreshold(0.f), - fCPVNoise(0.f), - fCPVDigitThreshold(0.f), - fTimeResolution(0.f), - fTimeThreshold(0.f), - fTimeSignalLength(0.f), - fADCchanelEmc(0.f), - fADCpedestalEmc(0.f), - fNADCemc(0), - fADCchanelCpv(0.f), - fADCpedestalCpv(0.f), - fNADCcpv(0), fEventFolderName(""), fFirstEvent(0), fLastEvent(0), - fQADM (0x0), - fEventCounter(0) + fcdb(0x0), + fEventCounter(0), + fPulse(0), + fADCValuesLG(0), + fADCValuesHG(0) { // ctor InitParameters() ; - fManager = 0 ; // We work in the standalong mode + fDigInput = 0 ; // We work in the standalong mode } //____________________________________________________________________________ AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, TString eventFolderName): - AliDigitizer("PHOS"+AliConfig::Instance()->GetDigitizerTaskName(), alirunFileName), + AliDigitizer("PHOSDigitizer", alirunFileName), fDefaultInit(kFALSE), fDigitsInRun(0), fInit(kFALSE), @@ -174,83 +180,26 @@ AliPHOSDigitizer::AliPHOSDigitizer(TString alirunFileName, fInputFileNames(0x0), fEventNames(0x0), fEmcCrystals(0), - fPinNoise(0.f), - fEMCDigitThreshold(0.f), - fCPVNoise(0.f), - fCPVDigitThreshold(0.f), - fTimeResolution(0.f), - fTimeThreshold(0.f), - fTimeSignalLength(0.f), - fADCchanelEmc(0.f), - fADCpedestalEmc(0.f), - fNADCemc(0), - fADCchanelCpv(0.f), - fADCpedestalCpv(0.f), - fNADCcpv(0), fEventFolderName(eventFolderName), fFirstEvent(0), fLastEvent(0), - fQADM (0x0), - fEventCounter(0) + fcdb(0x0), + fEventCounter(0), + fPulse(0), + fADCValuesLG(0), + fADCValuesHG(0) { // ctor InitParameters() ; Init() ; fDefaultInit = kFALSE ; - fManager = 0 ; // We work in the standalong mode - //Initialize the quality assurance data maker only once - fQADM = new AliPHOSQADataMaker() ; - //FIXME: get the run number - Int_t run = 0 ; - //EMXIF - GetQADataMaker()->Init(AliQA::kDIGITS, run, fgkCycles) ; - GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; -} - -//____________________________________________________________________________ -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), - 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), - fFirstEvent(d.fFirstEvent), - fLastEvent(d.fLastEvent), - fQADM (d.fQADM), - fEventCounter(0) - -{ - // copyy ctor - SetName(d.GetName()) ; - SetTitle(d.GetTitle()) ; -//Initialize the quality assurance data maker only once - //FIXME: get the run number - Int_t run = 0 ; - //EMXIF - GetQADataMaker()->Init(AliQA::kDIGITS, run, fgkCycles) ; - GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; + fDigInput = 0 ; // We work in the standalone mode + fcdb = new AliPHOSCalibData(-1); } //____________________________________________________________________________ -AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd) : - AliDigitizer(rd,"PHOS"+AliConfig::Instance()->GetDigitizerTaskName()), +AliPHOSDigitizer::AliPHOSDigitizer(AliDigitizationInput * rd) : + AliDigitizer(rd,"PHOSDigitizer"), fDefaultInit(kFALSE), fDigitsInRun(0), fInit(kFALSE), @@ -258,52 +207,36 @@ AliPHOSDigitizer::AliPHOSDigitizer(AliRunDigitizer * rd) : fInputFileNames(0x0), fEventNames(0x0), fEmcCrystals(0), - fPinNoise(0.f), - fEMCDigitThreshold(0.f), - fCPVNoise(0.f), - fCPVDigitThreshold(0.f), - fTimeResolution(0.f), - fTimeThreshold(0.f), - fTimeSignalLength(0.f), - fADCchanelEmc(0.f), - fADCpedestalEmc(0.f), - fNADCemc(0), - fADCchanelCpv(0.f), - fADCpedestalCpv(0.f), - fNADCcpv(0), - fEventFolderName(fManager->GetInputFolderName(0)), + fEventFolderName(fDigInput->GetInputFolderName(0)), fFirstEvent(0), fLastEvent(0), - fQADM (0x0), - fEventCounter(0) + fcdb (0x0), + fEventCounter(0), + fPulse(0), + fADCValuesLG(0), + fADCValuesHG(0) { // ctor Init() is called by RunDigitizer - fManager = rd ; - SetTitle(dynamic_cast(fManager->GetInputStream(0))->GetFileName(0)); + fDigInput = rd ; + SetTitle(static_cast(fDigInput->GetInputStream(0))->GetFileName(0)); InitParameters() ; fDefaultInit = kFALSE ; -//Initialize the quality assurance data maker only once - fQADM = new AliPHOSQADataMaker() ; - //FIXME: get the run number - Int_t run = 0 ; - //EMXIF - GetQADataMaker()->Init(AliQA::kDIGITS, run) ; - GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; + fcdb = new AliPHOSCalibData(-1); } //____________________________________________________________________________ AliPHOSDigitizer::~AliPHOSDigitizer() { - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle()) ; - - // Clean Digitizer from the white board - gime->PhosLoader()->CleanDigitizer() ; - // dtor + // dtor delete [] fInputFileNames ; delete [] fEventNames ; - delete fQADM ; + delete fPulse; + delete [] fADCValuesLG; + delete [] fADCValuesHG; + + if(fcdb){ delete fcdb ; fcdb=0;} } @@ -318,60 +251,123 @@ 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()) ; - Int_t ReadEvent = event ; - if (fManager) - ReadEvent = dynamic_cast(fManager->GetInputStream(0))->GetCurrentEventNumber() ; + Bool_t toMakeNoise = kTRUE ; //Do not create noisy digits if merge with real data + + //First stream + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = static_cast(rl->GetLoader("PHOSLoader")); + + Int_t readEvent = event ; + if (fDigInput) + readEvent = static_cast(fDigInput->GetInputStream(0))->GetCurrentEventNumber() ; AliDebug(1,Form("Adding event %d from input stream 0 %s %s", - ReadEvent, GetTitle(), fEventFolderName.Data())) ; - gime->Event(ReadEvent, "S") ; - TClonesArray * digits = gime->Digits() ; + 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(); + //Check which PHOS modules are present + Bool_t isPresent[5] ; + TString volpath ; + Int_t nmod=0 ; + for(Int_t i=0; i<5; i++){ + volpath = "/ALIC_1/PHOS_"; + volpath += i+1; + if (gGeoManager->CheckPath(volpath.Data())) { + isPresent[i]=1 ; + nmod++ ; + } + else{ + isPresent[i]=0 ; + } + } + + Int_t nEMC = nmod*geom->GetNPhi()*geom->GetNZ(); Int_t nCPV ; Int_t absID ; - nCPV = nEMC + geom->GetNumberOfCPVPadsZ() * geom->GetNumberOfCPVPadsPhi() * geom->GetNModules() ; + //check if CPV exists + Bool_t isCPVpresent=0 ; + for(Int_t i=1; i<=5 && !isCPVpresent; i++){ + volpath = "/ALIC_1/PHOS_"; + volpath += i; + volpath += "/PCPV_1"; + if (gGeoManager->CheckPath(volpath.Data())) + isCPVpresent=1 ; + } - digits->Expand(nCPV) ; - - // get first the sdigitizer from the tasks list - if ( !gime->SDigitizer() ) - gime->LoadSDigitizer(); - AliPHOSSDigitizer * sDigitizer = gime->SDigitizer(); + if(isCPVpresent){ + nCPV = nEMC + geom->GetNumberOfCPVPadsZ() * geom->GetNumberOfCPVPadsPhi() * nmod ; + } + else{ + nCPV = nEMC ; + } - if ( !sDigitizer ) - AliFatal(Form("SDigitizer with name %s %s not found", - GetTitle(), fEventFolderName.Data() )) ; + digits->Expand(nCPV) ; //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 * gime1 = 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())) ; - gime1->Event(ReadEvent,"S"); - sdigArray->AddAt(gime1->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 = static_cast(rl2->GetLoader("PHOSLoader")); + + if(fDigInput){ + readEvent = static_cast(fDigInput->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 crystal with signal Int_t nextSig = 200000 ; TClonesArray * sdigits ; - for(i = 0 ; i < fInput ; i++){ - sdigits = dynamic_cast(sdigArray->At(i)) ; + for(Int_t i = 0 ; i < fInput ; i++){ + sdigits = static_cast(sdigArray->At(i)) ; if ( !sdigits->GetEntriesFast() ) continue ; - Int_t curNext = dynamic_cast(sdigits->At(0))->GetId() ; + Int_t curNext = static_cast(sdigits->At(0))->GetId() ; if(curNext < nextSig) nextSig = curNext ; } @@ -382,207 +378,319 @@ 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 - for(absID = 1 ; absID <= nEMC ; absID++){ - Float_t noise = gRandom->Gaus(0., fPinNoise) ; - // YVK: do not digitize amplitudes for EMC -// new((*digits)[absID-1]) AliPHOSDigit( -1, absID, sDigitizer->Digitize(noise), TimeOfNoise() ) ; - new((*digits)[absID-1]) AliPHOSDigit( -1, absID, noise, TimeOfNoise() ) ; - //look if we have to add signal? - digit = dynamic_cast(digits->At(absID-1)) ; + Double_t apdNoise = 0. ; + if(toMakeNoise) + apdNoise = AliPHOSSimParam::GetInstance()->GetAPDNoise() ; + + Int_t emcpermod=geom->GetNPhi()*geom->GetNZ(); + Int_t idigit= 0; + for(Int_t imod=0; imod<5; imod++){ + if(!isPresent[imod]) + continue ; + Int_t firstAbsId=imod*emcpermod+1 ; + Int_t lastAbsId =(imod+1)*emcpermod ; + for(absID = firstAbsId ; absID <= lastAbsId ; absID++){ + Float_t noise = gRandom->Gaus(0.,apdNoise) ; + new((*digits)[idigit]) AliPHOSDigit( -1, absID, noise, TimeOfNoise() ) ; + //look if we have to add signal? + digit = static_cast(digits->At(idigit)) ; + idigit++ ; - if(absID==nextSig){ + if(absID==nextSig){ //Add SDigits from all inputs - ticks->Clear() ; - Int_t contrib = 0 ; - 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); +// 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++){ - if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) - curSDigit = dynamic_cast(dynamic_cast(sdigArray->At(i))->At(index[i])) ; - else - curSDigit = 0 ; - //May be several digits will contribute from the same input - while(curSDigit && curSDigit->GetId() == absID){ - //Shift primary to separate primaries belonging different inputs - Int_t primaryoffset ; - if(fManager) - primaryoffset = fManager->GetMask(i) ; - else - primaryoffset = 10000000*i ; - curSDigit->ShiftPrimary(primaryoffset) ; - - a = curSDigit->GetEnergy() ; - b = a /fTimeSignalLength ; - new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime(),0, b); - new((*ticks)[contrib++]) AliPHOSTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b); - - *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])) ; + //loop over inputs + for(Int_t i = 0 ; i < fInput ; i++){ + if( static_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ){ + curSDigit = static_cast(static_cast(sdigArray->At(i))->At(index[i])) ; + if(AliPHOSSimParam::GetInstance()->IsStreamDigits(i)){ //This is Digits Stream + curSDigit->SetEnergy(Calibrate(curSDigit->GetEnergy(),curSDigit->GetId())) ; + curSDigit->SetTime(CalibrateT(curSDigit->GetTime(),curSDigit->GetId())) ; + } + } else curSDigit = 0 ; - } - } + //May be several digits will contribute from the same input + while(curSDigit && curSDigit->GetId() == absID){ + //Shift primary to separate primaries belonging different inputs + Int_t primaryoffset ; + if(fDigInput) + primaryoffset = fDigInput->GetMask(i) ; + else + primaryoffset = 10000000*i ; + curSDigit->ShiftPrimary(primaryoffset) ; + +//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( static_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) + curSDigit = static_cast(static_cast(sdigArray->At(i))->At(index[i])) ; + else + curSDigit = 0 ; + } + } - //calculate and set time - Float_t time = FrontEdgeTime(ticks) ; - digit->SetTime(time) ; + //calculate and set time +//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++){ - sdigits = dynamic_cast(sdigArray->At(i)) ; - Int_t curNext = nextSig ; - if(sdigits->GetEntriesFast() > index[i] ){ - curNext = dynamic_cast(sdigits->At(index[i]))->GetId() ; - } - if(curNext < nextSig) nextSig = curNext ; + //Find next signal module + nextSig = 200000 ; + for(Int_t i = 0 ; i < fInput ; i++){ + sdigits = static_cast(sdigArray->At(i)) ; + Int_t curNext = nextSig ; + if(sdigits->GetEntriesFast() > index[i] ){ + curNext = static_cast(sdigits->At(index[i]))->GetId() ; + } + if(curNext < nextSig) nextSig = curNext ; + } } } } + + + //Apply non-linearity + if(AliPHOSSimParam::GetInstance()->IsCellNonlinearityOn()){ //Apply non-lineairyt on cell level + const Double_t aNL = AliPHOSSimParam::GetInstance()->GetCellNonLineairyA() ; + const Double_t bNL = AliPHOSSimParam::GetInstance()->GetCellNonLineairyB() ; + const Double_t cNL = AliPHOSSimParam::GetInstance()->GetCellNonLineairyC() ; + for(Int_t i = 0 ; i < nEMC ; i++){ + digit = static_cast( digits->At(i) ) ; + Double_t e= digit->GetEnergy() ; + // version(1) digit->SetEnergy(e*(1+a*TMath::Exp(-e/b))) ; + digit->SetEnergy(e*cNL*(1.+aNL*TMath::Exp(-e*e/2./bNL/bNL))) ; //Better agreement with data... + } + } + + + //distretize energy if necessary + if(AliPHOSSimParam::GetInstance()->IsEDigitizationOn()){ + Float_t adcW=AliPHOSSimParam::GetInstance()->GetADCchannelW() ; + for(Int_t i = 0 ; i < nEMC ; i++){ + digit = static_cast( digits->At(i) ) ; + digit->SetEnergy(adcW*ceil(digit->GetEnergy()/adcW)) ; + } + } + + //Apply decalibration if necessary + for(Int_t i = 0 ; i < nEMC ; i++){ + digit = static_cast( digits->At(i) ) ; + Decalibrate(digit) ; + } - ticks->Delete() ; - delete ticks ; +// ticks->Delete() ; +// delete ticks ; //Now CPV digits (different noise and no timing) - 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() ) ; - //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++){ - if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) - curSDigit = dynamic_cast( dynamic_cast(sdigArray->At(i))->At(index[i])) ; - else - curSDigit = 0 ; - - //May be several digits will contribute from the same input - while(curSDigit && curSDigit->GetId() == absID){ - //Shift primary to separate primaries belonging different inputs - Int_t primaryoffset ; - if(fManager) - primaryoffset = fManager->GetMask(i) ; - else - primaryoffset = 10000000*i ; - curSDigit->ShiftPrimary(primaryoffset) ; - - //add energies - *digit += *curSDigit ; - index[i]++ ; - if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) - curSDigit = dynamic_cast( dynamic_cast(sdigArray->At(i))->At(index[i]) ) ; - else - curSDigit = 0 ; - } - } - - //Find next signal module - nextSig = 200000 ; - for(i = 0 ; i < fInput ; i++){ - sdigits = dynamic_cast(sdigArray->At(i)) ; - Int_t curNext = nextSig ; - if(sdigits->GetEntriesFast() > index[i] ) - curNext = dynamic_cast( sdigits->At(index[i]) )->GetId() ; - if(curNext < nextSig) nextSig = curNext ; - } + Int_t cpvpermod = geom->GetNumberOfCPVPadsZ() * geom->GetNumberOfCPVPadsPhi() ; + Int_t nEMCtotal=emcpermod*5 ; + Float_t cpvNoise = AliPHOSSimParam::GetInstance()->GetCPVNoise() ; + if(isCPVpresent){ //CPV is present in current geometry + for(Int_t imod=0; imod<5; imod++){ //module is present in current geometry + if(!isPresent[imod]) + continue ; + Int_t firstAbsId=nEMCtotal+imod*cpvpermod+1 ; + Int_t lastAbsId =nEMCtotal+(imod+1)*cpvpermod ; + for(absID = firstAbsId; absID <= lastAbsId; absID++){ + Float_t noise = gRandom->Gaus(0., cpvNoise) ; + new((*digits)[idigit]) AliPHOSDigit( -1,absID,noise, TimeOfNoise() ) ; + idigit++ ; + //look if we have to add signal? + if(absID==nextSig){ + digit = static_cast(digits->At(idigit-1)) ; + //Add SDigits from all inputs + for(Int_t i = 0 ; i < fInput ; i++){ + if( static_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) + curSDigit = static_cast( static_cast(sdigArray->At(i))->At(index[i])) ; + else + curSDigit = 0 ; + + //May be several digits will contribute from the same input + while(curSDigit && curSDigit->GetId() == absID){ + //Shift primary to separate primaries belonging different inputs + Int_t primaryoffset ; + if(fDigInput) + primaryoffset = fDigInput->GetMask(i) ; + else + primaryoffset = 10000000*i ; + curSDigit->ShiftPrimary(primaryoffset) ; + + //add energies + *digit += *curSDigit ; + index[i]++ ; + if( static_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) + curSDigit = static_cast( static_cast(sdigArray->At(i))->At(index[i]) ) ; + else + curSDigit = 0 ; + } + } + + //Find next signal module + nextSig = 200000 ; + for(Int_t i = 0 ; i < fInput ; i++){ + sdigits = static_cast(sdigArray->At(i)) ; + Int_t curNext = nextSig ; + if(sdigits->GetEntriesFast() > index[i] ) + curNext = static_cast( sdigits->At(index[i]) )->GetId() ; + if(curNext < nextSig) nextSig = curNext ; + } + } + } } } 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 GetEntriesFast(); i++){ + digit = static_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++){ - digit = dynamic_cast( digits->At(i) ) ; - DecalibrateEMC(digit); - if(digit->GetEnergy() < fEMCDigitThreshold) + Float_t emcThreshold = AliPHOSSimParam::GetInstance()->GetEmcDigitsThreshold() ; + for(Int_t i = 0 ; i < nEMC ; i++){ + digit = static_cast( digits->At(i) ) ; + + if(digit->GetEnergy() < emcThreshold){ digits->RemoveAt(i) ; - else - digit->SetTime(gRandom->Gaus(digit->GetTime(),fTimeResolution) ) ; - } + continue ; + } + geom->AbsToRelNumbering(digit->GetId(),relId); - for(i = nEMC; i < nCPV ; i++) -// if( sDigitizer->Calibrate( dynamic_cast(digits->At(i))->GetAmp() ) < fCPVDigitThreshold ) - if( dynamic_cast(digits->At(i))->GetEnergy() < fCPVDigitThreshold ) +// digit->SetEnergy(TMath::Ceil(digit->GetEnergy())-0.9999) ; + + Float_t tres = TimeResolution(digit->GetEnergy()) ; + digit->SetTime(gRandom->Gaus(digit->GetTime(), tres) ) ; + + fPulse->Reset(); + fPulse->SetAmplitude(digit->GetEnergy()/ + fcdb->GetADCchannelEmc(relId[0],relId[3],relId[2])); + fPulse->SetTZero(digit->GetTimeR()); + fPulse->MakeSamples(); + fPulse->GetSamples(fADCValuesHG, fADCValuesLG) ; + Int_t nSamples = fPulse->GetRawFormatTimeBins(); + digit->SetALTROSamplesHG(nSamples,fADCValuesHG); + digit->SetALTROSamplesLG(nSamples,fADCValuesLG); + } + + Float_t cpvDigitThreshold = AliPHOSSimParam::GetInstance()->GetCpvDigitsThreshold() ; + for(Int_t i = nEMC; i < nCPV ; i++){ + if( static_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++) { - digit = dynamic_cast( digits->At(i) ) ; + for (Int_t i = 0 ; i < ndigits ; i++) { + digit = static_cast( digits->At(i) ) ; digit->SetIndexInList(i) ; if(digit->GetId() > fEmcCrystals){ //digitize CPV only digit->SetAmp(DigitizeCPV(digit->GetEnergy(),digit->GetId()) ) ; } } - Int_t relId[4]; +} +//____________________________________________________________________________ +Float_t AliPHOSDigitizer::Calibrate(Float_t amp,Int_t absId){ + //Apply calibration + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; - //set amplitudes in bad channels to zero - for(i = 0 ; i GetEntries(); i++){ - digit = dynamic_cast( digits->At(i) ) ; - gime->PHOSGeometry()->AbsToRelNumbering(digit->GetId(),relId); - if(relId[1] == 0) // Emc - if(gime->CalibData()->IsBadChannelEmc(relId[0],relId[3],relId[2])) digit->SetEnergy(0.); + //Determine rel.position of the cell absolute ID + Int_t relId[4]; + geom->AbsToRelNumbering(absId,relId); + Int_t module=relId[0]; + Int_t row =relId[2]; + Int_t column=relId[3]; + if(relId[1]==0){ //This Is EMC + Float_t calibration = fcdb->GetADCchannelEmc(module,column,row); + return amp*calibration ; } - + return 0 ; } - //____________________________________________________________________________ -void AliPHOSDigitizer::DecalibrateEMC(AliPHOSDigit *digit) +void AliPHOSDigitizer::Decalibrate(AliPHOSDigit *digit) { // Decalibrate EMC digit, i.e. change its energy by a factor read from CDB - AliPHOSGetter* gime = AliPHOSGetter::Instance(); + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; - if(!gime->CalibData()) { - AliPHOSCalibData* cdb = new AliPHOSCalibData(-1); - gime->SetCalibData(cdb); + //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]; + if(relId[1]==0){ //This Is EMC + Float_t decalib = fcdb->GetADCchannelEmcDecalib(module,column,row); // O(1) + Float_t calibration = fcdb->GetADCchannelEmc(module,column,row)*decalib; + Float_t energy = digit->GetEnergy()/calibration; + digit->SetEnergy(energy); //Now digit measures E in ADC counts + Float_t time = digit->GetTime() ; + time-=fcdb->GetTimeShiftEmc(module,column,row); + digit->SetTime(time) ; } +} +//____________________________________________________________________________ +Float_t AliPHOSDigitizer::CalibrateT(Float_t time,Int_t absId){ + //Apply time calibration + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; //Determine rel.position of the cell absolute ID Int_t relId[4]; - gime->PHOSGeometry()->AbsToRelNumbering(digit->GetId(),relId); + geom->AbsToRelNumbering(absId,relId); Int_t module=relId[0]; Int_t row =relId[2]; Int_t column=relId[3]; - Float_t decalibration = gime->CalibData()->GetADCchannelEmc(module,column,row); - Float_t energy = digit->GetEnergy() / decalibration; - digit->SetEnergy(energy); + time += fcdb->GetTimeShiftEmc(module,column,row); + return time ; } //____________________________________________________________________________ Int_t AliPHOSDigitizer::DigitizeCPV(Float_t charge, Int_t absId) { // Returns digitized value of the CPV charge in a pad absId - AliPHOSGetter* gime = AliPHOSGetter::Instance(); - - if(!gime->CalibData()) { - AliPHOSCalibData* cdb = new AliPHOSCalibData(-1); // use AliCDBManager's run number - gime->SetCalibData(cdb); - } + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; //Determine rel.position of the cell absId Int_t relId[4]; - gime->PHOSGeometry()->AbsToRelNumbering(absId,relId); + geom->AbsToRelNumbering(absId,relId); Int_t module=relId[0]; Int_t row =relId[2]; Int_t column=relId[3]; @@ -592,21 +700,18 @@ Int_t AliPHOSDigitizer::DigitizeCPV(Float_t charge, Int_t absId) if(absId > fEmcCrystals){ //digitize CPV only //reading calibration data for cell absId. - //If no calibration DB found, accept default values. + Float_t adcPedestalCpv = fcdb->GetADCpedestalCpv(module,column,row); + Float_t adcChanelCpv = fcdb->GetADCchannelCpv( module,column,row); - if(gime->CalibData()) { - fADCpedestalCpv = gime->CalibData()->GetADCpedestalCpv(module,column,row); - fADCchanelCpv = gime->CalibData()->GetADCchannelCpv( module,column,row); - } - - channel = (Int_t) TMath::Ceil((charge - fADCpedestalCpv)/fADCchanelCpv) ; - if(channel > fNADCcpv ) channel = fNADCcpv ; + channel = (Int_t) TMath::Ceil((charge - adcPedestalCpv)/adcChanelCpv) ; + Int_t nMax = AliPHOSSimParam::GetInstance()->GetNADCcpv() ; + if(channel > nMax ) channel = nMax ; } return channel ; } //____________________________________________________________________________ -void AliPHOSDigitizer::Exec(Option_t *option) +void AliPHOSDigitizer::Digitize(Option_t *option) { // Steering method to process digitization for events // in the range from fFirstEvent to fLastEvent. @@ -625,29 +730,15 @@ void AliPHOSDigitizer::Exec(Option_t *option) return ; } - // check the QA result for Hits and SDigits - AliQA * qa = AliQA::Instance(AliQA::kPHOS) ; - if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kFATAL)) { - AliFatal("QA status in Hits and/or SDIGITS was Fatal") ; - } else if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kERROR)) { - AliError("QA status in Hits and/or SDIGITS was Error") ; - } else if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kWARNING) ) { - AliWarning("QA status in Hits and/or SDIGITS was Warning") ; - } else if ( qa->IsSet(AliQA::kPHOS, AliQA::kSIM, AliQA::kINFO) ) { - AliInfo("QA status in Hits and/or SDIGITS was Info") ; - } - if(strstr(option,"tim")) gBenchmark->Start("PHOSDigitizer"); - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle()) ; - - // Post Digitizer to the white board - gime->PostDigitizer(this) ; + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = static_cast(rl->GetLoader("PHOSLoader")); if (fLastEvent == -1) - fLastEvent = gime->MaxEvent() - 1 ; - else if (fManager) + fLastEvent = rl->GetNumberOfEvents() - 1 ; + else if (fDigInput) fLastEvent = fFirstEvent ; Int_t nEvents = fLastEvent - fFirstEvent + 1; @@ -656,35 +747,18 @@ void AliPHOSDigitizer::Exec(Option_t *option) for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) { fEventCounter++ ; - gime->Event(ievent,"S") ; Digitize(ievent) ; //Add prepared SDigits to digits and add the noise - //makes the quality assurance data - if (GetQADataMaker()->IsCycleDone() ) { - GetQADataMaker()->EndOfCycle(AliQA::kDIGITS) ; - GetQADataMaker()->StartOfCycle(AliQA::kDIGITS) ; - } - GetQADataMaker()->Exec(AliQA::kDIGITS, gime->Digits()) ; - GetQADataMaker()->Increment() ; - WriteDigits() ; if(strstr(option,"deb")) PrintDigits(option); //increment the total number of Digits per run - fDigitsInRun += gime->Digits()->GetEntriesFast() ; + fDigitsInRun += phosLoader->Digits()->GetEntriesFast() ; } - //Write the quality assurance data only after the last event - if ( fEventCounter == gime->MaxEvent() ) { - GetQADataMaker()->EndOfCycle(AliQA::kDIGITS) ; - GetQADataMaker()->Finish(AliQA::kDIGITS) ; - } - - gime->PhosLoader()->CleanDigitizer(); - if(strstr(option,"tim")){ gBenchmark->Stop("PHOSDigitizer"); TString message ; @@ -694,56 +768,53 @@ 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() ; + + AliPHOSGeometry *geom; + if (!(geom = AliPHOSGeometry::GetInstance())) + geom = AliPHOSGeometry::GetInstance("IHEP",""); +// 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) - fInput = fManager->GetNinputs() ; + if (fDigInput) + fInput = fDigInput->GetNinputs() ; else fInput = 1 ; @@ -753,14 +824,16 @@ Bool_t AliPHOSDigitizer::Init() fEventNames[0] = fEventFolderName.Data() ; Int_t index ; for (index = 1 ; index < fInput ; index++) { - fInputFileNames[index] = dynamic_cast(fManager->GetInputStream(index))->GetFileName(0); - TString tempo = fManager->GetInputFolderName(index) ; - fEventNames[index] = tempo.Remove(tempo.Length()-1) ; // strip of the stream number added by fManager + fInputFileNames[index] = static_cast(fDigInput->GetInputStream(index))->GetFileName(0); + TString tempo = fDigInput->GetInputFolderName(index) ; + fEventNames[index] = tempo.Remove(tempo.Length()-1) ; // strip of the stream number added by fDigInput } //to prevent cleaning of this object while GetEvent is called - gime->PhosLoader()->GetDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); - + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + if(!rl){ + AliRunLoader::Open(GetTitle(), fEventFolderName) ; + } return fInit ; } @@ -769,79 +842,14 @@ void AliPHOSDigitizer::InitParameters() { // Set initial parameters Digitizer - fPinNoise = 0.004 ; // [GeV] - fEMCDigitThreshold = 0.012 ; // [GeV] - fCPVNoise = 0.01; // [aux units] - fCPVDigitThreshold = 0.09 ; // [aux units] - fTimeResolution = 0.5e-9 ; // [sec] - fTimeSignalLength = 1.0e-9 ; // [sec] fDigitsInRun = 0 ; - fADCchanelEmc = 1.0; // Coefficient between real and measured energies in EMC - fADCpedestalEmc = 0. ; // - 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 - fTimeThreshold = 0.001 ; // [GeV] SetEventRange(0,-1) ; + fPulse = new AliPHOSPulseGenerator(); + fADCValuesLG = new Int_t[fPulse->GetRawFormatTimeBins()]; + fADCValuesHG = new Int_t[fPulse->GetRawFormatTimeBins()]; } -//__________________________________________________________________ -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 Option_t *)const { @@ -851,7 +859,7 @@ void AliPHOSDigitizer::Print(const Option_t *)const printf(" Writing Digits to branch with title %s\n", fEventFolderName.Data()) ; Int_t nStreams ; - if (fManager) + if (fDigInput) nStreams = GetNInputStreams() ; else nStreams = fInput ; @@ -860,20 +868,14 @@ void AliPHOSDigitizer::Print(const Option_t *)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 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("\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 @@ -886,8 +888,11 @@ void AliPHOSDigitizer::Print(const Option_t *)const { // Print a table of digits - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - TClonesArray * digits = gime->Digits() ; + + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = static_cast(rl->GetLoader("PHOSLoader")); + TClonesArray * digits = phosLoader->Digits() ; + const AliPHOSGeometry *geom = AliPHOSGeometry::GetInstance() ; AliInfo(Form("%d", digits->GetEntriesFast())) ; printf("\nevent %d", gAlice->GetEvNumber()) ; @@ -899,10 +904,10 @@ void AliPHOSDigitizer::Print(const Option_t *)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++) { + (static_cast(digits->At(index))->GetId() <= maxEmc) ; index++) { digit = (AliPHOSDigit * ) digits->At(index) ; if(digit->GetNprimary() == 0) continue; @@ -924,7 +929,7 @@ void AliPHOSDigitizer::Print(const Option_t *)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) ; @@ -957,12 +962,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 = static_cast(rl->GetLoader("PHOSLoader")); + phosLoader->UnloadSDigits() ; } - AliPHOSGetter * gime = AliPHOSGetter::Instance(GetTitle(), fEventFolderName) ; - gime->PhosLoader()->UnloadDigits() ; + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = static_cast(rl->GetLoader("PHOSLoader")); + phosLoader->UnloadDigits() ; } //____________________________________________________________________________ @@ -977,18 +984,23 @@ 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()) ; - const TClonesArray * digits = gime->Digits() ; - TTree * treeD = gime->TreeD(); - + AliRunLoader* rl = AliRunLoader::GetRunLoader(fEventFolderName) ; + AliPHOSLoader * phosLoader = static_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","TClonesArray",&digits,bufferSize); digitsBranch->SetTitle(fEventFolderName); digitsBranch->Fill() ; - gime->WriteDigits("OVERWRITE"); - gime->WriteDigitizer("OVERWRITE"); + phosLoader->WriteDigits("OVERWRITE"); Unload() ;