X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALReconstructor.cxx;h=0dc6810ece36e922cb196a860fda5f9d99202529;hb=37fc80e656b4a99a04b30cf94cceb01038c84c10;hp=32ddad5c7931f0ce7a3c6754d280aa1633533b51;hpb=937d0661079960b95a663b6b71e6b1ca40b9ccad;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx index 32ddad5c793..0dc6810ece3 100644 --- a/EMCAL/AliEMCALReconstructor.cxx +++ b/EMCAL/AliEMCALReconstructor.cxx @@ -21,7 +21,15 @@ // 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 +#include +#include "TGeoManager.h" +#include "TGeoMatrix.h" // --- Standard library --- @@ -29,6 +37,8 @@ #include "AliEMCALReconstructor.h" #include "AliCodeTimer.h" +#include "AliCaloCalibPedestal.h" +#include "AliEMCALCalibData.h" #include "AliESDEvent.h" #include "AliESDCaloCluster.h" #include "AliESDCaloCells.h" @@ -37,77 +47,174 @@ #include "AliEMCALRawUtils.h" #include "AliEMCALDigit.h" #include "AliEMCALClusterizerv1.h" +#include "AliEMCALClusterizerNxN.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 "AliESDVZERO.h" +#include "AliCDBManager.h" #include "AliRunLoader.h" #include "AliRun.h" - -ClassImp(AliEMCALReconstructor) - -AliEMCALRecParam* AliEMCALReconstructor::fgkRecParam = 0; // EMCAL rec. parameters -AliEMCALRawUtils* AliEMCALReconstructor::fgRawUtils = 0; // EMCAL raw utilities class +#include "AliEMCALTriggerData.h" +#include "AliEMCALTriggerElectronics.h" +#include "AliEMCALTriggerDCSConfigDB.h" +#include "AliEMCALTriggerDCSConfig.h" +#include "AliEMCALTriggerData.h" +#include "AliEMCALTriggerRawDigit.h" +#include "AliEMCALTriggerPatch.h" +#include "AliEMCALTriggerTypes.h" + +ClassImp(AliEMCALReconstructor) + +const AliEMCALRecParam* AliEMCALReconstructor::fgkRecParam = 0; // EMCAL rec. parameters +AliEMCALRawUtils* AliEMCALReconstructor::fgRawUtils = 0; // EMCAL raw utilities class +AliEMCALClusterizer* AliEMCALReconstructor::fgClusterizer = 0; // EMCAL clusterizer class +TClonesArray* AliEMCALReconstructor::fgDigitsArr = 0; // list of digits, to be used multiple times +TObjArray* AliEMCALReconstructor::fgClustersArr = 0; // list of clusters, to be used multiple times +AliEMCALTriggerElectronics* AliEMCALReconstructor::fgTriggerProcessor = 0x0; //____________________________________________________________________________ AliEMCALReconstructor::AliEMCALReconstructor() - : fDebug(kFALSE),fGeom(0) + : fDebug(kFALSE), fList(0), fGeom(0),fCalibData(0),fPedestalData(0),fTriggerData(0x0) { // 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 { + AliRunLoader *rl = AliRunLoader::Instance(); + if (rl->GetAliRun()){ + AliEMCAL * emcal = dynamic_cast(rl->GetAliRun()->GetDetector("EMCAL")); + if(emcal) fGeom = emcal->GetGeometry(); + } + + if(!fGeom) { AliInfo(Form("Using default geometry in reconstruction")); fGeom = AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaultGeometryName()); } + //Get calibration parameters + if(!fCalibData) + { + AliCDBEntry *entry = (AliCDBEntry*) + AliCDBManager::Instance()->Get("EMCAL/Calib/Data"); + if (entry) fCalibData = (AliEMCALCalibData*) entry->GetObject(); + } + + if(!fCalibData) + AliFatal("Calibration parameters not found in CDB!"); + + //Get calibration parameters + if(!fPedestalData) + { + AliCDBEntry *entry = (AliCDBEntry*) + AliCDBManager::Instance()->Get("EMCAL/Calib/Pedestals"); + if (entry) fPedestalData = (AliCaloCalibPedestal*) entry->GetObject(); + } + + if(!fPedestalData) + AliFatal("Dead map not found in CDB!"); + if(!fGeom) AliFatal(Form("Could not get geometry!")); -} + AliEMCALTriggerDCSConfigDB* dcsConfigDB = AliEMCALTriggerDCSConfigDB::Instance(); -//____________________________________________________________________________ -AliEMCALReconstructor::AliEMCALReconstructor(const AliEMCALReconstructor & rec) - : AliReconstructor(rec), - fDebug(rec.fDebug), - fGeom(rec.fGeom) -{ - //copy ctor -} + const AliEMCALTriggerDCSConfig* dcsConfig = dcsConfigDB->GetTriggerDCSConfig(); + + if (!dcsConfig) AliFatal("No Trigger DCS Configuration from OCDB!"); + fgTriggerProcessor = new AliEMCALTriggerElectronics( dcsConfig ); + + fTriggerData = new AliEMCALTriggerData(); + + //Init temporary list of digits + fgDigitsArr = new TClonesArray("AliEMCALDigit",1000); + fgClustersArr = new TObjArray(1000); + +} //____________________________________________________________________________ AliEMCALReconstructor::~AliEMCALReconstructor() { // dtor - delete fGeom; + + if(fGeom) delete fGeom; + + //No need to delete, recovered from OCDB + //if(fCalibData) delete fCalibData; + //if(fPedestalData) delete fPedestalData; + + if(fgDigitsArr){ + fgDigitsArr->Clear("C"); + delete fgDigitsArr; + } + + if(fgClustersArr){ + fgClustersArr->Clear(); + delete fgClustersArr; + } + + if(fgRawUtils) delete fgRawUtils; + if(fgClusterizer) delete fgClusterizer; + if(fgTriggerProcessor) delete fgTriggerProcessor; + AliCodeTimer::Instance()->Print(); } -//____________________________________________________________________________ -void AliEMCALReconstructor::InitRecParam() const -{ - // Check if the instance of AliEMCALRecParam exists, - // if not, get it from OCDB if available, otherwise create a default one +// //____________________________________________________________________________ +// void AliEMCALReconstructor::Init() +// { +// // Trigger hists - Oct 24, 2007 +// fList = AliEMCALHistoUtilities::GetTriggersListOfHists(kTRUE); +// } - if (!fgkRecParam && (AliCDBManager::Instance()->IsDefaultStorageSet())) { - AliCDBEntry *entry = (AliCDBEntry*) - AliCDBManager::Instance()->Get("EMCAL/Config/RecParam"); - if (entry) fgkRecParam = (AliEMCALRecParam*) entry->GetObject(); +//____________________________________________________________________________ +void AliEMCALReconstructor::InitClusterizer() const +{ + //Init the clusterizer with geometry and calibration pointers, avoid doing it twice. + Int_t clusterizerType = -1; + Int_t eventType = -1; + if(GetRecParam()) { + clusterizerType = GetRecParam()->GetClusterizerFlag(); + eventType = GetRecParam()->GetEventSpecie(); + } + else{ + AliCDBEntry *entry = (AliCDBEntry*) + AliCDBManager::Instance()->Get("EMCAL/Calib/RecoParam"); + //Get The reco param for the default event specie + if (entry) { + AliEMCALRecParam *recParam = (AliEMCALRecParam*)((TObjArray *) entry->GetObject())->At(0); + if(recParam) clusterizerType = recParam->GetClusterizerFlag(); + } } - if(!fgkRecParam){ - AliWarning("The Reconstruction parameters for EMCAL nonitialized - Used default one"); - fgkRecParam = new AliEMCALRecParam; + //Check if clusterizer previously set corresponds to what is needed for this event type + if(fgClusterizer){ + if(eventType!=AliRecoParam::kCalib){ + //printf("ReCreate clusterizer? Clusterizer set <%d>, Clusterizer in use <%s>\n", + // clusterizerType, fgClusterizer->Version()); + + if (clusterizerType == AliEMCALRecParam::kClusterizerv1 && !strcmp(fgClusterizer->Version(),"clu-v1")) return; + + else if(clusterizerType == AliEMCALRecParam::kClusterizerNxN && !strcmp(fgClusterizer->Version(),"clu-NxN")) return; + + //Need to create new clusterizer, the one set previously is not the correct one + delete fgClusterizer; + } + else return; + } + + if (clusterizerType == AliEMCALRecParam::kClusterizerv1) + { + fgClusterizer = new AliEMCALClusterizerv1(fGeom, fCalibData,fPedestalData); + } + else + { + fgClusterizer = new AliEMCALClusterizerNxN(fGeom, fCalibData,fPedestalData); } } @@ -120,16 +227,33 @@ void AliEMCALReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) // the global tracking. // Works on the current event. - AliCodeTimerAuto("") + AliCodeTimerAuto("",0) - AliEMCALClusterizerv1 clu; - clu.SetInput(digitsTree); - clu.SetOutput(clustersTree); - if(Debug()) - clu.Digits2Clusters("deb all") ; - else - clu.Digits2Clusters("") ; + ReadDigitsArrayFromTree(digitsTree); + + InitClusterizer(); + fgClusterizer->InitParameters(); + fgClusterizer->SetOutput(clustersTree); + + //Skip clusterization of LED events + if (GetRecParam()->GetEventSpecie()!=AliRecoParam::kCalib){ + + if(fgDigitsArr && fgDigitsArr->GetEntries()) { + + fgClusterizer->SetInput(digitsTree); + + if(Debug()) + fgClusterizer->Digits2Clusters("deb all") ; + else + fgClusterizer->Digits2Clusters(""); + + fgClusterizer->Clear(); + + }//digits array exists and has somethind + }//not a LED event + + clustersTree->Fill(); } //____________________________________________________________________________ @@ -142,108 +266,153 @@ void AliEMCALReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits rawReader->Reset() ; - 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()); + fTriggerData->SetMode(1); - fgRawUtils->SetRawFormatHighLowGainFactor(fgkRecParam->GetHighLowGainFactor()); - fgRawUtils->SetRawFormatOrder(fgkRecParam->GetOrderParameter()); - fgRawUtils->SetRawFormatTau(fgkRecParam->GetTau()); - fgRawUtils->SetNoiseThreshold(fgkRecParam->GetNoiseThreshold()); - fgRawUtils->SetNPedSamples(fgkRecParam->GetNPedSamples()); + if(fgDigitsArr) fgDigitsArr->Clear("C"); - fgRawUtils->Raw2Digits(rawReader,digitsArr); + TClonesArray *digitsTrg = new TClonesArray("AliEMCALTriggerRawDigit", 32 * 96); + Int_t bufsize = 32000; + digitsTree->Branch("EMCAL", &fgDigitsArr, bufsize); + digitsTree->Branch("EMTRG", &digitsTrg, bufsize); + + //Skip calibration events do the rest + Bool_t doFit = kTRUE; + if ( !(GetRecParam()->FitLEDEvents()) && GetRecParam()->GetEventSpecie()==AliRecoParam::kCalib) doFit = kFALSE; + if (doFit){ + //must be done here because, in constructor, option is not yet known + fgRawUtils->SetOption(GetOption()); + + fgRawUtils->SetRawFormatHighLowGainFactor(GetRecParam()->GetHighLowGainFactor()); + fgRawUtils->SetRawFormatOrder(GetRecParam()->GetOrderParameter()); + fgRawUtils->SetRawFormatTau(GetRecParam()->GetTau()); + fgRawUtils->SetNoiseThreshold(GetRecParam()->GetNoiseThreshold()); + fgRawUtils->SetNPedSamples(GetRecParam()->GetNPedSamples()); + fgRawUtils->SetRemoveBadChannels(GetRecParam()->GetRemoveBadChannels()); + fgRawUtils->SetFittingAlgorithm(GetRecParam()->GetFittingAlgorithm()); + fgRawUtils->SetFALTROUsage(GetRecParam()->UseFALTRO()); + fgRawUtils->SetTimeMin(GetRecParam()->GetTimeMin()); + fgRawUtils->SetTimeMax(GetRecParam()->GetTimeMax()); + + fgRawUtils->Raw2Digits(rawReader,fgDigitsArr,fPedestalData,digitsTrg,fTriggerData); + }//skip calibration event + else{ + AliDebug(1," Calibration Event, skip!"); + } + digitsTree->Fill(); - digitsArr->Delete(); - delete digitsArr; + digitsTrg->Delete(); + delete digitsTrg; } + //____________________________________________________________________________ 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 - // Creates AliESDCaloCluster from AliEMCALRecPoints - // and AliESDCaloCells from AliEMCALDigits - // Also, fills ESD with calorimeter trigger information + // printf(" ## AliEMCALReconstructor::FillESD() is started ### \n "); + //return; - //###################################################### - //#########Calculate trigger and set trigger info########### - //###################################################### + //######################################## + // Trigger + //######################################## - AliEMCALTrigger tr ; - // tr.SetPatchSize(1);//create 4x4 patches - tr.Trigger(); + Int_t v0M[2] = {0, 0}; + + AliESDVZERO* esdV0 = esd->GetVZEROData(); + + if (esdV0) + { + for (Int_t i = 0; i < 32; i++) + { + v0M[0] += (Int_t)esdV0->GetAdcV0C(i); + v0M[1] += (Int_t)esdV0->GetAdcV0A(i); + } + } + else + { + AliWarning("Cannot retrieve V0 ESD! Run w/ null V0 charges"); + } + + TClonesArray *trgDigits = new TClonesArray("AliEMCALTriggerRawDigit",1000); + + TBranch *branchtrg = digitsTree->GetBranch("EMTRG"); + + if (!branchtrg) + { + AliError("Can't get the branch with the EMCAL trigger digits!"); + return; + } + + branchtrg->SetAddress(&trgDigits); + branchtrg->GetEntry(0); - Float_t maxAmp2x2 = tr.Get2x2MaxAmplitude(); - Float_t maxAmpnxn = tr.GetnxnMaxAmplitude(); - Float_t ampOutOfPatch2x2 = tr.Get2x2AmpOutOfPatch() ; - Float_t ampOutOfPatchnxn = tr.GetnxnAmpOutOfPatch() ; - - 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(); - - 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)); - - TVector3 pos2x2(-1,-1,-1); - TVector3 posnxn(-1,-1,-1); - - Int_t iAbsId2x2 = fGeom->GetAbsCellIdFromCellIndexes( iSM2x2, iCellPhi2x2, iCellEta2x2) ; - Int_t iAbsIdnxn = fGeom->GetAbsCellIdFromCellIndexes( iSMnxn, iCellPhinxn, iCellEtanxn) ; - fGeom->GetGlobal(iAbsId2x2, pos2x2); - fGeom->GetGlobal(iAbsIdnxn, posnxn); - - TArrayF triggerPosition(6); - triggerPosition[0] = pos2x2(0) ; - triggerPosition[1] = pos2x2(1) ; - triggerPosition[2] = pos2x2(2) ; - triggerPosition[3] = posnxn(0) ; - triggerPosition[4] = posnxn(1) ; - triggerPosition[5] = posnxn(2) ; - - TArrayF triggerAmplitudes(4); - triggerAmplitudes[0] = maxAmp2x2 ; - triggerAmplitudes[1] = ampOutOfPatch2x2 ; - triggerAmplitudes[2] = maxAmpnxn ; - triggerAmplitudes[3] = ampOutOfPatchnxn ; - - esd->AddEMCALTriggerPosition(triggerPosition); - esd->AddEMCALTriggerAmplitudes(triggerAmplitudes); + // Note: fgTriggerProcessor reset done at the end of this method + fgTriggerProcessor->Digits2Trigger(trgDigits, v0M, fTriggerData); + // Fill ESD + AliESDCaloTrigger* trgESD = esd->GetCaloTrigger("EMCAL"); + + if (trgESD) + { + trgESD->Allocate(trgDigits->GetEntriesFast()); + + for (Int_t i = 0; i < trgDigits->GetEntriesFast(); i++) + { + AliEMCALTriggerRawDigit* rdig = (AliEMCALTriggerRawDigit*)trgDigits->At(i); + + Int_t px, py; + if (fGeom->GetPositionInEMCALFromAbsFastORIndex(rdig->GetId(), px, py)) + { + Int_t a = -1, t = -1, times[10]; + + rdig->GetMaximum(a, t); + rdig->GetL0Times(times); + + trgESD->Add(px, py, a, t, times, rdig->GetNL0Times(), rdig->GetL1TimeSum(), rdig->GetTriggerBits()); + } + } + + trgESD->SetL1Threshold(0, fTriggerData->GetL1GammaThreshold()); + + trgESD->SetL1Threshold(1, fTriggerData->GetL1JetThreshold() ); + } + + // Resetting + fTriggerData->Reset(); + //######################################## //##############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 ; + ReadDigitsArrayFromTree(digitsTree); + +// TClonesArray *digits = new TClonesArray("AliEMCALDigit",1000); +// TBranch *branchdig = digitsTree->GetBranch("EMCAL"); +// if (!branchdig) { +// AliError("can't get the branch with the EMCAL digits !"); +// return; +// } +// branchdig->SetAddress(&digits); +// digitsTree->GetEvent(0); + Int_t nDigits = fgDigitsArr->GetEntries(), idignew = 0 ; AliDebug(1,Form("%d digits",nDigits)); AliESDCaloCells &emcCells = *(esd->GetEMCALCells()); emcCells.CreateContainer(nDigits); - emcCells.SetType(AliESDCaloCells::kEMCALCell); + emcCells.SetType(AliVCaloCells::kEMCALCell); + Float_t energy = 0; 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++; + const AliEMCALDigit * dig = (const AliEMCALDigit*)fgDigitsArr->At(idig); + if(dig->GetAmplitude() > 0 ){ + energy = fgClusterizer->Calibrate(dig->GetAmplitude(),dig->GetTime(),dig->GetId()); //TimeR or Time? + if(energy > 0){ //Digits tagged as bad (dead, hot, not alive) are set to 0 in calibrate, remove them + emcCells.SetCell(idignew,dig->GetId(),energy, dig->GetTime()); + idignew++; + } } } emcCells.SetNumberOfCells(idignew); @@ -252,14 +421,16 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, //------------------------------------------------------------ //-----------------CLUSTERS----------------------------- //------------------------------------------------------------ - TObjArray *clusters = new TObjArray(100); + clustersTree->SetBranchStatus("*",0); //disable all branches + clustersTree->SetBranchStatus("EMCALECARP",1); //Enable only the branch we need + if(fgClustersArr) fgClustersArr->Clear(); TBranch *branch = clustersTree->GetBranch("EMCALECARP"); - branch->SetAddress(&clusters); - clustersTree->GetEvent(0); + branch->SetAddress(&fgClustersArr); + branch->GetEntry(0); + //clustersTree->GetEvent(0); - Int_t nClusters = clusters->GetEntries(), nClustersNew=0; + Int_t nClusters = fgClustersArr->GetEntries(), nClustersNew=0; AliDebug(1,Form("%d clusters",nClusters)); - esd->SetFirstEMCALCluster(esd->GetNumberOfCaloClusters()); // Put after Phos clusters //###################################################### //#######################TRACK MATCHING############### @@ -279,107 +450,163 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, iemcalMatch = track->GetEMCALcluster(); if(iemcalMatch >= 0) matchedTrack[iemcalMatch] = itrack; } - + //######################################## - //##############Fill CaloClusters############ + //##############Fill CaloClusters############# //######################################## - - esd->SetNumberOfEMCALClusters(nClusters); for (Int_t iClust = 0 ; iClust < nClusters ; iClust++) { - const AliEMCALRecPoint * clust = (const AliEMCALRecPoint*)clusters->At(iClust); - //if(clust->GetClusterType()== AliESDCaloCluster::kEMCALClusterv1) nRP++; else nPC++; + const AliEMCALRecPoint * clust = (const AliEMCALRecPoint*)fgClustersArr->At(iClust); + //if(clust->GetClusterType()== AliVCluster::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]; Float_t elipAxis[2]; clust->GetElipsAxis(elipAxis); - - //Create digits lists + //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); + TArrayD fracList(cellMult); - Int_t newCellMult = 0; + 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++; + absIdList[newCellMult] = (UShort_t)(digitInts[iCell]); + //Calculate Fraction + if(emcCells.GetCellAmplitude(digitInts[iCell])>0 && GetRecParam()->GetUnfold()) + fracList[newCellMult] = amplFloat[iCell]/(emcCells.GetCellAmplitude(digitInts[iCell]));//get cell calibration value + else + fracList[newCellMult] = 0; + newCellMult++; } } + absIdList.Set(newCellMult); - //Uncomment when unfolding is done - //fracList.Set(newCellMult); - + fracList.Set(newCellMult); + if(newCellMult > 0) { // accept cluster if it has some digit nClustersNew++; //Primaries Int_t parentMult = 0; Int_t *parentList = clust->GetParents(parentMult); - // fills the ESDCaloCluster - AliESDCaloCluster * ec = new AliESDCaloCluster() ; - ec->SetClusterType(AliESDCaloCluster::kEMCALClusterv1); + AliESDCaloCluster * ec = new AliESDCaloCluster() ; + ec->SetType(AliVCluster::kEMCALClusterv1); ec->SetPosition(xyz); ec->SetE(clust->GetEnergy()); + + //Distance to the nearest bad crystal + ec->SetDistanceToBadChannel(clust->GetDistanceToBadTower()); + 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]; + 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]; + newAbsIdList[i]=absIdList[i]; + 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->SetCellsAmplitudeFraction(newFracList); + ec->SetDispersion(clust->GetDispersion()); + ec->SetChi2(-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->SetTOF(clust->GetTime()) ; //time-of-fligh + ec->SetNExMax(clust->GetNExMax()); //number of local maxima + 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); delete ec; - //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 [] newAbsIdList ; + delete [] newFracList ; + } + } // cycle on clusters + + delete [] matchedTrack; + + //Fill ESDCaloCluster with PID weights + AliEMCALPID *pid = new AliEMCALPID; + //pid->SetPrintInfo(kTRUE); + pid->SetReconstructor(kTRUE); + pid->RunPID(esd); + delete pid; + + //Store EMCAL misalignment matrixes + FillMisalMatrixes(esd) ; + +} + +//================================================================================== +void AliEMCALReconstructor::FillMisalMatrixes(AliESDEvent* esd)const{ + //Store EMCAL matrixes in ESD Header + + //Check, if matrixes was already stored + for(Int_t sm = 0 ; sm < fGeom->GetNumberOfSuperModules(); sm++){ + if(esd->GetEMCALMatrix(sm)!=0) + return ; + } + + //Create and store matrixes + if(!gGeoManager){ + AliError("Can not store misal. matrixes: no gGeoManager! \n") ; + return ; + } + //Note, that owner of copied marixes will be header + const Int_t bufsize = 255; + char path[bufsize] ; + TGeoHMatrix * m = 0x0; + for(Int_t sm = 0; sm < fGeom->GetNumberOfSuperModules(); sm++){ + snprintf(path,bufsize,"/ALIC_1/XEN1_1/SMOD_%d",sm+1) ; //In Geometry modules numbered 1,2,.,5 + if(sm >= 10) snprintf(path,bufsize,"/ALIC_1/XEN1_1/SM10_%d",sm-10+1) ; + + if (gGeoManager->CheckPath(path)){ + gGeoManager->cd(path); + m = gGeoManager->GetCurrentMatrix() ; +// printf("================================================= \n"); +// printf("AliEMCALReconstructor::FixMisalMatrixes(), sm %d, \n",sm); +// m->Print(""); + esd->SetEMCALMatrix(new TGeoHMatrix(*m),sm) ; +// printf("================================================= \n"); + } + else{ + esd->SetEMCALMatrix(NULL,sm) ; + } + } +} + + +//__________________________________________________________________________ +void AliEMCALReconstructor::ReadDigitsArrayFromTree(TTree *digitsTree) const +{ + // See AliEMCALClusterizer::SetInput(TTree *digitsTree); + if(fgDigitsArr) { + // Clear previous digits + fgDigitsArr->Clear("C"); + //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); }