X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALDigitizer.cxx;h=12ceca89ec337dab28ac2f57188b5b12174bec86;hb=4e3d5771a6cd7fcd9e8c060aca5d033973463f4f;hp=090c9e149356a08fece1a2a6c7cbb53f3567e600;hpb=fb43ada4db956ceb59baa593557bff7082e4bfc2;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx index 090c9e14935..12ceca89ec3 100644 --- a/EMCAL/AliEMCALDigitizer.cxx +++ b/EMCAL/AliEMCALDigitizer.cxx @@ -55,97 +55,180 @@ // Modif: // August 2002 Yves Schutz: clone PHOS as closely as possible and intoduction // of new IO (à la PHOS) -///_________________________________________________________________________________ +// November 2003 Aleksei Pavlinov : adopted for Shish-Kebab geometry +//_________________________________________________________________________________ // --- ROOT system --- -#include "TTree.h" -#include "TSystem.h" -#include "TBenchmark.h" - -// --- Standard library --- +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // --- AliRoot header files --- +#include "AliLog.h" +#include "AliRun.h" #include "AliRunDigitizer.h" +#include "AliRunLoader.h" +#include "AliCDBManager.h" +#include "AliCDBEntry.h" #include "AliEMCALDigit.h" #include "AliEMCAL.h" -#include "AliEMCALGetter.h" +#include "AliEMCALLoader.h" #include "AliEMCALDigitizer.h" #include "AliEMCALSDigitizer.h" #include "AliEMCALGeometry.h" #include "AliEMCALTick.h" +#include "AliEMCALHistoUtilities.h" ClassImp(AliEMCALDigitizer) //____________________________________________________________________________ - AliEMCALDigitizer::AliEMCALDigitizer():AliDigitizer("",""), - fInput(0), - fInputFileNames(0x0), - fEventNames(0x0) +AliEMCALDigitizer::AliEMCALDigitizer() + : AliDigitizer("",""), + fDefaultInit(kTRUE), + fDigitsInRun(0), + fInit(0), + fInput(0), + fInputFileNames(0x0), + fEventNames(0x0), + fDigitThreshold(0), + fMeanPhotonElectron(0), + fPedestal(0), + fSlope(0), + fPinNoise(0), + fTimeResolution(0), + fTimeThreshold(0), + fTimeSignalLength(0), + fADCchannelEC(0), + fADCpedestalEC(0), + fNADCEC(0), + fEventFolderName(""), + fFirstEvent(0), + fLastEvent(0), + fControlHists(0), + fHists(0),fCalibData(0x0) { // ctor InitParameters() ; - fDefaultInit = kTRUE ; fManager = 0 ; // We work in the standalong mode - fEventFolderName = "" ; } //____________________________________________________________________________ -AliEMCALDigitizer::AliEMCALDigitizer(TString alirunFileName, TString eventFolderName): - AliDigitizer("EMCAL"+AliConfig::fgkDigitizerTaskName, alirunFileName), - fInputFileNames(0), fEventNames(0), fEventFolderName(eventFolderName) +AliEMCALDigitizer::AliEMCALDigitizer(TString alirunFileName, TString eventFolderName) + : AliDigitizer("EMCAL"+AliConfig::Instance()->GetDigitizerTaskName(), alirunFileName), + fDefaultInit(kFALSE), + fDigitsInRun(0), + fInit(0), + fInput(0), + fInputFileNames(0), + fEventNames(0), + fDigitThreshold(0), + fMeanPhotonElectron(0), + fPedestal(0), + fSlope(0), + fPinNoise(0), + fTimeResolution(0), + fTimeThreshold(0), + fTimeSignalLength(0), + fADCchannelEC(0), + fADCpedestalEC(0), + fNADCEC(0), + fEventFolderName(eventFolderName), + fFirstEvent(0), + fLastEvent(0), + fControlHists(0), + fHists(0) { // ctor - InitParameters() ; Init() ; - fDefaultInit = kFALSE ; fManager = 0 ; // We work in the standalong mode } //____________________________________________________________________________ -AliEMCALDigitizer::AliEMCALDigitizer(const AliEMCALDigitizer & d) : AliDigitizer(d) +AliEMCALDigitizer::AliEMCALDigitizer(const AliEMCALDigitizer & d) + : AliDigitizer(d.GetName(),d.GetTitle()), + fDefaultInit(d.fDefaultInit), + fDigitsInRun(d.fDigitsInRun), + fInit(d.fInit), + fInput(d.fInput), + fInputFileNames(d.fInputFileNames), + fEventNames(d.fEventNames), + fDigitThreshold(d.fDigitThreshold), + fMeanPhotonElectron(d.fMeanPhotonElectron), + fPedestal(d.fPedestal), + fSlope(d.fSlope), + fPinNoise(d.fPinNoise), + fTimeResolution(d.fTimeResolution), + fTimeThreshold(d.fTimeThreshold), + fTimeSignalLength(d.fTimeSignalLength), + fADCchannelEC(d.fADCchannelEC), + fADCpedestalEC(d.fADCpedestalEC), + fNADCEC(d.fNADCEC), + fEventFolderName(d.fEventFolderName), + fFirstEvent(d.fFirstEvent), + fLastEvent(d.fLastEvent), + fControlHists(d.fControlHists), + fHists(d.fHists),fCalibData(d.fCalibData) { // copyy ctor - - SetName(d.GetName()) ; - SetTitle(d.GetTitle()) ; - fDigitThreshold = d.fDigitThreshold ; - fMeanPhotonElectron = d.fMeanPhotonElectron ; - fPedestal = d.fPedestal ; - fSlope = d.fSlope ; - fPinNoise = d.fPinNoise ; - fTimeResolution = d.fTimeResolution ; - fTimeThreshold = d.fTimeThreshold ; - fTimeSignalLength = d.fTimeSignalLength ; - fADCchannelEC = d.fADCchannelEC ; - fADCpedestalEC = d.fADCpedestalEC ; - fNADCEC = d.fNADCEC ; - fEventFolderName = d.fEventFolderName; } //____________________________________________________________________________ -AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd): - AliDigitizer(rd,"EMCAL"+AliConfig::fgkDigitizerTaskName), - fEventFolderName(0) +AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd) + : AliDigitizer(rd,"EMCAL"+AliConfig::Instance()->GetDigitizerTaskName()), + fDefaultInit(kFALSE), + fDigitsInRun(0), + fInit(0), + fInput(0), + fInputFileNames(0), + fEventNames(0), + fDigitThreshold(0.), + fMeanPhotonElectron(0), + fPedestal(0), + fSlope(0.), + fPinNoise(0), + fTimeResolution(0.), + fTimeThreshold(0), + fTimeSignalLength(0), + fADCchannelEC(0), + fADCpedestalEC(0), + fNADCEC(0), + fEventFolderName(0), + fFirstEvent(0), + fLastEvent(0), + fControlHists(0), + fHists(0) { // ctor Init() is called by RunDigitizer fManager = rd ; fEventFolderName = fManager->GetInputFolderName(0) ; SetTitle(dynamic_cast(fManager->GetInputStream(0))->GetFileName(0)); InitParameters() ; - fDefaultInit = kFALSE ; } //____________________________________________________________________________ AliEMCALDigitizer::~AliEMCALDigitizer() { - // dtor - AliEMCALGetter * gime =AliEMCALGetter::Instance(GetTitle(),fEventFolderName); - gime->EmcalLoader()->CleanDigitizer(); + //dtor + if (AliRunLoader::GetRunLoader()) { + AliLoader *emcalLoader=0; + if ((emcalLoader = AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"))) + emcalLoader->CleanDigitizer(); + } + else + AliDebug(1," no runloader present"); delete [] fInputFileNames ; delete [] fEventNames ; + if(fHists) delete fHists; } //____________________________________________________________________________ @@ -158,45 +241,74 @@ void AliEMCALDigitizer::Digitize(Int_t event) // after that adds contributions from SDigits. This design // helps to avoid scanning over the list of digits to add // contribution of any new SDigit. + static int isTrd1Geom = -1; // -1 - mean undefined + static int nEMC=0; //max number of digits possible - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName) ; - Int_t ReadEvent = event ; + AliRunLoader *rl = AliRunLoader::GetRunLoader(); + AliEMCALLoader *emcalLoader = dynamic_cast(rl->GetDetectorLoader("EMCAL")); + Int_t readEvent = event ; + // fManager is data member from AliDigitizer if (fManager) - ReadEvent = dynamic_cast(fManager->GetInputStream(0))->GetCurrentEventNumber() ; - Info("Digitize", "Adding event %d from input stream 0", ReadEvent) ; - gime->Event(ReadEvent, "S") ; - TClonesArray * digits = gime->Digits() ; - digits->Clear() ; + 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); + + TClonesArray * digits = emcalLoader->Digits() ; + digits->Delete() ; + + // Load Geometry + AliEMCALGeometry *geom = 0; + if (rl->GetAliRun()) { + AliEMCAL * emcal = (AliEMCAL*)rl->GetAliRun()->GetDetector("EMCAL"); + geom = emcal->GetGeometry(); + } + else + AliFatal("Could not get AliRun from runLoader"); - const AliEMCALGeometry *geom = gime->EMCALGeometry() ; + if(isTrd1Geom < 0) { + AliInfo(Form(" get Geometry %s : %s ", geom->GetName(),geom->GetTitle())); + TString ng(geom->GetName()); + isTrd1Geom = 0; + if(ng.Contains("SHISH") && ng.Contains("TRD1")) isTrd1Geom = 1; - Int_t nEMC = geom->GetNPhi()*geom->GetNZ(); //max number of digits possible - + if(isTrd1Geom == 0) nEMC = geom->GetNPhi()*geom->GetNZ(); + else nEMC = geom->GetNCells(); + AliDebug(1,Form("nEMC %i (number cells in EMCAL) | %s | isTrd1Geom %i\n", nEMC, geom->GetName(), isTrd1Geom)); + } Int_t absID ; digits->Expand(nEMC) ; // get first the sdigitizer from the tasks list (must have same name as the digitizer) - if ( !gime->SDigitizer() ) - gime->LoadSDigitizer(); - AliEMCALSDigitizer * sDigitizer = gime->SDigitizer(); + if ( !emcalLoader->SDigitizer() ) + emcalLoader->LoadSDigitizer(); + AliEMCALSDigitizer * sDigitizer = dynamic_cast(emcalLoader->SDigitizer()); if ( !sDigitizer ) Fatal("Digitize", "SDigitizer with name %s %s not found", fEventFolderName.Data(), GetTitle() ) ; //take all the inputs to add together and load the SDigits TObjArray * sdigArray = new TObjArray(fInput) ; - sdigArray->AddAt(gime->SDigits(), 0) ; + sdigArray->AddAt(emcalLoader->SDigits(), 0) ; Int_t i ; + for(i = 1 ; i < fInput ; i++){ TString tempo(fEventNames[i]) ; tempo += i ; - AliEMCALGetter * gime = AliEMCALGetter::Instance(fInputFileNames[i], tempo) ; + + AliRunLoader * rl2 = AliRunLoader::GetRunLoader(tempo) ; + + if (rl2==0) + rl2 = AliRunLoader::Open(fInputFileNames[i], tempo) ; + if (fManager) - ReadEvent = dynamic_cast(fManager->GetInputStream(i))->GetCurrentEventNumber() ; - Info("Digitize", "Adding event %d from input stream %d", ReadEvent, i) ; - gime->Event(ReadEvent,"S"); - sdigArray->AddAt(gime->SDigits(), i) ; + readEvent = dynamic_cast(fManager->GetInputStream(i))->GetCurrentEventNumber() ; + Info("Digitize", "Adding event %d from input stream %d %s %s", readEvent, i, fInputFileNames[i].Data(), tempo.Data()) ; + rl2->LoadSDigits(); + rl2->GetEvent(readEvent); + AliEMCALLoader *emcalLoader2 = dynamic_cast(rl2->GetDetectorLoader("EMCAL")); + sdigArray->AddAt(emcalLoader2->SDigits(), i) ; } //Find the first tower with signal @@ -209,7 +321,10 @@ void AliEMCALDigitizer::Digitize(Int_t event) Int_t curNext = dynamic_cast(sdigits->At(0))->GetId() ; if(curNext < nextSig) nextSig = curNext ; + AliDebug(1,Form("input %i : #sdigits %i \n", + i, sdigits->GetEntriesFast())); } + AliDebug(1,Form("FIRST tower with signal %i \n", nextSig)); TArrayI index(fInput) ; index.Reset() ; //Set all indexes to zero @@ -220,12 +335,12 @@ void AliEMCALDigitizer::Digitize(Int_t event) TClonesArray * ticks = new TClonesArray("AliEMCALTick",1000) ; //Put Noise contribution - for(absID = 1; absID <= nEMC; absID++){ + for(absID = 0; absID < nEMC; absID++){ // Nov 30, 2006 by PAI; was from 1 to nEMC Float_t amp = 0 ; // amplitude set to zero, noise will be added later - new((*digits)[absID-1]) AliEMCALDigit( -1, -1, absID, 0, TimeOfNoise() ) ; + new((*digits)[absID]) AliEMCALDigit( -1, -1, absID, 0, TimeOfNoise() ); // absID-1->absID //look if we have to add signal? - digit = dynamic_cast(digits->At(absID-1)) ; + digit = dynamic_cast(digits->At(absID)); // absID-1->absID if(absID==nextSig){ //Add SDigits from all inputs @@ -263,7 +378,7 @@ void AliEMCALDigitizer::Digitize(Int_t event) index[i]++ ; if( dynamic_cast(sdigArray->At(i))->GetEntriesFast() > index[i] ) - curSDigit = dynamic_cast(dynamic_cast(sdigArray->At(i))->At(index[i])) ; + curSDigit = dynamic_cast(dynamic_cast(sdigArray->At(i))->At(index[i])) ; else curSDigit = 0 ; } @@ -290,7 +405,9 @@ void AliEMCALDigitizer::Digitize(Int_t event) // add the noise now amp += TMath::Abs(gRandom->Gaus(0., fPinNoise)) ; digit->SetAmp(sDigitizer->Digitize(amp)) ; - } + AliDebug(10,Form(" absID %5i amp %f nextSig %5i\n", + absID, amp, nextSig)); + } // for(absID = 1; absID <= nEMC; absID++) ticks->Delete() ; delete ticks ; @@ -310,26 +427,63 @@ void AliEMCALDigitizer::Digitize(Int_t event) digits->Compress() ; Int_t ndigits = digits->GetEntriesFast() ; - digits->Expand(ndigits) ; - //Set indexes in list of digits + //Set indexes in list of digits and fill hists. + AliEMCALHistoUtilities::FillH1(fHists, 0, Double_t(ndigits)); + Float_t energy=0., esum=0.; for (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) ) ; + energy = sDigitizer->Calibrate(digit->GetAmp()) ; + esum += energy; + digit->SetAmp(DigitizeEnergy(energy, digit->GetId()) ) ; // for what ?? + AliEMCALHistoUtilities::FillH1(fHists, 2, double(digit->GetAmp())); + AliEMCALHistoUtilities::FillH1(fHists, 3, double(energy)); + AliEMCALHistoUtilities::FillH1(fHists, 4, double(digit->GetId())); + // if(digit->GetId() == nEMC) { + // printf(" i %i \n", i ); + // digit->Dump(); + // assert(0); + //} } + AliEMCALHistoUtilities::FillH1(fHists, 1, esum); } -//____________________________________________________________________________ - -Int_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy) +// //_____________________________________________________________________ +Int_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy, Int_t AbsId) { + // Returns digitized value of the energy in a cell absId + + // Load Geometry + const AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance(); + + if (geom==0) + AliFatal("Did not get geometry from EMCALLoader"); + + Int_t iSupMod = -1; + Int_t nModule = -1; + Int_t nIphi = -1; + Int_t nIeta = -1; + Int_t iphi = -1; + Int_t ieta = -1; Int_t channel = -999; + + Bool_t bCell = geom->GetCellIndex(AbsId, iSupMod, nModule, nIphi, nIeta) ; + if(!bCell) + Error("DigitizeEnergy","Wrong cell id number : AbsId %i ", AbsId) ; + geom->GetCellPhiEtaIndexInSModule(iSupMod,nModule,nIphi, nIeta,iphi,ieta); + + if(fCalibData) { + fADCpedestalEC = fCalibData->GetADCpedestal(iSupMod,ieta,iphi); + fADCchannelEC = fCalibData->GetADCchannel(iSupMod,ieta,iphi); + } + channel = static_cast (TMath::Ceil( (energy + fADCpedestalEC)/fADCchannelEC )) ; + if(channel > fNADCEC ) channel = fNADCEC ; return channel ; + } //____________________________________________________________________________ @@ -347,27 +501,33 @@ void AliEMCALDigitizer::Exec(Option_t *option) } if (strstr(option,"print")) { + Print(); return ; } if(strstr(option,"tim")) gBenchmark->Start("EMCALDigitizer"); + + AliRunLoader *rl = AliRunLoader::GetRunLoader(); + AliEMCALLoader *emcalLoader = dynamic_cast(rl->GetDetectorLoader("EMCAL")); + + // Post Digitizer to the white board + emcalLoader->PostDigitizer(this) ; - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle()) ; - - if (fLastEvent == -1) - fLastEvent = gime->MaxEvent() - 1 ; + if (fLastEvent == -1) { + fLastEvent = rl->GetNumberOfEvents() - 1 ; + } else if (fManager) - fLastEvent = fFirstEvent ; + fLastEvent = fFirstEvent ; // what is this ?? Int_t nEvents = fLastEvent - fFirstEvent + 1; - - Int_t ievent ; + Int_t ievent; + rl->LoadSDigits("EMCAL"); for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) { - - gime->Event(ievent,"S") ; + + rl->GetEvent(ievent); Digitize(ievent) ; //Add prepared SDigits to digits and add the noise @@ -375,15 +535,18 @@ void AliEMCALDigitizer::Exec(Option_t *option) if(strstr(option,"deb")) PrintDigits(option); + if(strstr(option,"table")) gObjectTable->Print(); //increment the total number of Digits per run - fDigitsInRun += gime->Digits()->GetEntriesFast() ; + fDigitsInRun += emcalLoader->Digits()->GetEntriesFast() ; } + emcalLoader->CleanDigitizer() ; + if(strstr(option,"tim")){ gBenchmark->Stop("EMCALDigitizer"); - printf("Exec: took %f seconds for Digitizing %f seconds per event", - gBenchmark->GetCpuTime("EMCALDigitizer"), gBenchmark->GetCpuTime("EMCALDigitizer")/nEvents ) ; + AliInfo(Form("Exec: took %f seconds for Digitizing %f seconds per event", + gBenchmark->GetCpuTime("EMCALDigitizer"), gBenchmark->GetCpuTime("EMCALDigitizer")/nEvents )) ; } } @@ -414,21 +577,13 @@ Bool_t AliEMCALDigitizer::Init() { // Makes all memory allocations fInit = kTRUE ; - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName) ; - if ( gime == 0 ) { - Error("Init", "Could not obtain the Getter object for file %s and event %s !", GetTitle(), fEventFolderName.Data()) ; + AliEMCALLoader *emcalLoader = dynamic_cast(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL")); + + if ( emcalLoader == 0 ) { + Fatal("Init", "Could not obtain the AliEMCALLoader"); return kFALSE; } - - TString opt("Digits") ; - if(gime->VersionExists(opt) ) { - Error( "Init", "Give a version name different from %s", fEventFolderName.Data() ) ; - fInit = kFALSE ; - } - // Post Digitizer to the white board - gime->PostDigitizer(this) ; - fFirstEvent = 0 ; fLastEvent = fFirstEvent ; @@ -449,28 +604,38 @@ Bool_t AliEMCALDigitizer::Init() } //to prevent cleaning of this object while GetEvent is called - gime->EmcalLoader()->GetDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); - + emcalLoader->GetDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); + + //PH Print(); + //Calibration instance + fCalibData = emcalLoader->CalibData(); return fInit ; } //____________________________________________________________________________ void AliEMCALDigitizer::InitParameters() -{ - fMeanPhotonElectron = 18200 ; // electrons per GeV - fPinNoise = 0.1 ; // noise equivalent GeV (random choice) +{ + // Parameter initialization for digitizer + // Tune parameters - 24-nov-04; Apr 29, 2007 + + fMeanPhotonElectron = 3300; // electrons per GeV + fPinNoise = 0.010; // pin noise in GEV from analysis test beam data if (fPinNoise == 0. ) Warning("InitParameters", "No noise added\n") ; - fDigitThreshold = fPinNoise * 3; //2 sigma - fTimeResolution = 1.0e-9 ; + fDigitThreshold = fPinNoise * 3; // 3 * sigma + fTimeResolution = 0.3e-9 ; // 300 psc fTimeSignalLength = 1.0e-9 ; - fADCchannelEC = 0.00305; // width of one ADC channel in GeV - HG fix so that we see 200 GeV gammas - fADCpedestalEC = 0.005 ; // GeV - fNADCEC = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC + // These defaults are normally not used. + // Values are read from calibration database instead + fADCchannelEC = 0.0153; // Update 24 Apr 2007: 250./16/1024 - width of one ADC channel in GeV + fADCpedestalEC = 0.0 ; // GeV + fNADCEC = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - 65536 - fTimeThreshold = 0.001*10000000 ; //Means 1 MeV in terms of SDigits amplitude - + fTimeThreshold = 0.001*10000000 ; // Means 1 MeV in terms of SDigits amplitude ?? + // hists. for control; no hists on default + fControlHists = 0; + fHists = 0; } //__________________________________________________________________ @@ -501,15 +666,16 @@ void AliEMCALDigitizer::MixWith(TString alirunFileName, TString eventFolderName) return ; } // looking for the file which contains SDigits - AliEMCALGetter * gime = AliEMCALGetter::Instance() ; - TString fileName( gime->GetSDigitsFileName() ) ; - if ( eventFolderName != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + AliEMCALLoader *emcalLoader = dynamic_cast(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL")); + TString fileName( emcalLoader->GetSDigitsFileName() ) ; + if ( eventFolderName != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name fileName = fileName.ReplaceAll(".root", "") + "_" + eventFolderName + ".root" ; if ( (gSystem->AccessPathName(fileName)) ) { Error("MixWith", "The file %s does not exist!", fileName.Data()) ; return ; } // need to increase the arrays + // MvL: This code only works when fInput == 1, I think. TString tempo = fInputFileNames[fInput-1] ; delete [] fInputFileNames ; fInputFileNames = new TString[fInput+1] ; @@ -524,9 +690,15 @@ void AliEMCALDigitizer::MixWith(TString alirunFileName, TString eventFolderName) fEventNames[fInput] = eventFolderName ; fInput++ ; } - + +void AliEMCALDigitizer::Print1(Option_t * option) +{ // 19-nov-04 - just for convinience + Print(); + PrintDigits(option); +} + //__________________________________________________________________ -void AliEMCALDigitizer::Print()const +void AliEMCALDigitizer::Print(Option_t*)const { // Print Digitizer's parameters printf("Print: \n------------------- %s -------------", GetName() ) ; @@ -540,17 +712,24 @@ void AliEMCALDigitizer::Print()const nStreams = fInput ; Int_t index = 0 ; + + AliRunLoader *rl=0; + for (index = 0 ; index < nStreams ; index++) { TString tempo(fEventNames[index]) ; tempo += index ; - AliEMCALGetter * gime = AliEMCALGetter::Instance(fInputFileNames[index], tempo) ; - TString fileName( gime->GetSDigitsFileName() ) ; - if ( fEventNames[index] != AliConfig::fgkDefaultEventFolderName) // only if not the default folder name + if ((rl = AliRunLoader::GetRunLoader(tempo)) == 0) + rl = AliRunLoader::Open(fInputFileNames[index], tempo) ; + AliEMCALLoader *emcalLoader = dynamic_cast(rl->GetDetectorLoader("EMCAL")); + TString fileName( emcalLoader->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()) ; } - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName) ; - printf("\nWriting digits to %s", gime->GetDigitsFileName().Data()) ; + + AliEMCALLoader *emcalLoader = dynamic_cast(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL")); + + printf("\nWriting digits to %s", emcalLoader->GetDigitsFileName().Data()) ; printf("\nWith following parameters:\n") ; @@ -563,14 +742,16 @@ void AliEMCALDigitizer::Print()const } //__________________________________________________________________ -void AliEMCALDigitizer::PrintDigits(Option_t * option){ - - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName) ; - TClonesArray * digits = gime->Digits() ; +void AliEMCALDigitizer::PrintDigits(Option_t * option) +{ + //utility method for printing digit information + + AliEMCALLoader *emcalLoader = dynamic_cast(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL")); + TClonesArray * digits = emcalLoader->Digits() ; + TClonesArray * sdigits = emcalLoader->SDigits() ; - printf("PrintDigits: %d", digits->GetEntriesFast()) ; - printf("\nevent %d", gAlice->GetEvNumber()) ; - printf("\n Number of entries in Digits list %d", digits->GetEntriesFast() ) ; + printf("\n #Digits: %d : sdigits %d ", digits->GetEntriesFast(), sdigits->GetEntriesFast()) ; + printf("\n event %d", emcalLoader->GetRunLoader()->GetEventNumber()); if(strstr(option,"all")){ //loop over digits @@ -588,30 +769,32 @@ void AliEMCALDigitizer::PrintDigits(Option_t * option){ } } } + printf("\n"); } //__________________________________________________________________ Float_t AliEMCALDigitizer::TimeOfNoise(void) -{ // Calculates the time signal generated by noise - //to be rewritten, now returns just big number - return 1. ; - +{ + // Calculates the time signal generated by noise + //PH Info("TimeOfNoise", "Change me") ; + return gRandom->Rndm() * 1.28E-5; } //__________________________________________________________________ void AliEMCALDigitizer::Unload() { // Unloads the SDigits and Digits + AliRunLoader *rl=0; + Int_t i ; for(i = 1 ; i < fInput ; i++){ TString tempo(fEventNames[i]) ; - tempo += i ; - AliEMCALGetter * gime = AliEMCALGetter::Instance(fInputFileNames[i], tempo) ; - gime->EmcalLoader()->UnloadSDigits() ; + tempo += i; + if ((rl = AliRunLoader::GetRunLoader(tempo))) + rl->GetDetectorLoader("EMCAL")->UnloadSDigits() ; } - - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName) ; - gime->EmcalLoader()->UnloadDigits() ; + AliEMCALLoader *emcalLoader = dynamic_cast(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL")); + emcalLoader->UnloadDigits() ; } //_________________________________________________________________________________________ @@ -626,20 +809,64 @@ void AliEMCALDigitizer::WriteDigits() // and branch "AliEMCALDigitizer", with the same title to keep all the parameters // and names of files, from which digits are made. - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName) ; - const TClonesArray * digits = gime->Digits() ; - TTree * treeD = gime->TreeD(); + AliEMCALLoader *emcalLoader = dynamic_cast(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL")); + + const TClonesArray * digits = emcalLoader->Digits() ; + TTree * treeD = emcalLoader->TreeD(); + if ( !treeD ) { + emcalLoader->MakeDigitsContainer(); + treeD = emcalLoader->TreeD(); + } // -- create Digits branch Int_t bufferSize = 32000 ; - TBranch * digitsBranch = treeD->Branch("EMCAL",&digits,bufferSize); - digitsBranch->SetTitle(fEventFolderName); - digitsBranch->Fill() ; + TBranch * digitsBranch = 0; + if ((digitsBranch = treeD->GetBranch("EMCAL"))) { + digitsBranch->SetAddress(&digits); + AliWarning("Digits Branch already exists. Not all digits will be visible"); + } + else + treeD->Branch("EMCAL","TClonesArray",&digits,bufferSize); + //digitsBranch->SetTitle(fEventFolderName); + treeD->Fill() ; - gime->WriteDigits("OVERWRITE"); - gime->WriteDigitizer("OVERWRITE"); + emcalLoader->WriteDigits("OVERWRITE"); + emcalLoader->WriteDigitizer("OVERWRITE"); Unload() ; } +void AliEMCALDigitizer::Browse(TBrowser* b) +{ + if(fHists) b->Add(fHists); + TTask::Browse(b); +} + +TList *AliEMCALDigitizer::BookControlHists(int var) +{ + // 22-nov-04 + // histograms for monitoring digitizer performance + + Info("BookControlHists"," started "); + gROOT->cd(); + const AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance(); + if(var>=1){ + new TH1F("hDigiN", "#EMCAL digits with fAmp > fDigitThreshold", + fNADCEC+1, -0.5, Double_t(fNADCEC)); + new TH1F("HDigiSumEnergy","Sum.EMCAL energy from digi", 1000, 0.0, 200.); + new TH1F("hDigiAmp", "EMCAL digital amplitude", fNADCEC+1, -0.5, Double_t(fNADCEC)); + new TH1F("hDigiEnergy","EMCAL cell energy", 2000, 0.0, 200.); + new TH1F("hDigiAbsId","EMCAL absId cells with fAmp > fDigitThreshold ", + geom->GetNCells(), 0.5, Double_t(geom->GetNCells())+0.5); + } + + fHists = AliEMCALHistoUtilities::MoveHistsToList("EmcalDigiControlHists", kFALSE); + fHists = 0; //huh? JLK 03-Mar-2006 + return fHists; +} + +void AliEMCALDigitizer::SaveHists(const char* name, Bool_t kSingleKey, const char* opt) +{ + AliEMCALHistoUtilities::SaveListOfHists(fHists, name, kSingleKey, opt); +}