Calls to ALiESDVertex::SetTruePos have been eliminated

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

diff --git a/ITS/AliITSReconstructor.cxx b/ITS/AliITSReconstructor.cxx
index 15cafe2a5a8d4dd15b2b3cba5db1afe4090939b1..996753107a2408fb74d4e783e8406e7d7771948c 100644 (file)
--- a/ITS/AliITSReconstructor.cxx
+++ b/ITS/AliITSReconstructor.cxx
@@ -29,11 +29,13 @@
 #include "AliITSDetTypeRec.h"
 #include "AliITSLoader.h"
 #include "AliITStrackerMI.h"
+#include "AliITStrackerV2.h"
 #include "AliITStrackerSA.h"
 #include "AliITSVertexerIons.h"
 #include "AliITSVertexerFast.h"
-#include "AliITSVertexerPPZ.h"
+#include "AliITSVertexer3D.h"
 #include "AliITSVertexerZ.h"
+#include "AliITSVertexerCosmics.h"
 #include "AliESD.h"
 #include "AliITSpidESD.h"
 #include "AliITSpidESD1.h"
@@ -80,10 +82,9 @@ void AliITSReconstructor::Init(AliRunLoader *runLoader) const{
     // Return:
     //   none.
 
-    AliITSInitGeometry *initgeom = new AliITSInitGeometry("AliITSvPPRasymmFMD",
-                                                         2);
-    AliITSgeom *geom = initgeom->CreateAliITSgeom();
-    delete initgeom; // once created, do not need initgeom any more.
+    AliITSInitGeometry initgeom;
+    AliITSgeom *geom = initgeom.CreateAliITSgeom();
+    AliInfo(Form("Geometry name: %s",(initgeom.GetGeometryName()).Data()));
     AliITSLoader* loader = static_cast<AliITSLoader*>
        (runLoader->GetLoader("ITSLoader"));
     if (!loader) {
@@ -165,14 +166,19 @@ AliTracker* AliITSReconstructor::CreateTracker(AliRunLoader* runLoader)const
 // create a ITS tracker
 
   
-  AliITSgeom* geom = GetITSgeom(runLoader);
   TString selectedTracker = GetOption();
   AliTracker* tracker;    
   if (selectedTracker.Contains("MI")) {
     tracker = new AliITStrackerMI(0);
+  }  
+  else if (selectedTracker.Contains("V2")) {
+    tracker = new AliITStrackerV2(0);
   }
   else {
-    tracker =  new AliITStrackerSA(geom);  // inherits from AliITStrackerMI
+    tracker =  new AliITStrackerSA(0);  // inherits from AliITStrackerMI
+    AliITStrackerSA *sat=(AliITStrackerSA*)tracker;
+    if(selectedTracker.Contains("onlyITS"))sat->SetSAFlag(kTRUE);
+    if(sat->GetSAFlag())AliDebug(1,"Tracking Performed in ITS only\n");
   }
 
   TString selectedPIDmethod = GetOption();
@@ -184,7 +190,7 @@ AliTracker* AliITSReconstructor::CreateTracker(AliRunLoader* runLoader)const
     loader->AdoptITSpid(new AliITSpidESD2((AliITStrackerMI*)tracker,loader));
   }
   else{
-    Double_t parITS[] = {34., 0.15, 10.};
+    Double_t parITS[] = {0.15, 10.}; //PH positions of the MIP peak
     loader->AdoptITSpid(new AliITSpidESD1(parITS));
   }
   return tracker;
@@ -206,9 +212,13 @@ AliVertexer* AliITSReconstructor::CreateVertexer(AliRunLoader* /*runLoader*/) co
     Info("CreateVertexer","a AliITSVertexerFast object has been selected\n"); 
     return new AliITSVertexerFast(smear);
   }
-  if(selectedVertexer.Contains("ppz") || selectedVertexer.Contains("PPZ")){
-    Info("CreateVertexer","a AliITSVertexerPPZ object has been selected\n");
-    return new AliITSVertexerPPZ("null");
+  if(selectedVertexer.Contains("3d") || selectedVertexer.Contains("3D")){
+    Info("CreateVertexer","a AliITSVertexer3D object has been selected\n");
+    return new AliITSVertexer3D("null");
+  }
+  if(selectedVertexer.Contains("cosmics") || selectedVertexer.Contains("COSMICS")){
+    Info("CreateVertexer","a AliITSVertexerCosmics object has been selected\n");
+    return new AliITSVertexerCosmics();
   }
   // by default an AliITSVertexerZ object is instatiated
   Info("CreateVertexer","a AliITSVertexerZ object has been selected\n");