X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALReconstructor.cxx;h=a5a2d6d6fefa8bfee899e4215bc22bc703094d5b;hb=35397e760ae3c56f78ae08eaa29710f8d8018c98;hp=ec86dc37effe82546f92a454664b34faa249d4f3;hpb=89ffc0b00f6b54b6f66a49737145a5aa8ba2136f;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx index ec86dc37eff..a5a2d6d6fef 100644 --- a/EMCAL/AliEMCALReconstructor.cxx +++ b/EMCAL/AliEMCALReconstructor.cxx @@ -16,44 +16,82 @@ /* $Id$ */ //_________________________________________________________________________ -//*-- -//*-- Yves Schutz (SUBATECH) +//-- +//-- Yves Schutz (SUBATECH) // Reconstruction class. Redesigned from the old AliReconstructionner class and // derived from STEER/AliReconstructor. // +//-- Aleksei Pavlinov : added staf for EMCAL jet trigger 9Apr 25, 2008) +// : fgDigitsArr should read just once at event + // --- ROOT system --- +#include +#include // --- Standard library --- // --- AliRoot header files --- #include "AliEMCALReconstructor.h" -#include "AliRun.h" +#include "AliCodeTimer.h" #include "AliESDEvent.h" #include "AliESDCaloCluster.h" +#include "AliESDCaloCells.h" #include "AliESDtrack.h" -#include "AliRunLoader.h" #include "AliEMCALLoader.h" #include "AliEMCALRawUtils.h" +#include "AliEMCALDigit.h" #include "AliEMCALClusterizerv1.h" #include "AliEMCALRecPoint.h" #include "AliEMCALPID.h" #include "AliEMCALTrigger.h" #include "AliRawReader.h" +#include "AliCDBEntry.h" +#include "AliCDBManager.h" +#include "AliEMCALRecParam.h" +#include "AliEMCALGeometry.h" +#include "AliEMCAL.h" +#include "AliEMCALHistoUtilities.h" +#include "AliESDVZERO.h" + +#include "AliRunLoader.h" +#include "AliRun.h" + +ClassImp(AliEMCALReconstructor) -ClassImp(AliEMCALReconstructor) +AliEMCALRecParam* AliEMCALReconstructor::fgkRecParam = 0; // EMCAL rec. parameters +AliEMCALRawUtils* AliEMCALReconstructor::fgRawUtils = 0; // EMCAL raw utilities class +TClonesArray* AliEMCALReconstructor::fgDigitsArr = 0; // shoud read just once at event //____________________________________________________________________________ AliEMCALReconstructor::AliEMCALReconstructor() - : fDebug(kFALSE) + : fDebug(kFALSE), fList(0), fGeom(0) { // ctor + InitRecParam(); + + fgRawUtils = new AliEMCALRawUtils; + + //To make sure we match with the geometry in a simulation file, + //let's try to get it first. If not, take the default geometry + AliRunLoader *rl = AliRunLoader::GetRunLoader(); + if (rl->GetAliRun() && rl->GetAliRun()->GetDetector("EMCAL")) { + fGeom = dynamic_cast(rl->GetAliRun()->GetDetector("EMCAL"))->GetGeometry(); + } else { + AliInfo(Form("Using default geometry in reconstruction")); + fGeom = AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaultGeometryName()); + } + + if(!fGeom) AliFatal(Form("Could not get geometry!")); + } //____________________________________________________________________________ AliEMCALReconstructor::AliEMCALReconstructor(const AliEMCALReconstructor & rec) : AliReconstructor(rec), - fDebug(rec.fDebug) + fDebug(rec.fDebug), + fList(rec.fList), + fGeom(rec.fGeom) { //copy ctor } @@ -62,124 +100,145 @@ AliEMCALReconstructor::AliEMCALReconstructor(const AliEMCALReconstructor & rec) AliEMCALReconstructor::~AliEMCALReconstructor() { // dtor + delete fGeom; + AliCodeTimer::Instance()->Print(); } //____________________________________________________________________________ -void AliEMCALReconstructor::Reconstruct(AliRunLoader* runLoader) const +void AliEMCALReconstructor::Init() +{ + // Trigger hists - Oct 24, 2007 + fList = AliEMCALHistoUtilities::GetTriggersListOfHists(kTRUE); +} + +//____________________________________________________________________________ +void AliEMCALReconstructor::InitRecParam() const +{ + // Check if the instance of AliEMCALRecParam exists, + // if not, get it from OCDB if available, otherwise create a default one + + if (!fgkRecParam && (AliCDBManager::Instance()->IsDefaultStorageSet())) { + AliCDBEntry *entry = (AliCDBEntry*) + AliCDBManager::Instance()->Get("EMCAL/Config/RecParam"); + if (entry) fgkRecParam = (AliEMCALRecParam*) entry->GetObject(); + } + + if(!fgkRecParam){ + AliWarning("The Reconstruction parameters for EMCAL nonitialized - Used default one"); + fgkRecParam = new AliEMCALRecParam; + } +} + +//____________________________________________________________________________ +void AliEMCALReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) const { // method called by AliReconstruction; // Only the clusterization is performed,; the rest of the reconstruction is done in FillESD because the track // segment maker needs access to the AliESD object to retrieve the tracks reconstructed by // the global tracking. - - TString headerFile(runLoader->GetFileName()) ; - TString branchName(runLoader->GetEventFolder()->GetName() ) ; - - AliEMCALClusterizerv1 clu(headerFile, branchName); - AliEMCALLoader *emcalLoader = dynamic_cast(runLoader->GetDetectorLoader("EMCAL")); - - Int_t nEvents = runLoader->GetNumberOfEvents(); - runLoader->LoadDigits("EMCAL"); - for (Int_t ievent = 0; ievent < nEvents; ievent++) { - runLoader->GetEvent(ievent); - if ( Debug() ) - clu.ExecuteTask("deb all") ; - else - clu.ExecuteTask("pseudo") ; - } - // Unload the Digits and RecPoints - emcalLoader->UnloadDigits() ; - emcalLoader->UnloadRecPoints() ; + // Works on the current event. + + AliCodeTimerAuto("") + + ReadDigitsArrayFromTree(digitsTree); + + if(fgDigitsArr && fgDigitsArr->GetEntries()) { + + AliEMCALClusterizerv1 clu; + clu.SetInput(digitsTree); + clu.SetOutput(clustersTree); + if(Debug()) + clu.Digits2Clusters("deb all") ; + else + clu.Digits2Clusters("") ; + + } } //____________________________________________________________________________ -void AliEMCALReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* rawReader) const +void AliEMCALReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const { - // Reconstruction loop for Raw Data processing - // - // Only the clusterization is performed - // Track-cluster matching is done in FillESD because the track - // segment maker needs access to the AliESD object to retrieve - // the tracks reconstructed by the global tracking. - - TString headerFile(runLoader->GetFileName()) ; - TString branchName(runLoader->GetEventFolder()->GetName()) ; + // Conversion from raw data to + // EMCAL digits. + // Works on a single-event basis - static AliEMCALRawUtils rawUtils; - AliEMCALClusterizerv1 clu(headerFile, branchName); - AliEMCALLoader *emcalLoader = dynamic_cast(runLoader->GetDetectorLoader("EMCAL")); - - Int_t iEvent = 0; rawReader->Reset() ; - while (rawReader->NextEvent()) { - runLoader->GetEvent(iEvent++); - rawUtils.Raw2Digits(rawReader); + TClonesArray *digitsArr = new TClonesArray("AliEMCALDigit",100); + Int_t bufsize = 32000; + digitsTree->Branch("EMCAL", &digitsArr, bufsize); + + //must be done here because, in constructor, option is not yet known + fgRawUtils->SetOption(GetOption()); + + fgRawUtils->SetRawFormatHighLowGainFactor(fgkRecParam->GetHighLowGainFactor()); + fgRawUtils->SetRawFormatOrder(fgkRecParam->GetOrderParameter()); + fgRawUtils->SetRawFormatTau(fgkRecParam->GetTau()); + fgRawUtils->SetNoiseThreshold(fgkRecParam->GetNoiseThreshold()); + fgRawUtils->SetNPedSamples(fgkRecParam->GetNPedSamples()); + + fgRawUtils->Raw2Digits(rawReader,digitsArr); + + digitsTree->Fill(); + digitsArr->Delete(); + delete digitsArr; - if ( Debug() ) - clu.ExecuteTask("deb pseudo all") ; - else - clu.ExecuteTask("pseudo") ; - // Unload the RecPoints - emcalLoader->UnloadRecPoints() ; - } } + //____________________________________________________________________________ -void AliEMCALReconstructor::FillESD(AliRunLoader* runLoader, AliESDEvent* esd) const +void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, + AliESDEvent* esd) const { // Called by AliReconstruct after Reconstruct() and global tracking and vertexing + // and V0 + // Works on the current event + // printf(" ## AliEMCALReconstructor::FillESD() is started ### \n "); + //return; const double timeScale = 1.e+11; // transition constant from sec to 0.01 ns - Int_t eventNumber = runLoader->GetEventNumber() ; - - // Creates AliESDCaloCluster from AliEMCALRecPoints - AliEMCALLoader *emcalLoader = dynamic_cast(runLoader->GetDetectorLoader("EMCAL")); - runLoader->LoadRecPoints("EMCAL"); - runLoader->GetEvent(eventNumber); - TObjArray *clusters = emcalLoader->RecPoints(); - Int_t nClusters = clusters->GetEntries(), nClustersNew=0; - AliDebug(1,Form("Event %d: %d clusters",eventNumber,nClusters)); - // Int_t nRP=0, nPC=0; // in input - esd->SetFirstEMCALCluster(esd->GetNumberOfCaloClusters()); // Put after Phos clusters - //###################################################### //#########Calculate trigger and set trigger info########### //###################################################### - AliEMCALTrigger tr ; - // tr.SetPatchSize(1);//create 4x4 patches + AliEMCALTrigger tr; + // tr.SetPatchSize(1); // create 4x4 patches + tr.SetSimulation(kFALSE); // Reconstruction mode + tr.SetDigitsList(fgDigitsArr); + // Get VZERO total multiplicity for jet trigger simulation + // The simulation of jey trigger will be incorrect if no VZERO data + // at ESD + AliESDVZERO* vZero = esd->GetVZEROData(); + if(vZero) { + tr.SetVZER0Multiplicity(vZero->GetMTotV0A() + vZero->GetMTotV0C()); + } + // tr.Trigger(); - + Float_t maxAmp2x2 = tr.Get2x2MaxAmplitude(); Float_t maxAmpnxn = tr.GetnxnMaxAmplitude(); Float_t ampOutOfPatch2x2 = tr.Get2x2AmpOutOfPatch() ; Float_t ampOutOfPatchnxn = tr.GetnxnAmpOutOfPatch() ; - AliEMCALGeometry * geom = 0; - if (runLoader->GetAliRun() && runLoader->GetAliRun()->GetDetector("EMCAL")) - geom = dynamic_cast(runLoader->GetAliRun()->GetDetector("EMCAL"))->GetGeometry(); - if (geom == 0) - geom = AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaulGeometryName()); - Int_t iSM2x2 = tr.Get2x2SuperModule(); Int_t iSMnxn = tr.GetnxnSuperModule(); - Int_t iCellPhi2x2 = tr.Get2x2CellPhi(); - Int_t iCellPhinxn = tr.GetnxnCellPhi(); - Int_t iCellEta2x2 = tr.Get2x2CellEta(); - Int_t iCellEtanxn = tr.GetnxnCellEta(); + Int_t iModulePhi2x2 = tr.Get2x2ModulePhi(); + Int_t iModulePhinxn = tr.GetnxnModulePhi(); + Int_t iModuleEta2x2 = tr.Get2x2ModuleEta(); + Int_t iModuleEtanxn = tr.GetnxnModuleEta(); - AliDebug(2, Form("Trigger 2x2 max amp %f, out amp %f, SM %d, iphi %d ieta %d", maxAmp2x2, ampOutOfPatch2x2, iSM2x2,iCellPhi2x2, iCellEta2x2)); - AliDebug(2, Form("Trigger 4x4 max amp %f , out amp %f, SM %d, iphi %d, ieta %d", maxAmpnxn, ampOutOfPatchnxn, iSMnxn,iCellPhinxn, iCellEtanxn)); + AliDebug(2, Form("Trigger 2x2 max amp %f, out amp %f, SM %d, iphi %d ieta %d", maxAmp2x2, ampOutOfPatch2x2, iSM2x2,iModulePhi2x2, iModuleEta2x2)); + AliDebug(2, Form("Trigger 4x4 max amp %f , out amp %f, SM %d, iphi %d, ieta %d", maxAmpnxn, ampOutOfPatchnxn, iSMnxn,iModulePhinxn, iModuleEtanxn)); TVector3 pos2x2(-1,-1,-1); TVector3 posnxn(-1,-1,-1); - Int_t iAbsId2x2 = geom->GetAbsCellIdFromCellIndexes( iSM2x2, iCellPhi2x2, iCellEta2x2) ; - Int_t iAbsIdnxn = geom->GetAbsCellIdFromCellIndexes( iSMnxn, iCellPhinxn, iCellEtanxn) ; - geom->GetGlobal(iAbsId2x2, pos2x2); - geom->GetGlobal(iAbsIdnxn, posnxn); + Int_t iAbsId2x2 = fGeom->GetAbsCellIdFromCellIndexes( iSM2x2, iModulePhi2x2, iModuleEta2x2) ; // should be changed to Module + Int_t iAbsIdnxn = fGeom->GetAbsCellIdFromCellIndexes( iSMnxn, iModulePhinxn, iModuleEtanxn) ; + fGeom->GetGlobal(iAbsId2x2, pos2x2); + fGeom->GetGlobal(iAbsIdnxn, posnxn); + //printf(" iAbsId2x2 %i iAbsIdnxn %i \n", iAbsId2x2, iAbsIdnxn); TArrayF triggerPosition(6); triggerPosition[0] = pos2x2(0) ; @@ -187,17 +246,66 @@ void AliEMCALReconstructor::FillESD(AliRunLoader* runLoader, AliESDEvent* esd) c triggerPosition[2] = pos2x2(2) ; triggerPosition[3] = posnxn(0) ; triggerPosition[4] = posnxn(1) ; - triggerPosition[5] = posnxn(2) ; + triggerPosition[5] = posnxn(2) ; + //printf(" triggerPosition "); + //for(int i=0; i<6; i++) printf(" %i %f : ", i, triggerPosition[i]); TArrayF triggerAmplitudes(4); triggerAmplitudes[0] = maxAmp2x2 ; triggerAmplitudes[1] = ampOutOfPatch2x2 ; triggerAmplitudes[2] = maxAmpnxn ; triggerAmplitudes[3] = ampOutOfPatchnxn ; + //printf("\n triggerAmplitudes "); + //for(int i=0; i<4; i++) printf(" %i %f : ", i, triggerAmplitudes[i]); + //printf("\n"); + tr.Print(""); esd->AddEMCALTriggerPosition(triggerPosition); esd->AddEMCALTriggerAmplitudes(triggerAmplitudes); - + // Fill trigger hists + AliEMCALHistoUtilities::FillTriggersListOfHists(fList,&triggerPosition,&triggerAmplitudes); + + //######################################## + //##############Fill CaloCells############### + //######################################## + + TClonesArray *digits = new TClonesArray("AliEMCALDigit",1000); + TBranch *branchdig = digitsTree->GetBranch("EMCAL"); + if (!branchdig) { + AliError("can't get the branch with the PHOS digits !"); + return; + } + branchdig->SetAddress(&digits); + digitsTree->GetEvent(0); + Int_t nDigits = digits->GetEntries(), idignew = 0 ; + AliDebug(1,Form("%d digits",nDigits)); + + AliESDCaloCells &emcCells = *(esd->GetEMCALCells()); + emcCells.CreateContainer(nDigits); + emcCells.SetType(AliESDCaloCells::kEMCALCell); + for (Int_t idig = 0 ; idig < nDigits ; idig++) { + const AliEMCALDigit * dig = (const AliEMCALDigit*)digits->At(idig); + if(dig->GetAmp() > 0 ){ + emcCells.SetCell(idignew,dig->GetId(),dig->GetAmp(), dig->GetTime()); + idignew++; + } + } + emcCells.SetNumberOfCells(idignew); + emcCells.Sort(); + + //------------------------------------------------------------ + //-----------------CLUSTERS----------------------------- + //------------------------------------------------------------ + TObjArray *clusters = new TObjArray(100); + TBranch *branch = clustersTree->GetBranch("EMCALECARP"); + branch->SetAddress(&clusters); + clustersTree->GetEvent(0); + + Int_t nClusters = clusters->GetEntries(), nClustersNew=0; + AliDebug(1,Form("%d clusters",nClusters)); + esd->SetFirstEMCALCluster(esd->GetNumberOfCaloClusters()); // Put after Phos clusters + + //###################################################### //#######################TRACK MATCHING############### //###################################################### @@ -220,124 +328,120 @@ void AliEMCALReconstructor::FillESD(AliRunLoader* runLoader, AliESDEvent* esd) c //######################################## //##############Fill CaloClusters############# //######################################## - - + esd->SetNumberOfEMCALClusters(nClusters); for (Int_t iClust = 0 ; iClust < nClusters ; iClust++) { - const AliEMCALRecPoint * clust = emcalLoader->RecPoint(iClust); - //if(clust->GetClusterType()== AliESDCaloCluster::kClusterv1) nRP++; else nPC++; + const AliEMCALRecPoint * clust = (const AliEMCALRecPoint*)clusters->At(iClust); + //if(clust->GetClusterType()== AliESDCaloCluster::kEMCALClusterv1) nRP++; else nPC++; if (Debug()) clust->Print(); // Get information from EMCAL reconstruction points Float_t xyz[3]; TVector3 gpos; clust->GetGlobalPosition(gpos); - for (Int_t ixyz=0; ixyz<3; ixyz++) + for (Int_t ixyz=0; ixyz<3; ixyz++) xyz[ixyz] = gpos[ixyz]; - - Int_t digitMult = clust->GetMultiplicity(); - Short_t *amplList = new Short_t[digitMult]; - Short_t *timeList = new Short_t[digitMult]; - Short_t *digiList = new Short_t[digitMult]; - Float_t *amplFloat = clust->GetEnergiesList(); - Float_t *timeFloat = clust->GetTimeList(); - Int_t *digitInts = clust->GetAbsId(); Float_t elipAxis[2]; clust->GetElipsAxis(elipAxis); - - // Convert Float_t* and Int_t* to Short_t* to save memory - // Problem : we should recalculate a cluster characteristics when discard digit(s) - Int_t newdigitMult = 0; - for (Int_t iDigit=0; iDigit 0) { - amplList[newdigitMult] = (UShort_t)(amplFloat[iDigit]*500); - // Time in units of 0.01 ns = 10 ps - if(timeFloat[iDigit] < 65536./timeScale) - timeList[newdigitMult] = (UShort_t)(timeFloat[iDigit]*timeScale); - else - timeList[newdigitMult] = 65535; - digiList[newdigitMult] = (UShort_t)(digitInts[iDigit]); - newdigitMult++; + //Create digits lists + Int_t cellMult = clust->GetMultiplicity(); + //TArrayS digiList(digitMult); + Float_t *amplFloat = clust->GetEnergiesList(); + Int_t *digitInts = clust->GetAbsId(); + TArrayS absIdList(cellMult); + //Uncomment when unfolding is done + //TArrayD fracList(cellMult); + + Int_t newCellMult = 0; + for (Int_t iCell=0; iCell 0) { + absIdList[newCellMult] = (UShort_t)(digitInts[iCell]); + //Uncomment when unfolding is done + //fracList[newCellMult] = amplFloat[iCell]/emcCells.GetCellAmplitude(digitInts[iCell]); + newCellMult++; } - else if (clust->GetClusterType() != AliESDCaloCluster::kPseudoCluster) - Warning("FillESD()","Negative or 0 digit amplitude in cluster"); } - - if(newdigitMult > 0) { // accept cluster if it has some digit + absIdList.Set(newCellMult); + //Uncomment when unfolding is done + //fracList.Set(newCellMult); + + if(newCellMult > 0) { // accept cluster if it has some digit nClustersNew++; - if(newdigitMult != digitMult) { // some digits were deleted - Short_t *amplListNew = new Short_t[newdigitMult]; - Short_t *timeListNew = new Short_t[newdigitMult]; - Short_t *digiListNew = new Short_t[newdigitMult]; - for (Int_t iDigit=0; iDigitGetParents(parentMult); - Short_t *parentList = new Short_t[parentMult]; - for (Int_t ipr=0; iprGetParents(parentMult); // fills the ESDCaloCluster - AliESDCaloCluster * ec = new AliESDCaloCluster() ; - ec->SetEMCAL(kTRUE); - ec->SetClusterType(clust->GetClusterType()); + AliESDCaloCluster * ec = new AliESDCaloCluster() ; + ec->SetClusterType(AliESDCaloCluster::kEMCALClusterv1); ec->SetPosition(xyz); ec->SetE(clust->GetEnergy()); - TArrayS arrayAmpList(newdigitMult,amplList); - TArrayS arrayTimeList(newdigitMult,timeList); - TArrayS arrayIndexList(newdigitMult,digiList); - ec->AddDigitAmplitude(arrayAmpList); - ec->AddDigitTime(arrayTimeList); - ec->AddDigitIndex(arrayIndexList); - - if(clust->GetClusterType()== AliESDCaloCluster::kClusterv1){ - - ec->SetClusterDisp(clust->GetDispersion()); - ec->SetClusterChi2(-1); //not yet implemented - ec->SetM02(elipAxis[0]*elipAxis[0]) ; - ec->SetM20(elipAxis[1]*elipAxis[1]) ; - ec->SetM11(-1) ; //not yet implemented - - TArrayS arrayTrackMatched(1);// Only one track, temporal solution. - arrayTrackMatched[0]= (Short_t)(matchedTrack[iClust]); - ec->AddTracksMatched(arrayTrackMatched); - - TArrayS arrayParents(parentMult,parentList); - ec->AddLabels(arrayParents); - } - + ec->SetNCells(newCellMult); + //Change type of list from short to ushort + UShort_t *newAbsIdList = new UShort_t[newCellMult]; + //Uncomment when unfolding is done + //Double_t *newFracList = new Double_t[newCellMult]; + for(Int_t i = 0; i < newCellMult ; i++) { + newAbsIdList[i]=absIdList[i]; + //Uncomment when unfolding is done + //newFracList[i]=fracList[i]; + } + ec->SetCellsAbsId(newAbsIdList); + //Uncomment when unfolding is done + //ec->SetCellsAmplitudeFraction(newFracList); + ec->SetClusterDisp(clust->GetDispersion()); + ec->SetClusterChi2(-1); //not yet implemented + ec->SetM02(elipAxis[0]*elipAxis[0]) ; + ec->SetM20(elipAxis[1]*elipAxis[1]) ; + ec->SetM11(-1) ; //not yet implemented + + TArrayI arrayTrackMatched(1);// Only one track, temporal solution. + arrayTrackMatched[0]= matchedTrack[iClust]; + ec->AddTracksMatched(arrayTrackMatched); + + TArrayI arrayParents(parentMult,parentList); + ec->AddLabels(arrayParents); + // add the cluster to the esd object - esd->AddCaloCluster(ec); + esd->AddCaloCluster(ec); delete ec; - - } else { // no new ESD cluster - delete [] amplList; - delete [] timeList; - delete [] digiList; - } - } // cycle on clusters - esd->SetNumberOfEMCALClusters(nClustersNew); - //if(nClustersNew != nClusters) - //printf(" ##### nClusters %i -> new %i ##### \n", nClusters, nClustersNew ); - - //Fill ESDCaloCluster with PID weights + //delete [] newAbsIdList ; + //delete [] newFracList ; + } + } // cycle on clusters + + delete [] matchedTrack; + + esd->SetNumberOfEMCALClusters(nClustersNew); + //if(nClustersNew != nClusters) + //printf(" ##### nClusters %i -> new %i ##### \n", nClusters, nClustersNew ); + + //Fill ESDCaloCluster with PID weights AliEMCALPID *pid = new AliEMCALPID; //pid->SetPrintInfo(kTRUE); pid->SetReconstructor(kTRUE); pid->RunPID(esd); + delete pid; + + delete digits; + delete clusters; + + // printf(" ## AliEMCALReconstructor::FillESD() is ended : ncl %i -> %i ### \n ",nClusters, nClustersNew); } +void AliEMCALReconstructor::ReadDigitsArrayFromTree(TTree *digitsTree) const +{ + // See AliEMCALClusterizer::SetInput(TTree *digitsTree); + if(fgDigitsArr) { + // Clear previous digits + fgDigitsArr->Delete(); + delete fgDigitsArr; + } + // Read the digits from the input tree + TBranch *branch = digitsTree->GetBranch("EMCAL"); + if (!branch) { + AliError("can't get the branch with the EMCAL digits !"); + return; + } + fgDigitsArr = new TClonesArray("AliEMCALDigit",100); + branch->SetAddress(&fgDigitsArr); + branch->GetEntry(0); +}