**************************************************************************/
#include <TClonesArray.h>
+#include <TTree.h>
#include "AliLog.h"
#include "AliESDVertex.h"
-#include "AliRunLoader.h"
-#include "AliITSLoader.h"
#include "AliITSgeomTGeo.h"
#include "AliITSRecPoint.h"
#include "AliITSReconstructor.h"
SetMinDist2Vtxs();
}
//--------------------------------------------------------------------------
-AliESDVertex* AliITSVertexerCosmics::FindVertexForCurrentEvent(Int_t evnumber)
+AliESDVertex* AliITSVertexerCosmics::FindVertexForCurrentEvent(TTree *itsClusterTree)
{
// Defines the AliESDVertex for the current event
fCurrentVertex = 0;
- AliRunLoader *rl =AliRunLoader::GetRunLoader();
- AliITSLoader* itsLoader = (AliITSLoader*)rl->GetLoader("ITSLoader");
- itsLoader->LoadRecPoints();
- rl->GetEvent(evnumber);
-
- TTree *rpTree = itsLoader->TreeR();
TClonesArray *recpoints=new TClonesArray("AliITSRecPoint",10000);
- rpTree->SetBranchAddress("ITSRecPoints",&recpoints);
+ itsClusterTree->SetBranchAddress("ITSRecPoints",&recpoints);
Int_t lay,lad,det;
// Search for innermost layer with at least two clusters
// on two different modules
Int_t ilayer=0,ilayer2=0;
- while(ilayer<6) {
+ Int_t nHitModulesSPDinner=0;
+ while(ilayer<AliITSgeomTGeo::GetNLayers()) {
if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(ilayer)) {
ilayer++;
continue;
}
Int_t nHitModules=0;
for(Int_t imodule=fFirst[ilayer]; imodule<=fLast[ilayer]; imodule++) {
- rpTree->GetEvent(imodule);
+ itsClusterTree->GetEvent(imodule);
AliITSgeomTGeo::GetModuleId(imodule,lay,lad,det);
lay -= 1; // AliITSgeomTGeo gives layer from 1 to 6, we want 0 to 5
if(lay!=ilayer) AliFatal("Layer mismatch!");
if(recpoints->GetEntriesFast()>0) nHitModules++;
}
+ if(ilayer==0) nHitModulesSPDinner=nHitModules;
if(nHitModules>=2) break;
ilayer++;
}
}
// try tracklet on SPD2 and point on SPD1
- if(ilayer==1 && ilayer2>5 && !AliITSReconstructor::GetRecoParam()->GetLayersToSkip(0)) {ilayer=0; ilayer2=1;}
+ if(ilayer==1 && !AliITSReconstructor::GetRecoParam()->GetLayersToSkip(0) &&
+ nHitModulesSPDinner>0) { ilayer=0; ilayer2=1; }
if(ilayer>4 || ilayer2>5) {
AliWarning("Not enough clusters");
delete recpoints;
- itsLoader->UnloadRecPoints();
fCurrentVertex = new AliESDVertex(pos,err,"cosmics");
fCurrentVertex->SetTitle("cosmics fake vertex (failed)");
fCurrentVertex->SetNContributors(ncontributors);
// Collect clusters in the selected layer and the outer one
for(Int_t imodule=fFirst[ilayer]; imodule<=fLast[ilayer2]; imodule++) {
- rpTree->GetEvent(imodule);
+ itsClusterTree->GetEvent(imodule);
AliITSgeomTGeo::GetModuleId(imodule,lay,lad,det);
lay -= 1; // AliITSgeomTGeo gives layer from 1 to 6, we want 0 to 5
nRecPoints=recpoints->GetEntriesFast();
//AliFatal("More than arrSize clusters per layer");
AliWarning("Too many clusters per layer");
delete recpoints;
- itsLoader->UnloadRecPoints();
fCurrentVertex = new AliESDVertex(pos,err,"cosmics");
fCurrentVertex->SetTitle("cosmics fake vertex (failed)");
fCurrentVertex->SetNContributors(ncontributors);
Int_t i1InnLay,i2InnLay,iOutLay;
// build fake vertices
- printf("Building tracklets on layer %d\n",ilayer);
+ //printf("Building tracklets on layer %d\n",ilayer);
// InnLay - first cluster
for(i1InnLay=0; i1InnLay<nclInnLayStored; i1InnLay++) {
fCurrentVertex->SetTitle("cosmics fake vertex");
fCurrentVertex->SetNContributors(ncontributors);
//fCurrentVertex->Print();
+ if(fComputeMultiplicity) FindMultiplicity(itsClusterTree);
delete recpoints;
- itsLoader->UnloadRecPoints();
return fCurrentVertex;
}
-//-------------------------------------------------------------------------
-void AliITSVertexerCosmics::FindVertices()
-{
- // computes the vertices of the events in the range FirstEvent - LastEvent
- AliRunLoader *rl = AliRunLoader::GetRunLoader();
- AliITSLoader* itsLoader = (AliITSLoader*) rl->GetLoader("ITSLoader");
- itsLoader->ReloadRecPoints();
- for(Int_t i=fFirstEvent;i<=fLastEvent;i++){
- // printf("Processing event %d\n",i);
- rl->GetEvent(i);
- FindVertexForCurrentEvent(i);
- if(fCurrentVertex){
- WriteCurrentVertex();
- }
- }
-}
+
//-------------------------------------------------------------------------
void AliITSVertexerCosmics::PrintStatus() const
{