// It can be used successfully with Pb-Pb collisions
////////////////////////////////////////////////////////////////
+using std::endl;
+using std::cout;
ClassImp(AliITSVertexerZ)
fStepCoarse(0),
fTolerance(0.),
fMaxIter(0),
-fWindowWidth(0) {
+fWindowWidth(0),
+fSearchForPileup(kTRUE)
+{
// Default constructor
SetDiffPhiMax();
SetFirstLayerModules();
fStepCoarse(0),
fTolerance(0.),
fMaxIter(0),
-fWindowWidth(0) {
+fWindowWidth(0),
+fSearchForPileup(kTRUE)
+{
// Standard Constructor
SetDiffPhiMax();
SetFirstLayerModules();
//______________________________________________________________________
void AliITSVertexerZ::VertexZFinder(TTree *itsClusterTree){
// Defines the AliESDVertex for the current event
+ delete fCurrentVertex;
fCurrentVertex = 0;
Double_t startPos[3]={GetNominalPos()[0],GetNominalPos()[1],GetNominalPos()[2]};
Double_t startCov[6]={GetNominalCov()[0],GetNominalCov()[1],GetNominalCov()[2],
// lc2 and gc2 are local and global coordinates for layer 2
Float_t gc2[3]={0.,0.,0.}; //; for(Int_t ii=0; ii<3; ii++) gc2[ii]=0.;
AliITSRecPointContainer* rpcont=AliITSRecPointContainer::Instance();
- itsRec=rpcont->FetchClusters(0,itsClusterTree);
+ rpcont->FetchClusters(0,itsClusterTree);
if(!rpcont->IsSPDActive()){
AliWarning("Null pointer for RecPoints branch, vertex not calculated");
ResetHistograms();
zm=0.;
ezm=0.;
ncontr=0;
- for(Int_t i =0; i<points.GetEntries(); i++){
+ for(Int_t i =0; i<points.GetEntriesFast(); i++){
AliITSZPoint* p=(AliITSZPoint*)points.UncheckedAt(i);
if(p->GetZ()>lim1 && p->GetZ()<lim2){
Float_t deno = p->GetErrZ();
fCurrentVertex->SetDispersion(fDiffPhiMax);
fNoVertices=1;
points.Clear();
- if(ncontr>fMinTrackletsForPilup){
+ if(fSearchForPileup && ncontr>fMinTrackletsForPilup){
Float_t secPeakPos;
Int_t ncontr2=FindSecondPeak(fZCombc,binmin,binmax,secPeakPos);
if(ncontr2>=fMinTrackletsForPilup){
}
//_____________________________________________________________________
-Int_t AliITSVertexerZ::FindSecondPeak(TH1F* h, Int_t binmin,Int_t binmax, Float_t& secPeakPos){
+Int_t AliITSVertexerZ::FindSecondPeak(TH1F* h, Int_t binmin,Int_t binmax, Float_t& secPeakPos){
+ // Resets bin contents between binmin and binmax and then search
+ // for a second peak position
for(Int_t i=binmin-1;i<=binmax+1;i++){
h->SetBinContent(i,0.);
}