X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALReconstructor.cxx;h=759a7634f8f41b80299ccd0b1e5f863e22d79a66;hb=d934d2578e7cb4b77f8144a7153aa6e478f64809;hp=5ac1668309c92966b750da6198da4efee8cd5ebc;hpb=b4133f059863743a7c4dfd3ecd7f5c58047f512f;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx index 5ac1668309c..759a7634f8f 100644 --- a/EMCAL/AliEMCALReconstructor.cxx +++ b/EMCAL/AliEMCALReconstructor.cxx @@ -21,7 +21,13 @@ // 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 // --- Standard library --- @@ -43,34 +49,48 @@ #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 +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 //____________________________________________________________________________ AliEMCALReconstructor::AliEMCALReconstructor() - : fDebug(kFALSE),fGeom(0) + : fDebug(kFALSE), fList(0), fGeom(0) { // ctor - InitRecParam(); fgRawUtils = new AliEMCALRawUtils; - fGeom = AliEMCALGeometry::GetInstance(); - if(!fGeom) { - fGeom = AliEMCALGeometry::GetInstance("",""); - if(!fGeom) AliFatal(Form("Could not get geometry!")); + fgClusterizer = new AliEMCALClusterizerv1; + + //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), + fList(rec.fList), fGeom(rec.fGeom) { //copy ctor @@ -85,21 +105,10 @@ AliEMCALReconstructor::~AliEMCALReconstructor() } //____________________________________________________________________________ -void AliEMCALReconstructor::InitRecParam() const +void AliEMCALReconstructor::Init() { - // 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; - } + // Trigger hists - Oct 24, 2007 + fList = AliEMCALHistoUtilities::GetTriggersListOfHists(kTRUE); } //____________________________________________________________________________ @@ -113,14 +122,23 @@ void AliEMCALReconstructor::Reconstruct(TTree* digitsTree, TTree* clustersTree) AliCodeTimerAuto("") - AliEMCALClusterizerv1 clu; - clu.SetInput(digitsTree); - clu.SetOutput(clustersTree); - if(Debug()) - clu.Digits2Clusters("deb all") ; - else - clu.Digits2Clusters("") ; - + ReadDigitsArrayFromTree(digitsTree); + fgClusterizer->InitParameters(); + fgClusterizer->SetOutput(clustersTree); + + if(fgDigitsArr && fgDigitsArr->GetEntries()) { + + fgClusterizer->SetInput(digitsTree); + + if(Debug()) + fgClusterizer->Digits2Clusters("deb all") ; + else + fgClusterizer->Digits2Clusters(""); + + fgClusterizer->Clear(); + + } + } //____________________________________________________________________________ @@ -133,18 +151,18 @@ void AliEMCALReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits rawReader->Reset() ; - TClonesArray *digitsArr = new TClonesArray("AliEMCALDigit",100); + TClonesArray *digitsArr = new TClonesArray("AliEMCALDigit",200); 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->SetRawFormatHighLowGainFactor(GetRecParam()->GetHighLowGainFactor()); + fgRawUtils->SetRawFormatOrder(GetRecParam()->GetOrderParameter()); + fgRawUtils->SetRawFormatTau(GetRecParam()->GetTau()); + fgRawUtils->SetNoiseThreshold(GetRecParam()->GetNoiseThreshold()); + fgRawUtils->SetNPedSamples(GetRecParam()->GetNPedSamples()); fgRawUtils->Raw2Digits(rawReader,digitsArr); @@ -154,24 +172,35 @@ void AliEMCALReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits } + //____________________________________________________________________________ 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########### //###################################################### - - 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() ; @@ -179,21 +208,22 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, 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 = fGeom->GetAbsCellIdFromCellIndexes( iSM2x2, iCellPhi2x2, iCellEta2x2) ; - Int_t iAbsIdnxn = fGeom->GetAbsCellIdFromCellIndexes( iSMnxn, iCellPhinxn, iCellEtanxn) ; + 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) ; @@ -201,16 +231,40 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, 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(""); + // + // Trigger jet staff + // + if(tr.GetNJetThreshold()>0) { + // Jet phi/eta + Int_t n0 = triggerPosition.GetSize(); + const TH2F *hpatch = tr.GetJetMatrixE(); + triggerPosition.Set(n0 + 2); + for(Int_t i=0; i<2; i++) triggerPosition[n0+i] = hpatch->GetMean(i+1); + // Add jet ampitudes + n0 = triggerAmplitudes.GetSize(); + triggerAmplitudes.Set(n0 + tr.GetNJetThreshold()); + Double_t *ampJet = tr.GetL1JetThresholds(); + for(Int_t i=0; iAddEMCALTriggerPosition(triggerPosition); esd->AddEMCALTriggerAmplitudes(triggerAmplitudes); + // Fill trigger hists + AliEMCALHistoUtilities::FillTriggersListOfHists(fList,&triggerPosition,&triggerAmplitudes); //######################################## //##############Fill CaloCells############### @@ -252,6 +306,7 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, AliDebug(1,Form("%d clusters",nClusters)); esd->SetFirstEMCALCluster(esd->GetNumberOfCaloClusters()); // Put after Phos clusters + //###################################################### //#######################TRACK MATCHING############### //###################################################### @@ -270,11 +325,10 @@ 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); @@ -284,93 +338,111 @@ void AliEMCALReconstructor::FillESD(TTree* digitsTree, TTree* clustersTree, 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]); + //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.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() ; + AliESDCaloCluster * ec = new AliESDCaloCluster() ; ec->SetClusterType(AliESDCaloCluster::kEMCALClusterv1); ec->SetPosition(xyz); ec->SetE(clust->GetEnergy()); 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->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->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; + 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; - esd->SetNumberOfEMCALClusters(nClustersNew); - //if(nClustersNew != nClusters) - //printf(" ##### nClusters %i -> new %i ##### \n", nClusters, nClustersNew ); + delete digits; + delete clusters; - //Fill ESDCaloCluster with PID weights - AliEMCALPID *pid = new AliEMCALPID; - //pid->SetPrintInfo(kTRUE); - pid->SetReconstructor(kTRUE); - pid->RunPID(esd); - delete pid; - + // 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); +}