warnings with gcc 4.3.2

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

diff --git a/ITS/AliITSReconstructor.cxx b/ITS/AliITSReconstructor.cxx
index 789d9411906c4a125c0aca1c1d6633c94aff6c66..7e5ca3758d02cb58be08327cef01d6b5ab037efd 100644 (file)
--- a/ITS/AliITSReconstructor.cxx
+++ b/ITS/AliITSReconstructor.cxx
@@ -33,6 +33,7 @@
 #include "AliITStrackerSA.h"
 #include "AliITSVertexerIons.h"
 #include "AliITSVertexerFast.h"
+#include "AliITSVertexerFixed.h"
 #include "AliITSVertexer3D.h"
 #include "AliITSVertexerZ.h"
 #include "AliITSVertexerCosmics.h"
@@ -103,13 +104,11 @@ void AliITSReconstructor::Reconstruct(TTree *digitsTree, TTree *clustersTree) co
 // reconstruct clusters
 
   Int_t cluFindOpt = GetRecoParam()->GetClusterFinder();
-  Bool_t useV2=kTRUE;   // Default: V2 cluster finder
-  if(cluFindOpt==1) useV2=kFALSE;
 
   fDetTypeRec->SetTreeAddressD(digitsTree);
   fDetTypeRec->MakeBranch(clustersTree,"R");
   fDetTypeRec->SetTreeAddressR(clustersTree);
-  fDetTypeRec->DigitsToRecPoints(digitsTree,clustersTree,0,"All",useV2);    
+  fDetTypeRec->DigitsToRecPoints(digitsTree,clustersTree,0,"All",cluFindOpt);    
 }
 
 //_________________________________________________________________
@@ -167,39 +166,52 @@ AliVertexer* AliITSReconstructor::CreateVertexer() const
 {
 // create a ITS vertexer
 
+  AliITSVertexer *vptr;
   Int_t vtxOpt = GetRecoParam()->GetVertexer();
   if(vtxOpt==3){
     Info("CreateVertexer","a AliITSVertexerIons object has been selected\n");
-    return new AliITSVertexerIons();
+    vptr =  new AliITSVertexerIons();
   }
-  if(vtxOpt==4){
+  else if(vtxOpt==4){
     Double_t smear[3]={0.005,0.005,0.01};
     Info("CreateVertexer","a AliITSVertexerFast object has been selected\n"); 
-    return new AliITSVertexerFast(smear);
+    vptr = new AliITSVertexerFast(smear);
   }
-  if(vtxOpt==1){
+  else if(vtxOpt==1){
     Info("CreateVertexer","a AliITSVertexerZ object has been selected\n");
-    return new AliITSVertexerZ();
+    vptr =  new AliITSVertexerZ();
   }
-  if(vtxOpt==2){
+  else if(vtxOpt==2){
     Info("CreateVertexer","a AliITSVertexerCosmics object has been selected\n");
-    return new AliITSVertexerCosmics();
+    vptr = new AliITSVertexerCosmics();
   }
+  else if(vtxOpt==5){ 
+    Info("CreateVertexer","vertex is fixed in the position of the TDI\n");
+    vptr = new AliITSVertexerFixed("TDI");
+  }
+  else if(vtxOpt==6){ 
+    Info("CreateVertexer","vertex is fixed in the position of the TED\n");
+    vptr = new AliITSVertexerFixed("TED");
+  }
+  else {
   // by default an AliITSVertexer3D object is instatiated
-  Info("CreateVertexer","a AliITSVertexer3D object has been selected\n");
-  AliITSVertexer3D*  vtxr = new AliITSVertexer3D();
-  Float_t dzw=GetRecoParam()->GetVertexer3DWideFiducialRegionZ();
-  Float_t drw=GetRecoParam()->GetVertexer3DWideFiducialRegionR();
-  vtxr->SetWideFiducialRegion(dzw,drw);
-  Float_t dzn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionZ();
-  Float_t drn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionR();
-  vtxr->SetNarrowFiducialRegion(dzn,drn);
-  Float_t dphil=GetRecoParam()->GetVertexer3DLooseDeltaPhiCut();
-  Float_t dphit=GetRecoParam()->GetVertexer3DTightDeltaPhiCut();
-  vtxr->SetDeltaPhiCuts(dphil,dphit);
-  Float_t dcacut=GetRecoParam()->GetVertexer3DDCACut();
-  vtxr->SetDCACut(dcacut);
-  return vtxr;
+    Info("CreateVertexer","a AliITSVertexer3D object has been selected\n");
+    AliITSVertexer3D*  vtxr = new AliITSVertexer3D();
+    Float_t dzw=GetRecoParam()->GetVertexer3DWideFiducialRegionZ();
+    Float_t drw=GetRecoParam()->GetVertexer3DWideFiducialRegionR();
+    vtxr->SetWideFiducialRegion(dzw,drw);
+    Float_t dzn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionZ();
+    Float_t drn=GetRecoParam()->GetVertexer3DNarrowFiducialRegionR();
+    vtxr->SetNarrowFiducialRegion(dzn,drn);
+    Float_t dphil=GetRecoParam()->GetVertexer3DLooseDeltaPhiCut();
+    Float_t dphit=GetRecoParam()->GetVertexer3DTightDeltaPhiCut();
+    vtxr->SetDeltaPhiCuts(dphil,dphit);
+    Float_t dcacut=GetRecoParam()->GetVertexer3DDCACut();
+    vtxr->SetDCACut(dcacut);
+    vptr = vtxr;
+  }
+  vptr->SetDetTypeRec(fDetTypeRec);
+  return vptr;
 }
 
 //_____________________________________________________________________________