M AliTPCTransform.cxx - Eff C++ warning

[u/mrichter/AliRoot.git] / ITS / AliITSVertexerZ.cxx

diff --git a/ITS/AliITSVertexerZ.cxx b/ITS/AliITSVertexerZ.cxx
index dcb695d6458892ba54ee130a4dd1dc572f08ed04..e3550c3d024825d07361e5a3a6b97284db2bba1e 100644 (file)
--- a/ITS/AliITSVertexerZ.cxx
+++ b/ITS/AliITSVertexerZ.cxx
@@ -188,6 +188,9 @@ AliESDVertex* AliITSVertexerZ::FindVertexForCurrentEvent(TTree *itsClusterTree){
 void AliITSVertexerZ::VertexZFinder(TTree *itsClusterTree){
   // Defines the AliESDVertex for the current event
   fCurrentVertex = 0;
+  ResetVertex();
+
+  if(!GetDetTypeRec())AliFatal("DetTypeRec pointer has not been set");
 
   TTree *tR = itsClusterTree;
   fDetTypeRec->SetTreeAddressR(tR);
@@ -202,6 +205,12 @@ void AliITSVertexerZ::VertexZFinder(TTree *itsClusterTree){
   itsRec = fDetTypeRec->RecPoints();
   TBranch *branch;
   branch = tR->GetBranch("ITSRecPoints");
+  if(!branch){
+    AliWarning("Null pointer for RecPoints branch, vertex not calculated");
+    ResetHistograms();
+    fCurrentVertex = new AliESDVertex(0.,5.3,-2);
+    return;
+  }
 
   Int_t nrpL1 = 0;
   Int_t nrpL2 = 0;
@@ -219,6 +228,7 @@ void AliITSVertexerZ::VertexZFinder(TTree *itsClusterTree){
     fDetTypeRec->ResetRecPoints();
   }
   if(nrpL1 == 0 || nrpL2 == 0){
+    AliDebug(1,Form("No RecPoints in at least one SPD layer (%d %d)",nrpL1,nrpL2));
     ResetHistograms();
     fCurrentVertex = new AliESDVertex(0.,5.3,-2);
     return;
@@ -375,19 +385,28 @@ void AliITSVertexerZ::VertexZFinder(TTree *itsClusterTree){
     niter++;
   } while(niter<10 && TMath::Abs((zm-lim1)-(lim2-zm))>fTolerance);
   fCurrentVertex = new AliESDVertex(zm,ezm,ncontr);
-  fCurrentVertex->SetTitle("vertexer: B");
+  fCurrentVertex->SetTitle("vertexer: Z");
+  fNoVertices=1;
   points.Clear();
-  fIsPileup=kFALSE;
-  fNTrpuv=-2;
   if(ncontr>fMinTrackletsForPilup){ 
     Float_t secPeakPos;
     Int_t ncontr2=FindSecondPeak(fZCombc,binmin,binmax,secPeakPos);
     if(ncontr2>=fMinTrackletsForPilup){ 
       fIsPileup=kTRUE;
+      fNoVertices=2;
       fZpuv=secPeakPos;
       fNTrpuv=ncontr2;
+      AliESDVertex secondVert(secPeakPos,0.1,ncontr2);
+      fVertArray = new AliESDVertex[2];
+      fVertArray[0]=(*fCurrentVertex);
+      fVertArray[1]=secondVert;
     }
-  }    
+  }
+  if(fNoVertices==1){
+    fVertArray = new AliESDVertex[1];
+    fVertArray[0]=(*fCurrentVertex);     
+  }
+  
   ResetHistograms();
   return;
 }
@@ -399,11 +418,11 @@ Int_t AliITSVertexerZ::FindSecondPeak(TH1F* h, Int_t binmin,Int_t binmax, Float_
   }
   Int_t secPeakBin=h->GetMaximumBin();
   secPeakPos=h->GetBinCenter(secPeakBin);
-  Int_t secPeakCont=h->GetBinContent(secPeakBin);
-  secPeakCont+=h->GetBinContent(secPeakBin-1);
-  secPeakCont+=h->GetBinContent(secPeakBin+1);  
-  secPeakCont+=h->GetBinContent(secPeakBin-2);
-  secPeakCont+=h->GetBinContent(secPeakBin+2);  
+  Int_t secPeakCont=(Int_t)h->GetBinContent(secPeakBin);
+  secPeakCont+=(Int_t)h->GetBinContent(secPeakBin-1);
+  secPeakCont+=(Int_t)h->GetBinContent(secPeakBin+1);  
+  secPeakCont+=(Int_t)h->GetBinContent(secPeakBin-2);
+  secPeakCont+=(Int_t)h->GetBinContent(secPeakBin+2);  
   return secPeakCont;
 }