Added OADB as external library dependency to ANALYSISalice. OADB will get automatical...

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

diff --git a/ITS/AliITSVertexer.cxx b/ITS/AliITSVertexer.cxx
index b4e0cdd54f9d9cb683e0e4eb3a9eb47096b5c402..f14a0c722a679383941826a6f82124201b2dd69f 100644 (file)
--- a/ITS/AliITSVertexer.cxx
+++ b/ITS/AliITSVertexer.cxx
@@ -4,6 +4,7 @@
 #include "AliITSVertexer.h"
 #include "AliITSLoader.h"
 #include "AliITSMultReconstructor.h"
+#include "AliITSRecPointContainer.h"
 
 const Float_t AliITSVertexer::fgkPipeRadius = 3.0;
 
@@ -12,7 +13,7 @@ ClassImp(AliITSVertexer)
 //////////////////////////////////////////////////////////////////////
 // Base class for primary vertex reconstruction                     //
 // AliESDVertexer is a class for full 3D primary vertex finding     //
-// derived classes: AliITSVertexerIons AliITSvertexer3D             //
+// derived classes: AliITSvertexer3D, AliITSVertexerZ.              //       
 //                  AliITSVertexerCosmics                           //
 //////////////////////////////////////////////////////////////////////
 
@@ -22,6 +23,7 @@ ClassImp(AliITSVertexer)
 AliITSVertexer::AliITSVertexer():AliVertexer(),
 fLadders(), 
 fLadOnLay2(0),
+fComputeMultiplicity(kFALSE),
 fDetTypeRec(NULL),
 fMinTrackletsForPilup(0),
 fIsPileup(0),
@@ -67,18 +69,27 @@ void AliITSVertexer::FindMultiplicity(TTree *itsClusterTree){
   // Invokes AliITSMultReconstructor to determine the
   // charged multiplicity in the pixel layers
   if(fMult){delete fMult; fMult = 0;}
+
   Bool_t success=kTRUE;
+  Bool_t cosmics=kFALSE; 
   if(!fCurrentVertex)success=kFALSE;
   if(fCurrentVertex && fCurrentVertex->GetNContributors()<1)success=kFALSE;
+  if(fCurrentVertex && strstr(fCurrentVertex->GetTitle(),"cosmics")) {
+    success=kFALSE; 
+    cosmics=kTRUE;
+  } 
 
   // get the FastOr bit mask
   TBits fastOrFiredMap = fDetTypeRec->GetFastOrFiredMap();
-
+  TBits firedChipMap = fDetTypeRec->GetFiredChipMap(itsClusterTree);
+ 
   AliITSMultReconstructor multReco;
 
   if(!success){
-    AliWarning("Tracklets multiplicity not determined because the primary vertex was not found");
-    AliWarning("Just counting the number of cluster-fired chips on the SPD layers");
+    if(!cosmics) {     
+      AliDebug(1,"Tracklets multiplicity not determined because the primary vertex was not found");
+      AliDebug(1,"Just counting the number of cluster-fired chips on the SPD layers");
+    }
     if (!itsClusterTree) {
       AliError(" Invalid ITS cluster tree !\n");
       return;
@@ -86,7 +97,13 @@ void AliITSVertexer::FindMultiplicity(TTree *itsClusterTree){
     multReco.LoadClusterFiredChips(itsClusterTree);
     Short_t nfcL1 = multReco.GetNFiredChips(0);
     Short_t nfcL2 = multReco.GetNFiredChips(1);
-    fMult = new AliMultiplicity(0,0,0,0,0,0,0,0,0,0,nfcL1,nfcL2,fastOrFiredMap);
+    fMult = new AliMultiplicity(0,0,0,0,0,0,0,0,0,0,0,nfcL1,nfcL2,fastOrFiredMap);
+    fMult->SetFiredChipMap(firedChipMap);
+    AliITSRecPointContainer* rcont = AliITSRecPointContainer::Instance();
+    fMult->SetITSClusters(0,rcont->GetNClustersInLayer(1,itsClusterTree));
+    for(Int_t kk=2;kk<=6;kk++){
+      fMult->SetITSClusters(kk-1,rcont->GetNClustersInLayerFast(kk));
+    }
     return;
   }
 
@@ -118,14 +135,21 @@ void AliITSVertexer::FindMultiplicity(TTree *itsClusterTree){
   Int_t nosingleclus=multReco.GetNSingleClusters();
   Float_t *ths = new Float_t [nosingleclus];
   Float_t *phs = new Float_t [nosingleclus];
+  Int_t *labelss = new Int_t [nosingleclus];
   for(Int_t i=0;i<nosingleclus;i++){
     ths[i] = multReco.GetCluster(i)[0];
     phs[i] = multReco.GetCluster(i)[1];
+    labelss[i] = (Int_t)multReco.GetCluster(i)[2];
   }
   Short_t nfcL1 = multReco.GetNFiredChips(0);
   Short_t nfcL2 = multReco.GetNFiredChips(1);
-  fMult = new AliMultiplicity(notracks,tht,phi,dtht,dphi,labels,labelsL2,nosingleclus,ths,phs,nfcL1,nfcL2,fastOrFiredMap);
-
+  fMult = new AliMultiplicity(notracks,tht,phi,dtht,dphi,labels,labelsL2,nosingleclus,ths,phs,labelss,nfcL1,nfcL2,fastOrFiredMap);
+  fMult->SetFiredChipMap(firedChipMap);
+  AliITSRecPointContainer* rcont = AliITSRecPointContainer::Instance();
+  fMult->SetITSClusters(0,rcont->GetNClustersInLayer(1,itsClusterTree));
+  for(Int_t kk=2;kk<=6;kk++){
+    fMult->SetITSClusters(kk-1,rcont->GetNClustersInLayerFast(kk));
+  }
   delete [] tht;
   delete [] phi;
   delete [] dtht;
@@ -134,6 +158,7 @@ void AliITSVertexer::FindMultiplicity(TTree *itsClusterTree){
   delete [] phs;
   delete [] labels;
   delete [] labelsL2;
+  delete [] labelss;
 
   return;
 }
@@ -185,7 +210,8 @@ void AliITSVertexer::Init(TString filename){
   // analysis of an entire file
   AliRunLoader *rl = AliRunLoader::Instance();
   if(!rl){
-    Fatal("AliITSVertexer","Run Loader not found");
+    AliFatal("Run Loader not found");
+    return;
   }
   if (fLastEvent < 0) SetLastEvent(rl->GetNumberOfEvents()-1);