Fixes for Coverity warnings (M. van Leeuwen)

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

diff --git a/ITS/AliITSVertexerCosmics.cxx b/ITS/AliITSVertexerCosmics.cxx
index d582ddb30f0e473a1a784ad7e9e41f3f99735c96..b4e554c397a889103a07c2d5ff6a1248826d6c2c 100644 (file)
--- a/ITS/AliITSVertexerCosmics.cxx
+++ b/ITS/AliITSVertexerCosmics.cxx
@@ -100,7 +100,8 @@ AliESDVertex* AliITSVertexerCosmics::FindVertexForCurrentEvent(TTree *itsCluster
   // 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;
@@ -113,6 +114,7 @@ AliESDVertex* AliITSVertexerCosmics::FindVertexForCurrentEvent(TTree *itsCluster
       if(lay!=ilayer) AliFatal("Layer mismatch!");
       if(recpoints->GetEntriesFast()>0) nHitModules++;
     }
+    if(ilayer==0) nHitModulesSPDinner=nHitModules;
     if(nHitModules>=2) break;
     ilayer++;
   }
@@ -124,7 +126,8 @@ AliESDVertex* AliITSVertexerCosmics::FindVertexForCurrentEvent(TTree *itsCluster
   }
 
   // try tracklet on SPD2 and point on SPD1
-  if(ilayer==1 && !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");
@@ -145,7 +148,7 @@ AliESDVertex* AliITSVertexerCosmics::FindVertexForCurrentEvent(TTree *itsCluster
   Int_t nclOutLayStored=0;
   Int_t nRecPoints,nRecPointsInnLay=0;
 
-  Float_t gc[3],gcov[5];
+  Float_t gc[3],gcov[6];
 
   Float_t matchOutLayValue;
   Float_t distxyInnLay,distxyInnLayBest=0.;
@@ -306,6 +309,7 @@ AliESDVertex* AliITSVertexerCosmics::FindVertexForCurrentEvent(TTree *itsCluster
   fCurrentVertex->SetTitle("cosmics fake vertex");
   fCurrentVertex->SetNContributors(ncontributors);
   //fCurrentVertex->Print();
+  if(fComputeMultiplicity) FindMultiplicity(itsClusterTree);
 
   delete recpoints;