X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALReconstructor.cxx;h=9d3dc7239c166d0076c101d38dd2c6f495e0b02e;hb=9bde52f15b68bec576e5180de434123962c3681b;hp=048721c14f88ca50bb5cea08b05d34321a6c4b51;hpb=ee08eddeb6496760fd9a0a31366df16ba829bb21;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx index 048721c14f8..9d3dc7239c1 100644 --- a/EMCAL/AliEMCALReconstructor.cxx +++ b/EMCAL/AliEMCALReconstructor.cxx @@ -21,13 +21,10 @@ // 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" @@ -37,6 +34,8 @@ #include "AliEMCALReconstructor.h" #include "AliCodeTimer.h" +#include "AliCaloCalibPedestal.h" +#include "AliEMCALCalibData.h" #include "AliESDEvent.h" #include "AliESDCaloCluster.h" #include "AliESDCaloCells.h" @@ -45,10 +44,11 @@ #include "AliEMCALRawUtils.h" #include "AliEMCALDigit.h" #include "AliEMCALClusterizerv1.h" +#include "AliEMCALClusterizerv2.h" #include "AliEMCALClusterizerNxN.h" #include "AliEMCALRecPoint.h" #include "AliEMCALPID.h" -#include "AliEMCALTrigger.h" +#include "AliEMCALRecoUtils.h" #include "AliRawReader.h" #include "AliCDBEntry.h" #include "AliCDBManager.h" @@ -62,109 +62,180 @@ #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; // shoud read just once at event + +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 +TClonesArray* AliEMCALReconstructor::fgTriggerDigits = 0; // list of trigger digits, to be used multiple times AliEMCALTriggerElectronics* AliEMCALReconstructor::fgTriggerProcessor = 0x0; //____________________________________________________________________________ AliEMCALReconstructor::AliEMCALReconstructor() - : fDebug(kFALSE), fList(0), fGeom(0),fCalibData(0),fPedestalData(0) + : fGeom(0),fCalibData(0),fPedestalData(0),fTriggerData(0x0), fMatches(0x0) { // ctor - fgRawUtils = new AliEMCALRawUtils; + // AliDebug(2, "Mark."); + 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::Instance(); - if (rl->GetAliRun() && rl->GetAliRun()->GetDetector("EMCAL")) { - fGeom = dynamic_cast(rl->GetAliRun()->GetDetector("EMCAL"))->GetGeometry(); - } else { + 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(); + AliCDBEntry *entry = (AliCDBEntry*) + AliCDBManager::Instance()->Get("EMCAL/Calib/Data"); + if (entry) fCalibData = (AliEMCALCalibData*) entry->GetObject(); } - + if(!fCalibData) - AliFatal("Calibration parameters not found in CDB!"); - + 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(); + AliCDBEntry *entry = (AliCDBEntry*) + AliCDBManager::Instance()->Get("EMCAL/Calib/Pedestals"); + if (entry) fPedestalData = (AliCaloCalibPedestal*) entry->GetObject(); } - + if(!fPedestalData) AliFatal("Dead map not found in CDB!"); - - InitClusterizer(); - + if(!fGeom) AliFatal(Form("Could not get geometry!")); - + AliEMCALTriggerDCSConfigDB* dcsConfigDB = AliEMCALTriggerDCSConfigDB::Instance(); - + 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); + + const int kNTRU = fGeom->GetNTotalTRU(); + fgTriggerDigits = new TClonesArray("AliEMCALTriggerRawDigit", kNTRU * 96); + + //Track matching + fMatches = new TList(); + fMatches->SetOwner(kTRUE); } //____________________________________________________________________________ AliEMCALReconstructor::~AliEMCALReconstructor() { // dtor - delete fGeom; + + //AliDebug(2, "Mark."); + + ////RS 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; + fgDigitsArr = 0; + + if(fgClustersArr) fgClustersArr->Clear(); + delete fgClustersArr; + fgClustersArr = 0; + + if(fgTriggerDigits) fgTriggerDigits->Clear(); + delete fgTriggerDigits; + fgTriggerDigits = 0; + delete fgRawUtils; + fgRawUtils = 0; delete fgClusterizer; + fgClusterizer = 0; + delete fgTriggerProcessor; - + fgTriggerProcessor = 0; + + if(fMatches) { fMatches->Delete(); delete fMatches; fMatches = 0;} + AliCodeTimer::Instance()->Print(); } -// //____________________________________________________________________________ -// void AliEMCALReconstructor::Init() -// { -// // Trigger hists - Oct 24, 2007 -// fList = AliEMCALHistoUtilities::GetTriggersListOfHists(kTRUE); -// } - -//____________________________________________________________________________ -void AliEMCALReconstructor::InitClusterizer() +//____________________________________________________________________________ +void AliEMCALReconstructor::InitClusterizer() const { - //Init the clusterizer with geometry and calibration pointers, avoid doing it twice. - - AliEMCALRecParam *recParam = NULL; - AliCDBEntry *entry = (AliCDBEntry*) - AliCDBManager::Instance()->Get("EMCAL/Calib/RecoParam"); - //Get The reco param for the default event specie - if (entry) - recParam = (AliEMCALRecParam*)((TObjArray *) entry->GetObject())->At(0); - - if(!recParam) - AliFatal("RecoParam not found in CDB!"); - - if (recParam->GetClusterizerFlag() == AliEMCALRecParam::kClusterizerv1) + //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(); + } + } + + //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; + + else if(clusterizerType == AliEMCALRecParam::kClusterizerv2 && !strcmp(fgClusterizer->Version(),"clu-v2")) 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 if (clusterizerType == AliEMCALRecParam::kClusterizerNxN) + { + fgClusterizer = new AliEMCALClusterizerNxN(fGeom, fCalibData,fPedestalData); + } + else if (clusterizerType == AliEMCALRecParam::kClusterizerv2) { - fgClusterizer = new AliEMCALClusterizerv1(fGeom, fCalibData,fPedestalData); + fgClusterizer = new AliEMCALClusterizerv2 (fGeom, fCalibData,fPedestalData); } - else + else { - fgClusterizer = new AliEMCALClusterizerNxN(fGeom, fCalibData,fPedestalData); + AliFatal(Form("Unknown clusterizer %d ", clusterizerType)); } - } //____________________________________________________________________________ @@ -175,109 +246,94 @@ void AliEMCALReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) // segment maker needs access to the AliESD object to retrieve the tracks reconstructed by // the global tracking. // Works on the current event. - + AliCodeTimerAuto("",0) - + + //Get input digits and put them in fgDigitsArr, clear the list before ReadDigitsArrayFromTree(digitsTree); + InitClusterizer(); + fgClusterizer->InitParameters(); fgClusterizer->SetOutput(clustersTree); - - AliEMCALTriggerData* trgData = new AliEMCALTriggerData(); - - Int_t bufferSize = 32000; - - if (TBranch* triggerBranch = clustersTree->GetBranch("EMTRG")) - triggerBranch->SetAddress(&trgData); - else - clustersTree->Branch("EMTRG","AliEMCALTriggerData",&trgData,bufferSize); - - TClonesArray *trgDigits = new TClonesArray("AliEMCALRawDigit",1000); - TBranch *branchdig = digitsTree->GetBranch("EMTRG"); - if (!branchdig) - { - AliError("Can't get the branch with the EMCAL trigger digits !"); - return; - } - - branchdig->SetAddress(&trgDigits); - branchdig->GetEntry(0); - + //Skip clusterization of LED events if (GetRecParam()->GetEventSpecie()!=AliRecoParam::kCalib){ - - Int_t v0M[2] = {0,0}; - fgTriggerProcessor->Digits2Trigger(trgDigits, v0M, trgData); - - - if(fgDigitsArr && fgDigitsArr->GetEntries()) { - - fgClusterizer->SetInput(digitsTree); - if(Debug()) - fgClusterizer->Digits2Clusters("deb all") ; - else - fgClusterizer->Digits2Clusters(""); - - fgClusterizer->Clear(); - - }//digits array exists and has somethind + if(fgDigitsArr && fgDigitsArr->GetEntries()) { + + fgClusterizer->SetInput(digitsTree); + + //fgClusterizer->Digits2Clusters("deb all") ; //For debugging + fgClusterizer->Digits2Clusters(""); + + fgClusterizer->Clear(); + + }//digits array exists and has somethind }//not a LED event - + clustersTree->Fill(); - trgDigits->Delete(); - delete trgDigits; trgDigits = 0x0; - delete trgData; trgData = 0x0; + // Deleting the recpoints at the end of the reconstruction call + fgClusterizer->DeleteRecPoints(); } //____________________________________________________________________________ void AliEMCALReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digitsTree) const - + { // Conversion from raw data to // EMCAL digits. // Works on a single-event basis - + rawReader->Reset() ; - - TClonesArray *digitsArr = new TClonesArray("AliEMCALDigit",200); - TClonesArray *digitsTrg = new TClonesArray("AliEMCALRawDigit", 200); - + + fTriggerData->SetMode(1); + + if(fgDigitsArr) fgDigitsArr->Clear("C"); + + const int kNTRU = fGeom->GetNTotalTRU(); + TClonesArray *digitsTrg = new TClonesArray("AliEMCALTriggerRawDigit", kNTRU * 96); + Int_t bufsize = 32000; - digitsTree->Branch("EMCAL", &digitsArr, bufsize); + 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,digitsArr,fPedestalData,digitsTrg); + //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()); + if (!fgRawUtils->GetFittingAlgorithm()) fgRawUtils->SetFittingAlgorithm(GetRecParam()->GetFittingAlgorithm()); + fgRawUtils->SetFALTROUsage(GetRecParam()->UseFALTRO()); + // fgRawUtils->SetFALTROUsage(0); + + //fgRawUtils->SetTimeMin(GetRecParam()->GetTimeMin()); + //fgRawUtils->SetTimeMax(GetRecParam()->GetTimeMax()); + + // fgRawUtils->SetTimeMin(-99999 ); + // fgRawUtils->SetTimeMax( 99999 ); + + fgRawUtils->Raw2Digits(rawReader,fgDigitsArr,fPedestalData,digitsTrg,fTriggerData); + }//skip calibration event else{ - AliDebug(1," Calibration Event, skip!"); + AliDebug(1," Calibration Event, skip!"); } - + digitsTree->Fill(); - digitsArr->Delete(); digitsTrg->Delete(); - delete digitsArr; delete digitsTrg; - + } @@ -288,82 +344,177 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, // Called by AliReconstruct after Reconstruct() and global tracking and vertexing // and V0 // Works on the current event - // printf(" ## AliEMCALReconstructor::FillESD() is started ### \n "); + // printf(" ## AliEMCALReconstructor::FillESD() is started ### \n "); //return; - + + //######################################## + // Trigger + //######################################## + + static int saveOnce = 0; + + Int_t v0M[2] = {0, 0}; + + AliESDVZERO* esdV0 = esd->GetVZEROData(); + + if (esdV0) + { + v0M[0] = esdV0->GetTriggerChargeC(); + v0M[1] = esdV0->GetTriggerChargeA(); + } + else + { + AliWarning("No V0 ESD! Run trigger processor w/ null V0 charges"); + } + + if (fgTriggerDigits && fgTriggerDigits->GetEntriesFast()) fgTriggerDigits->Delete(); + + TBranch *branchtrg = digitsTree->GetBranch("EMTRG"); + + if (!branchtrg) + { + AliError("Can't get the branch with the EMCAL trigger digits!"); + return; + } + + branchtrg->SetAddress(&fgTriggerDigits); + branchtrg->GetEntry(0); + + // Note: fgTriggerProcessor reset done at the end of this method + fgTriggerProcessor->Digits2Trigger(fgTriggerDigits, v0M, fTriggerData); + + // Fill ESD + AliESDCaloTrigger* trgESD = esd->GetCaloTrigger("EMCAL"); + + if (trgESD) + { + trgESD->Allocate(fgTriggerDigits->GetEntriesFast()); + + for (Int_t i = 0; i < fgTriggerDigits->GetEntriesFast(); i++) + { + AliEMCALTriggerRawDigit* rdig = (AliEMCALTriggerRawDigit*)fgTriggerDigits->At(i); + if (AliDebugLevel() > 999) rdig->Print(""); + + 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()); + } + } + + for (int i = 0; i < 2; i++) { + trgESD->SetL1Threshold(2 * i , fTriggerData->GetL1JetThreshold( i)); + trgESD->SetL1Threshold(2 * i + 1, fTriggerData->GetL1GammaThreshold(i)); + } + + Int_t v0[2]; + fTriggerData->GetL1V0(v0); + + trgESD->SetL1V0(v0); + trgESD->SetL1FrameMask(fTriggerData->GetL1FrameMask()); + + if (!saveOnce && fTriggerData->GetL1DataDecoded()) + { + int type[15] = {0}; + fTriggerData->GetL1TriggerType(type); + + esd->SetCaloTriggerType(type); + + saveOnce = 1; + } + } + + // 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 EMCAL digits !"); - return; - } - branchdig->SetAddress(&digits); - digitsTree->GetEvent(0); - Int_t nDigits = digits->GetEntries(), idignew = 0 ; + + //Get input digits and put them in fgDigitsArr, clear the list before + ReadDigitsArrayFromTree(digitsTree); + + 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->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++; - } + Float_t time = 0; + for (Int_t idig = 0 ; idig < nDigits ; idig++) + { + const AliEMCALDigit * dig = (const AliEMCALDigit*)fgDigitsArr->At(idig); + time = dig->GetTime(); // Time already calibrated in clusterizer + energy = dig->GetAmplitude(); // energy calibrated in clusterizer + + if(energy > 0 ) + { + fgClusterizer->Calibrate(energy,time,dig->GetId()); //Digits already calibrated in clusterizers + + if(energy > 0) //Digits tagged as bad (dead, hot, not alive) are set to 0 in calibrate, remove them + { + // Only for MC + // Get the label of the primary particle that generated the cell + // Assign the particle that deposited more energy + Int_t nprimaries = dig->GetNprimary() ; + Int_t digLabel =-1 ; + Float_t edep =-1.; + if ( nprimaries > 0 ) + { + Int_t jndex ; + for ( jndex = 0 ; jndex < nprimaries ; jndex++ ) { // all primaries in digit + + if(edep < dig->GetDEParent(jndex+1)) + { + digLabel = dig->GetIparent (jndex+1); + edep = dig->GetDEParent(jndex+1); + } + + } // all primaries in digit + } // select primary label + + Bool_t highGain = kFALSE; + if( dig->GetType() == AliEMCALDigit::kHG ) highGain = kTRUE; + + emcCells.SetCell(idignew,dig->GetId(),energy, time,digLabel,0.,highGain); + idignew++; + } } } + emcCells.SetNumberOfCells(idignew); emcCells.Sort(); - + //------------------------------------------------------------ //-----------------CLUSTERS----------------------------- //------------------------------------------------------------ clustersTree->SetBranchStatus("*",0); //disable all branches clustersTree->SetBranchStatus("EMCALECARP",1); //Enable only the branch we need - - TObjArray *clusters = new TObjArray(100); + if(fgClustersArr) fgClustersArr->Clear(); TBranch *branch = clustersTree->GetBranch("EMCALECARP"); - branch->SetAddress(&clusters); + 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)); - //###################################################### - //#######################TRACK MATCHING############### - //###################################################### - //Fill list of integers, each one is index of track to which the cluster belongs. - - // step 1 - initialize array of matched track indexes - Int_t *matchedTrack = new Int_t[nClusters]; - for (Int_t iclus = 0; iclus < nClusters; iclus++) - matchedTrack[iclus] = -1; // neg. index --> no matched track - - // step 2, change the flag for all matched clusters found in tracks - Int_t iemcalMatch = -1; - Int_t endtpc = esd->GetNumberOfTracks(); - for (Int_t itrack = 0; itrack < endtpc; itrack++) { - AliESDtrack * track = esd->GetTrack(itrack) ; // retrieve track - iemcalMatch = track->GetEMCALcluster(); - if(iemcalMatch >= 0) matchedTrack[iemcalMatch] = itrack; - } //######################################## //##############Fill CaloClusters############# //######################################## for (Int_t iClust = 0 ; iClust < nClusters ; iClust++) { - const AliEMCALRecPoint * clust = (const AliEMCALRecPoint*)clusters->At(iClust); - //if(clust->GetClusterType()== AliESDCaloCluster::kEMCALClusterv1) nRP++; else nPC++; - if (Debug()) clust->Print(); + const AliEMCALRecPoint * clust = (const AliEMCALRecPoint*)fgClustersArr->At(iClust); + if(!clust) continue; + //if(clust->GetClusterType()== AliVCluster::kEMCALClusterv1) nRP++; else nPC++; + // clust->Print(); //For debugging // Get information from EMCAL reconstruction points Float_t xyz[3]; TVector3 gpos; @@ -372,27 +523,30 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, 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); 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 - //if(emcCells.GetCellAmplitude(digitInts[iCell])>0) - //fracList[newCellMult] = amplFloat[iCell]/(emcCells.GetCellAmplitude(digitInts[iCell])*calibration);//get cell calibration value - //else - fracList[newCellMult] = 0; - 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); fracList.Set(newCellMult); @@ -403,118 +557,274 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, Int_t *parentList = clust->GetParents(parentMult); // fills the ESDCaloCluster AliESDCaloCluster * ec = new AliESDCaloCluster() ; - ec->SetClusterType(AliESDCaloCluster::kEMCALClusterv1); + 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]; Double_t *newFracList = new Double_t[newCellMult]; for(Int_t i = 0; i < newCellMult ; i++) { newAbsIdList[i]=absIdList[i]; - newFracList[i]=fracList[i]; + newFracList[i] =fracList[i]; } ec->SetCellsAbsId(newAbsIdList); ec->SetCellsAmplitudeFraction(newFracList); - ec->SetClusterDisp(clust->GetDispersion()); - ec->SetClusterChi2(-1); //not yet implemented + ec->SetDispersion(clust->GetDispersion()); + ec->SetChi2(-1); //not yet implemented ec->SetM02(elipAxis[0]*elipAxis[0]) ; ec->SetM20(elipAxis[1]*elipAxis[1]) ; 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 + // + //Track matching + // + fMatches->Clear(); + Int_t nTracks = esd->GetNumberOfTracks(); + for (Int_t itrack = 0; itrack < nTracks; itrack++) + { + AliESDtrack * track = esd->GetTrack(itrack) ; // retrieve track + if(track->GetEMCALcluster()==iClust) + { + Float_t dEta=-999, dPhi=-999; + Bool_t isMatch = CalculateResidual(track, ec, dEta, dPhi); + if(!isMatch) + { + // AliDebug(10, "Not good"); + continue; + } + AliEMCALMatch *match = new AliEMCALMatch(); + match->SetIndexT(itrack); + match->SetDistance(TMath::Sqrt(dEta*dEta+dPhi*dPhi)); + match->SetdEta(dEta); + match->SetdPhi(dPhi); + fMatches->Add(match); + } + } + fMatches->Sort(kSortAscending); //Sort matched tracks from closest to furthest + Int_t nMatch = fMatches->GetEntries(); + TArrayI arrayTrackMatched(nMatch); + for(Int_t imatch=0; imatchAt(imatch); + arrayTrackMatched[imatch] = match->GetIndexT(); + if(imatch==0) + { + ec->SetTrackDistance(match->GetdPhi(), match->GetdEta()); + } + } + ec->AddTracksMatched(arrayTrackMatched); + + //add the cluster to the esd object esd->AddCaloCluster(ec); + delete ec; delete [] newAbsIdList ; delete [] newFracList ; - } - } // cycle on clusters - - delete [] matchedTrack; + } + } // cycle on clusters - //Fill ESDCaloCluster with PID weights - AliEMCALPID *pid = new AliEMCALPID; - //pid->SetPrintInfo(kTRUE); - pid->SetReconstructor(kTRUE); - pid->RunPID(esd); - delete pid; + // + //Reset the index of matched cluster for tracks + //to the one in CaloCluster array + Int_t ncls = esd->GetNumberOfCaloClusters(); + for(Int_t icl=0; iclGetCaloCluster(icl); + if(!cluster || !cluster->IsEMCAL()) continue; + TArrayI *trackIndex = cluster->GetTracksMatched(); + for(Int_t itr=0; itrGetSize(); itr++) + { + AliESDtrack *track = esd->GetTrack(trackIndex->At(itr)); + track->SetEMCALcluster(cluster->GetID()); + } + } - delete digits; - delete clusters; - //Store EMCAL misalignment matrixes - FillMisalMatrixes(esd) ; - + //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 - char path[255] ; - TGeoHMatrix * m = 0x0; - for(Int_t sm = 0; sm < fGeom->GetNumberOfSuperModules(); sm++){ - sprintf(path,"/ALIC_1/XEN1_1/SMOD_%d",sm+1) ; //In Geometry modules numbered 1,2,.,5 - if(sm >= 10) sprintf(path,"/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) ; - } - } + //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; + Int_t tmpType = -1; + Int_t SMOrder = 0; + TString SMName; + for(Int_t sm = 0; sm < fGeom->GetNumberOfSuperModules(); sm++){ + if(fGeom->GetSMType(sm) == AliEMCALGeometry::kEMCAL_Standard ) SMName = "SMOD"; + else if(fGeom->GetSMType(sm) == AliEMCALGeometry::kEMCAL_Half ) SMName = "SM10"; + else if(fGeom->GetSMType(sm) == AliEMCALGeometry::kEMCAL_3rd ) SMName = "SM3rd"; + else if( fGeom->GetSMType(sm) == AliEMCALGeometry::kDCAL_Standard ) SMName = "DCSM"; + else if( fGeom->GetSMType(sm) == AliEMCALGeometry::kDCAL_Ext ) SMName = "DCEXT"; + else AliError("Unkown SM Type!!"); + + if(fGeom->GetSMType(sm) == tmpType) { + SMOrder++; + } else { + tmpType = fGeom->GetSMType(sm); + SMOrder = 1; + } + snprintf(path,bufsize,"/ALIC_1/XEN1_1/%s_%d", SMName.Data(), SMOrder) ; + + 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->Delete(); - delete fgDigitsArr; + // Read the digits from the input tree + // See AliEMCALClusterizer::SetInput(TTree *digitsTree); + + // Clear previous digits in the list + if(fgDigitsArr){ + fgDigitsArr->Clear("C"); + } + else{ + // It should not happen, but just in case ... + fgDigitsArr = new TClonesArray("AliEMCALDigit",100); } + // 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); } +//================================================================================== +Bool_t AliEMCALReconstructor::CalculateResidual(AliESDtrack *track, AliESDCaloCluster *cluster, Float_t &dEta, Float_t &dPhi)const +{ + // + // calculate the residual between track and cluster + // + + // If the esdFriend is available, use the TPCOuter point as the starting point of extrapolation + // Otherwise use the TPCInner point + + dEta = -999, dPhi = -999; + Bool_t ITSTrackSA = 0; + + AliExternalTrackParam *trkParam = 0; + + const AliESDfriendTrack* friendTrack = track->GetFriendTrack(); + if(friendTrack && friendTrack->GetTPCOut()) + trkParam = const_cast(friendTrack->GetTPCOut()); + else if(track->GetInnerParam()) + trkParam = const_cast(track->GetInnerParam()); + else{ + trkParam = new AliExternalTrackParam(*track); //If there is ITSSa track + ITSTrackSA = 1; + } + if(!trkParam) return kFALSE; + + AliExternalTrackParam trkParamTmp (*trkParam); + if(!AliEMCALRecoUtils::ExtrapolateTrackToCluster(&trkParamTmp, cluster, track->GetMass(kTRUE), GetRecParam()->GetExtrapolateStep(), dEta, dPhi)){ + if(ITSTrackSA) delete trkParam; + return kFALSE; + } + + if(ITSTrackSA) delete trkParam; + return kTRUE; +} + +// +//================================================================================== +// +AliEMCALReconstructor::AliEMCALMatch::AliEMCALMatch() + : TObject(), + fIndexT(-1), + fDistance(-999.), + fdEta(-999.), + fdPhi(-999.) +{ + //default constructor + +} + +// +//================================================================================== +// +AliEMCALReconstructor::AliEMCALMatch::AliEMCALMatch(const AliEMCALMatch& copy) + : TObject(), + fIndexT(copy.fIndexT), + fDistance(copy.fDistance), + fdEta(copy.fdEta), + fdPhi(copy.fdPhi) +{ + //copy ctor +} +//_____________________________________________________________________ +AliEMCALReconstructor::AliEMCALMatch& AliEMCALReconstructor::AliEMCALMatch::AliEMCALMatch::operator = (const AliEMCALMatch &source) +{ // assignment operator; use copy ctor + if (&source == this) return *this; + new (this) AliEMCALMatch(source); + return *this; +} +// +//================================================================================== +// +Int_t AliEMCALReconstructor::AliEMCALMatch::Compare(const TObject *obj) const +{ + // + // Compare wrt the residual + // + + AliEMCALReconstructor::AliEMCALMatch *that = (AliEMCALReconstructor::AliEMCALMatch*)obj; + + Double_t thisDist = fDistance;//fDistance; + Double_t thatDist = that->fDistance;//that->GetDistance(); + + if (thisDist > thatDist) return 1; + else if (thisDist < thatDist) return -1; + return 0; +}