X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALSDigitizer.cxx;h=9c6ee153513d8bff276273a1298a80185188e92a;hb=e44d51bd90cd986df876ac6a123585717f3e84d4;hp=ea2decf5d8e9a45f7e47a96dbd0bb94d03544bdc;hpb=fdebddebb521c2f316af46d2034286ce5100c285;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx index ea2decf5d8e..9c6ee153513 100644 --- a/EMCAL/AliEMCALSDigitizer.cxx +++ b/EMCAL/AliEMCALSDigitizer.cxx @@ -20,6 +20,13 @@ // A Summable Digits is the sum of all hits originating // from one in one tower of the EMCAL // A threshold for assignment of the primary to SDigit is applied +// +// JLK 26-Jun-2008 Added explanation: +// SDigits need to hold the energy sum of the hits, but AliEMCALDigit +// can (should) only store amplitude. Therefore, the SDigit energy is +// "digitized" before being stored and must be "calibrated" back to an +// energy before SDigits are summed to form true Digits +// // SDigits are written to TreeS, branch "EMCAL" // AliEMCALSDigitizer with all current parameters is written // to TreeS branch "AliEMCALSDigitizer". @@ -43,60 +50,101 @@ // //*-- Author : Sahal Yacoob (LBL) // based on : AliPHOSSDigitzer -// Modif: -// August 2002 Yves Schutz: clone PHOS as closely as possible and intoduction -// of new IO (à la PHOS) ////////////////////////////////////////////////////////////////////////////// // --- ROOT system --- -#include "TBenchmark.h" +#include +#include +//#include +#include +#include // --- Standard library --- #include "stdlib.h" // --- AliRoot header files --- +#include "AliLog.h" +#include "AliRunLoader.h" +#include "AliStack.h" #include "AliEMCALDigit.h" -#include "AliEMCALGetter.h" +#include "AliEMCALLoader.h" #include "AliEMCALHit.h" #include "AliEMCALSDigitizer.h" #include "AliEMCALGeometry.h" +#include "AliEMCALSimParam.h" ClassImp(AliEMCALSDigitizer) //____________________________________________________________________________ - AliEMCALSDigitizer::AliEMCALSDigitizer():TTask("","") +AliEMCALSDigitizer::AliEMCALSDigitizer() + : TTask("",""), + fA(0.),fB(0.),fECPrimThreshold(0.), + fDefaultInit(kTRUE), + fEventFolderName(0), + fInit(0), + fSDigitsInRun(0), + fFirstEvent(0), + fLastEvent(0), + fSampling(0.), + fHits(0) { // ctor - InitParameters() ; - fDefaultInit = kTRUE ; + InitParameters(); } //____________________________________________________________________________ -AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, const char * eventFolderName): - TTask("EMCAL"+AliConfig::fgkSDigitizerTaskName, alirunFileName), - fEventFolderName(eventFolderName) +AliEMCALSDigitizer::AliEMCALSDigitizer(const char * alirunFileName, + const char * eventFolderName) + : TTask("EMCAL"+AliConfig::Instance()->GetSDigitizerTaskName(), alirunFileName), + fA(0.),fB(0.),fECPrimThreshold(0.), + fDefaultInit(kFALSE), + fEventFolderName(eventFolderName), + fInit(0), + fSDigitsInRun(0), + fFirstEvent(0), + fLastEvent(0), + fSampling(0.), + fHits(0) { // ctor Init(); InitParameters() ; - fDefaultInit = kFALSE ; + } //____________________________________________________________________________ -AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) : TTask(sd) { +AliEMCALSDigitizer::AliEMCALSDigitizer(const AliEMCALSDigitizer & sd) + : TTask(sd.GetName(),sd.GetTitle()), + fA(sd.fA), + fB(sd.fB), + fECPrimThreshold(sd.fECPrimThreshold), + fDefaultInit(sd.fDefaultInit), + fEventFolderName(sd.fEventFolderName), + fInit(sd.fInit), + fSDigitsInRun(sd.fSDigitsInRun), + fFirstEvent(sd.fFirstEvent), + fLastEvent(sd.fLastEvent), + fSampling(sd.fSampling), + fHits(0) +{ //cpy ctor - - fA = sd.fA ; - fB = sd.fB ; - fECPrimThreshold = sd.fECPrimThreshold ; - fSDigitsInRun = sd.fSDigitsInRun ; - SetName(sd.GetName()) ; - SetTitle(sd.GetTitle()) ; - fEventFolderName = sd.fEventFolderName; } +//____________________________________________________________________________ +AliEMCALSDigitizer::~AliEMCALSDigitizer() { + //dtor + AliLoader *emcalLoader=0; + if ((emcalLoader = AliRunLoader::Instance()->GetDetectorLoader("EMCAL"))) + emcalLoader->CleanSDigitizer(); + + if(fHits){ + fHits->Clear(); + delete fHits; + } +} + //____________________________________________________________________________ void AliEMCALSDigitizer::Init(){ // Initialization: open root-file, allocate arrays for hits and sdigits, @@ -106,184 +154,293 @@ void AliEMCALSDigitizer::Init(){ //============================================================= YS // The initialisation is now done by the getter - fInit = kTRUE ; + fInit = kTRUE; - AliEMCALGetter * gime = AliEMCALGetter::Instance(GetTitle(), fEventFolderName.Data()); - if ( gime == 0 ) { - Fatal("Init", "Could not obtain the Getter objectfor file %s and event %s !", GetTitle(), fEventFolderName.Data()) ; + AliEMCALLoader *emcalLoader = dynamic_cast(AliRunLoader::Instance()->GetDetectorLoader("EMCAL")); + + if ( emcalLoader == 0 ) { + Fatal("Init", "Could not obtain the AliEMCALLoader"); return ; } - TString opt("SDigits") ; - if(gime->VersionExists(opt) ) { - Error( "Init", "Give a version name different from %s", fEventFolderName.Data() ) ; - fInit = kFALSE ; - } - - gime->PostSDigitizer(this); - gime->EmcalLoader()->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); + emcalLoader->PostSDigitizer(this); + emcalLoader->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); } //____________________________________________________________________________ void AliEMCALSDigitizer::InitParameters() { - // Initializes parameters - fA = 0; - fB = 10000000.; + //initialize parameters for sdigitization - AliEMCALGetter * gime = AliEMCALGetter::Instance() ; - const AliEMCALGeometry * geom = gime->EMCALGeometry() ; + const AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance(); if (geom->GetSampling() == 0.) { - printf("InitParameters: Sampling factor not set !") ; - abort() ; + Fatal("InitParameters", "Sampling factor not set !") ; } - else - printf("InitParameters: Sampling factor set to %f\n", geom->GetSampling()) ; + + // Get the parameters from the OCDB via the loader + AliRunLoader *rl = AliRunLoader::Instance(); + AliEMCALLoader *emcalLoader = dynamic_cast(rl->GetDetectorLoader("EMCAL")); + AliEMCALSimParam * simParam = 0x0; + if(emcalLoader) simParam = emcalLoader->SimulationParameters(); + + if(!simParam){ + simParam = AliEMCALSimParam::GetInstance(); + AliWarning("Simulation Parameters not available in OCDB?"); + } + + // + //JLK 26-Jun-2008 THIS SHOULD HAVE BEEN EXPLAINED AGES AGO: + // + //In order to be able to store SDigit Energy info into + //AliEMCALDigit, we need to convert it temporarily to an ADC amplitude + //and later when summing SDigits to form digits, convert it back to + //energy. These fA and fB parameters accomplish this through the + //Digitize() and Calibrate() methods + // + // Initializes parameters + fA = simParam->GetA(); //0; + fB = simParam->GetB(); //1.e+6; // Changed 24 Apr 2007. Dynamic range now 2 TeV + fSampling = geom->GetSampling(); + + // threshold for deposit energy of hit + fECPrimThreshold = simParam->GetECPrimaryThreshold();//0.05;// GeV // 22-may-07 was 0// 24-nov-04 - was 1.e-6; - // this threshold corresponds approximately to 100 MeV - fECPrimThreshold = 100E-3 / ( geom->GetSampling() * geom->GetNECLayers()) * geom->GetNECLayers() ; + AliDebug(2,Form("Print: \n------------------- %s -------------\n",GetName())); + AliDebug(2,Form(" fInit %i\n", int(fInit))); + AliDebug(2,Form(" fFirstEvent %i\n", fFirstEvent)); + AliDebug(2,Form(" fLastEvent %i\n", fLastEvent)); + AliDebug(2,Form(" Writing SDigits to branch with title %s\n", fEventFolderName.Data())); + AliDebug(2,Form(" with digitization parameters A = %f\n", fA)); + AliDebug(2,Form(" B = %f\n", fB)); + AliDebug(2,Form(" Threshold for EC Primary assignment = %f\n", fECPrimThreshold)); + AliDebug(2,Form(" Sampling = %f\n", fSampling)); + AliDebug(2,Form("---------------------------------------------------\n")); + } //____________________________________________________________________________ void AliEMCALSDigitizer::Exec(Option_t *option) { - // Collects all hit of the same tower into digits - if (strstr(option, "print") ) { - Print() ; - return ; - } - - if(strstr(option,"tim")) - gBenchmark->Start("EMCALSDigitizer"); - - AliEMCALGetter * gime = AliEMCALGetter::Instance() ; - - //switch off reloading of this task while getting event - if (!fInit) { // to prevent overwrite existing file - Error( "Exec", "Give a version name different from %s", fEventFolderName.Data() ) ; - return ; - } - - Int_t nevents = gime->MaxEvent() ; - Int_t ievent ; - for(ievent = 0; ievent < nevents; ievent++){ - gime->Event(ievent,"H") ; - - TTree * treeS = gime->TreeS(); - TClonesArray * hits = gime->Hits() ; - TClonesArray * sdigits = gime->SDigits() ; - sdigits->Clear(); - Int_t nSdigits = 0 ; - //Now make SDigits from hits, for EMCAL it is the same, so just copy - Int_t nPrim = static_cast((gime->TreeH())->GetEntries()) ; - // Attention nPrim is the number of primaries tracked by Geant - // and this number could be different to the number of Primaries in TreeK; - Int_t iprim ; - for ( iprim = 0 ; iprim < nPrim ; iprim++ ) { - //=========== Get the EMCAL branch from Hits Tree for the Primary iprim - gime->Track(iprim) ; - Int_t i; - for ( i = 0 ; i < hits->GetEntries() ; i++ ) { - AliEMCALHit * hit = dynamic_cast(hits->At(i)) ; - AliEMCALDigit * curSDigit = 0 ; - AliEMCALDigit * sdigit = 0 ; - Bool_t newsdigit = kTRUE; - - // Assign primary number only if deposited energy is significant - AliEMCALGeometry * geom = gime->EMCALGeometry() ; - if( geom->IsInECA(hit->GetId()) ){ - if( hit->GetEnergy() > fECPrimThreshold ) - curSDigit = new AliEMCALDigit( hit->GetPrimary(), - hit->GetIparent(), hit->GetId(), - Digitize(hit->GetEnergy()), hit->GetTime() ) ; - else - curSDigit = new AliEMCALDigit( -1 , - -1 , - hit->GetId(), - Digitize(hit->GetEnergy()), hit->GetTime() ) ; + // Collects all hit of the same tower into digits + TString o(option); o.ToUpper(); + if (strstr(option, "print") ) { + + AliDebug(2,Form("Print: \n------------------- %s -------------\n",GetName())); + AliDebug(2,Form(" fInit %i\n", int(fInit))); + AliDebug(2,Form(" fFirstEvent %i\n", fFirstEvent)); + AliDebug(2,Form(" fLastEvent %i\n", fLastEvent)); + AliDebug(2,Form(" Writing SDigits to branch with title %s\n", fEventFolderName.Data())); + AliDebug(2,Form(" with digitization parameters A = %f\n", fA)); + AliDebug(2,Form(" B = %f\n", fB)); + AliDebug(2,Form(" Threshold for EC Primary assignment = %f\n", fECPrimThreshold)); + AliDebug(2,Form(" Sampling = %f\n", fSampling)); + AliDebug(2,Form("---------------------------------------------------\n")); + + return ; } - else{ - newsdigit = kFALSE; + + + if(strstr(option,"tim")) + gBenchmark->Start("EMCALSDigitizer"); + + AliRunLoader *rl = AliRunLoader::Instance(); + AliEMCALLoader *emcalLoader = dynamic_cast(rl->GetDetectorLoader("EMCAL")); + + //switch off reloading of this task while getting event + if (!fInit) { // to prevent overwrite existing file + AliError( Form("Give a version name different from %s", fEventFolderName.Data()) ) ; + return ; + } + + if (fLastEvent == -1) + fLastEvent = rl->GetNumberOfEvents() - 1 ; + else { + fLastEvent = TMath::Min(fLastEvent, rl->GetNumberOfEvents()-1); } - - Int_t check = 0 ; - - for(check= 0; check < nSdigits ; check++) { - sdigit = dynamic_cast(sdigits->At(check)) ; - if(curSDigit != 0){ - if( sdigit->GetId() == curSDigit->GetId()) { // Are we in the same ECAL tower ? - *sdigit = *sdigit + *curSDigit; - newsdigit = kFALSE; - } - } + Int_t nEvents = fLastEvent - fFirstEvent + 1; + + Int_t ievent; + Float_t energy=0.; // de * fSampling - 23-nov-04 + rl->LoadKinematics(); + rl->LoadHits("EMCAL"); + + for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) { + rl->GetEvent(ievent); + TTree * treeS = emcalLoader->TreeS(); + if ( !treeS ) { + emcalLoader->MakeSDigitsContainer(); + treeS = emcalLoader->TreeS(); + } + //TClonesArray * hits = emcalLoader->Hits() ; + TClonesArray * sdigits = emcalLoader->SDigits() ; + sdigits->Clear(); + + Int_t nSdigits = 0 ; + Int_t iHit, iTrack, iSDigit; + + AliEMCALGeometry *geom = AliEMCALGeometry::GetInstance(); + + TTree *treeH = emcalLoader->TreeH(); + if (treeH) { + Int_t nTrack = treeH->GetEntries(); // TreeH has array of hits for every primary + TBranch * branchH = treeH->GetBranch("EMCAL"); + //if(fHits)fHits->Clear(); + branchH->SetAddress(&fHits); + for (iTrack = 0; iTrack < nTrack; iTrack++) { + branchH->GetEntry(iTrack); + Int_t nHit = fHits->GetEntriesFast(); + for(iHit = 0; iHit< nHit;iHit++){ + + AliEMCALHit * hit = dynamic_cast(fHits->At(iHit)) ; + AliEMCALDigit * curSDigit = 0 ; + AliEMCALDigit * sdigit = 0 ; + Bool_t newsdigit = kTRUE; + + // hit->GetId() - Absolute Id number EMCAL segment + if(geom->CheckAbsCellId(hit->GetId())) { // was IsInECA(hit->GetId()) + energy = hit->GetEnergy() * fSampling; // 23-nov-04 + if(energy > fECPrimThreshold ) + // Assign primary number only if deposited energy is significant + curSDigit = new AliEMCALDigit(hit->GetPrimary(), + hit->GetIparent(), hit->GetId(), + Digitize(energy), hit->GetTime(),kFALSE, + -1, 0,0,energy ) ; + else + curSDigit = new AliEMCALDigit(-1, + -1, + hit->GetId(), + Digitize(energy), hit->GetTime(),kFALSE, + -1, 0,0,energy ) ; + } else { + Warning("Exec"," abs id %i is bad \n", hit->GetId()); + newsdigit = kFALSE; + curSDigit = 0; + } + + if(curSDigit != 0){ + for(Int_t check= 0; check < nSdigits ; check++) { + sdigit = dynamic_cast(sdigits->At(check)) ; + + if( sdigit->GetId() == curSDigit->GetId()) { // Are we in the same ECAL tower ? + *sdigit = *sdigit + *curSDigit; + newsdigit = kFALSE; + } + } + } + if (newsdigit) { + new((*sdigits)[nSdigits]) AliEMCALDigit(*curSDigit); + nSdigits++ ; + } + delete curSDigit ; + } // loop over all hits (hit = deposited energy/entering particle) + sdigits->Sort() ; + + nSdigits = sdigits->GetEntriesFast() ; + fSDigitsInRun += nSdigits ; + + for (iSDigit = 0 ; iSDigit < sdigits->GetEntriesFast() ; iSDigit++) { + AliEMCALDigit * sdigit = dynamic_cast(sdigits->At(iSDigit)) ; + sdigit->SetIndexInList(iSDigit) ; + } + if(fHits)fHits->Clear(); + }//track loop + }// tree exists + + // Now write SDigits + + Int_t bufferSize = 32000 ; + TBranch * sdigitsBranch = treeS->GetBranch("EMCAL"); + if (sdigitsBranch) + sdigitsBranch->SetAddress(&sdigits); + else + treeS->Branch("EMCAL",&sdigits,bufferSize); + + treeS->Fill(); + + emcalLoader->WriteSDigits("OVERWRITE"); + + //NEXT - SDigitizer + emcalLoader->WriteSDigitizer("OVERWRITE"); // why in event cycle ? + + if(strstr(option,"deb")) + PrintSDigits(option) ; } - if (newsdigit) { - new((*sdigits)[nSdigits]) AliEMCALDigit(*curSDigit); - nSdigits++ ; + + Unload(); + + emcalLoader->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); + + if(strstr(option,"tim")){ + gBenchmark->Stop("EMCALSDigitizer"); + printf("\n Exec: took %f seconds for SDigitizing %f seconds per event\n", + gBenchmark->GetCpuTime("EMCALSDigitizer"), gBenchmark->GetCpuTime("EMCALSDigitizer")/nEvents ) ; } - delete curSDigit ; - } // loop over all hits (hit = deposited energy/entering particle) - } // loop over iprim - sdigits->Sort() ; - - nSdigits = sdigits->GetEntriesFast() ; - fSDigitsInRun += nSdigits ; - sdigits->Expand(nSdigits) ; - - Int_t nPrimarymax = -1 ; - Int_t i ; - for (i = 0 ; i < sdigits->GetEntriesFast() ; i++) { - AliEMCALDigit * sdigit = dynamic_cast(sdigits->At(i)) ; - sdigit->SetIndexInList(i) ; - } - - for (i = 0 ; i < sdigits->GetEntriesFast() ; i++) { - if (((dynamic_cast(sdigits->At(i)))->GetNprimary()) > nPrimarymax) - nPrimarymax = ((dynamic_cast(sdigits->At(i)))->GetNprimary()) ; - } - - // Now write SDigits - //First list of sdigits +} - Int_t bufferSize = 32000 ; - TBranch * sdigitsBranch = treeS->Branch("EMCAL",&sdigits,bufferSize); - - sdigitsBranch->Fill() ; +//__________________________________________________________________ +Float_t AliEMCALSDigitizer::Digitize(Float_t energy)const { + // Digitize the energy + // + //JLK 26-Jun-2008 EXPLANATION LONG OVERDUE: + // + //We have to digitize the SDigit energy so that it can be stored in + //AliEMCALDigit, which has only an ADC amplitude member and + //(rightly) no energy member. This method converts the energy to an + //integer which can be re-converted back to an energy with the + //Calibrate(energy) method when it is time to create Digits from SDigits + // + Double_t aSignal = fA + energy*fB; + if (TMath::Abs(aSignal)>2147483647.0) { + //PH 2147483647 is the max. integer + //PH This apparently is a problem which needs investigation + AliWarning(Form("Too big or too small energy %f",aSignal)); + aSignal = TMath::Sign((Double_t)2147483647,aSignal); + } - gime->WriteSDigits("OVERWRITE"); - - //NEXT - SDigitizer + return (Float_t ) aSignal; +} - gime->WriteSDigitizer("OVERWRITE"); - - if(strstr(option,"deb")) - PrintSDigits(option) ; - } +//__________________________________________________________________ +Float_t AliEMCALSDigitizer::Calibrate(Float_t amp)const { + // + // Convert the amplitude back to energy in GeV + // + //JLK 26-Jun-2008 EXPLANATION LONG OVERDUE: + // + //We have to digitize the SDigit energy with the method Digitize() + //so that it can be stored in AliEMCALDigit, which has only an ADC + //amplitude member and (rightly) no energy member. This method is + //just the reverse of Digitize(): it converts the stored amplitude + //back to an energy value in GeV so that the SDigit energies can be + //summed before adding noise and creating digits out of them + // + return (Float_t)(amp - fA)/fB; - Unload(); - - gime->EmcalLoader()->GetSDigitsDataLoader()->GetBaseTaskLoader()->SetDoNotReload(kTRUE); - - if(strstr(option,"tim")){ - gBenchmark->Stop("EMCALSDigitizer"); - printf("Exec: took %f seconds for SDigitizing %f seconds per event", - gBenchmark->GetCpuTime("EMCALSDigitizer"), gBenchmark->GetCpuTime("EMCALSDigitizer") ) ; - } } + +//__________________________________________________________________ +void AliEMCALSDigitizer::Print1(Option_t * option) +{ + Print(); + PrintSDigits(option); +} //__________________________________________________________________ -void AliEMCALSDigitizer::Print()const +void AliEMCALSDigitizer::Print(Option_t *option) const { // Prints parameters of SDigitizer - printf("Print: \n------------------- %s -------------", GetName() ) ; + printf("Print: \n------------------- %s ------------- option %s\n", GetName() , option) ; + printf(" fInit %i\n", int(fInit)); + printf(" fFirstEvent %i\n", fFirstEvent); + printf(" fLastEvent %i\n", fLastEvent); printf(" Writing SDigits to branch with title %s\n", fEventFolderName.Data()) ; - printf(" with digitization parameters A = %f\n", fA) ; - printf(" B = %f\n", fB) ; - printf(" Threshold for EC Primary assignment= %f\n", fECPrimThreshold) ; + printf(" with digitization parameters A = %f\n", fA) ; + printf(" B = %f\n", fB) ; + printf(" Threshold for EC Primary assignment = %f\n", fECPrimThreshold) ; + printf(" Sampling = %f\n", fSampling); printf("---------------------------------------------------\n") ; - } //__________________________________________________________________ @@ -302,43 +459,50 @@ Bool_t AliEMCALSDigitizer::operator==( AliEMCALSDigitizer const &sd )const void AliEMCALSDigitizer::PrintSDigits(Option_t * option) { //Prints list of digits produced at the current pass of AliEMCALDigitizer - - - AliEMCALGetter * gime = AliEMCALGetter::Instance() ; - const TClonesArray * sdigits = gime->SDigits() ; + + AliEMCALLoader *rl = dynamic_cast(AliRunLoader::Instance()->GetDetectorLoader("EMCAL")); + const TClonesArray * sdigits = rl->SDigits() ; printf("\n") ; - printf("event %i", gAlice->GetEvNumber()) ; - printf("\n Number of entries in SDigits list %i", sdigits->GetEntriesFast()); + printf("event %i", rl->GetRunLoader()->GetEventNumber()); + printf(" Number of entries in SDigits list %i", sdigits->GetEntriesFast()); if(strstr(option,"all")||strstr(option,"EMC")){ //loop over digits AliEMCALDigit * digit; printf("\n Id Amplitude Time Index Nprim: Primaries list \n") ; - Int_t index ; + Int_t index = 0; + Float_t isum = 0.; char * tempo = new char[8192]; for (index = 0 ; index < sdigits->GetEntries() ; index++) { digit = dynamic_cast( sdigits->At(index) ) ; - sprintf(tempo, "\n%6d %8d %6.5e %4d %2d :", - digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; - printf(tempo); + sprintf(tempo, "\n%6d %8f %6.5e %4d %2d :", + digit->GetId(), digit->GetAmplitude(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; + printf("%s",tempo); + isum += digit->GetAmplitude(); Int_t iprimary; for (iprimary=0; iprimaryGetNprimary(); iprimary++) { - sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; - printf(tempo); + sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; + printf("%s",tempo); } } delete tempo ; - } + printf("\n** Sum %2.3f : %10.3f GeV/c **\n ", isum, Calibrate(isum)); + } else printf("\n"); } //____________________________________________________________________________ void AliEMCALSDigitizer::Unload() const { // Unload Hits and SDigits from the folder - AliEMCALGetter * gime = AliEMCALGetter::Instance() ; - AliEMCALLoader * loader = gime->EmcalLoader() ; - loader->UnloadHits() ; - loader->UnloadSDigits() ; + AliEMCALLoader *rl = dynamic_cast(AliRunLoader::Instance()->GetDetectorLoader("EMCAL")); + rl->UnloadHits() ; + rl->UnloadSDigits() ; +} + +//____________________________________________________________________________ +void AliEMCALSDigitizer::Browse(TBrowser* b) +{ + TTask::Browse(b); }