Options for ITS reconstruction moved to AliITSRecoParam (Dainese, Prino)

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

diff --git a/ITS/AliITSReconstructor.cxx b/ITS/AliITSReconstructor.cxx
index 037c02124555bef1f44c66e1a953226cae1f7c31..622e57f046bf1dfc6dd03907f09410c9cf18d6d2 100644 (file)
--- a/ITS/AliITSReconstructor.cxx
+++ b/ITS/AliITSReconstructor.cxx
@@ -44,8 +44,6 @@
 
 
 ClassImp(AliITSReconstructor)
-AliITSRecoParam *AliITSReconstructor::fgRecoParamDefault = AliITSRecoParam::GetHighFluxParam();
-AliITSRecoParam *AliITSReconstructor::fgRecoParam =0;  // reconstruction parameters
 
 //___________________________________________________________________________
 AliITSReconstructor::AliITSReconstructor() : AliReconstructor(),
@@ -53,16 +51,11 @@ fItsPID(0),
 fDetTypeRec(0)
 {
   // Default constructor
-  if (!fgRecoParam) {
-    AliWarning("Using default reconstruction parameters");
-    fgRecoParam = fgRecoParamDefault;
-  }
 }
  //___________________________________________________________________________
 AliITSReconstructor::~AliITSReconstructor(){
 // destructor
   delete fItsPID;
-  if(!fgRecoParam && (fgRecoParam != fgRecoParamDefault)) delete fgRecoParam;
   if(fDetTypeRec) delete fDetTypeRec;
 } 
 //______________________________________________________________________
@@ -100,7 +93,7 @@ void AliITSReconstructor::Init() {
     fDetTypeRec = new AliITSDetTypeRec();
     fDetTypeRec->SetITSgeom(geom);
     fDetTypeRec->SetDefaults();
-    
+
     return;
 }
 
@@ -109,14 +102,14 @@ void AliITSReconstructor::Reconstruct(TTree *digitsTree, TTree *clustersTree) co
 {
 // reconstruct clusters
 
-  TString option = GetOption();
-  Bool_t clusfinder=kTRUE;   // Default: V2 cluster finder
-  if(option.Contains("OrigCF"))clusfinder=kFALSE;
+  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",clusfinder);    
+  fDetTypeRec->DigitsToRecPoints(digitsTree,clustersTree,0,"All",useV2);    
 }
 
 //_________________________________________________________________
@@ -133,27 +126,29 @@ AliTracker* AliITSReconstructor::CreateTracker() const
 {
 // create a ITS tracker
 
-  
-  TString selectedTracker = GetOption();
+  Int_t trackerOpt = GetRecoParam()->GetTracker();
   AliTracker* tracker;    
-  if (selectedTracker.Contains("MI")) {
+  if (trackerOpt==1) {
     tracker = new AliITStrackerMI(0);
+    AliITStrackerMI *mit=(AliITStrackerMI*)tracker;
+    mit->SetDetTypeRec(fDetTypeRec);
   }  
-  else if (selectedTracker.Contains("V2")) {
+  else if (trackerOpt==2) {
     tracker = new AliITStrackerV2(0);
   }
   else {
     tracker =  new AliITStrackerSA(0);  // inherits from AliITStrackerMI
     AliITStrackerSA *sat=(AliITStrackerSA*)tracker;
-    if(selectedTracker.Contains("onlyITS"))sat->SetSAFlag(kTRUE);
+    sat->SetDetTypeRec(fDetTypeRec);
+    if(GetRecoParam()->GetTrackerSAOnly()) sat->SetSAFlag(kTRUE);
     if(sat->GetSAFlag())AliDebug(1,"Tracking Performed in ITS only\n");
-    if(selectedTracker.Contains("cosmics")||selectedTracker.Contains("COSMICS"))
-      sat->SetOuterStartLayer(AliITSgeomTGeo::GetNLayers()-2);
+    sat->SetOuterStartLayer(GetRecoParam()->GetOuterStartLayerSA());
   }
 
-  TString selectedPIDmethod = GetOption();
+  Int_t pidOpt = GetRecoParam()->GetPID();
+
   AliITSReconstructor* nc = const_cast<AliITSReconstructor*>(this);
-  if(selectedPIDmethod.Contains("LandauFitPID")){
+  if(pidOpt==1){
     Info("FillESD","ITS LandauFitPID option has been selected\n");
     nc->fItsPID = new AliITSpidESD2((AliITStrackerMI*)tracker);
   }
@@ -172,27 +167,27 @@ AliVertexer* AliITSReconstructor::CreateVertexer() const
 {
 // create a ITS vertexer
 
-  TString selectedVertexer = GetOption();
-  if(selectedVertexer.Contains("ions") || selectedVertexer.Contains("IONS")){
+  Int_t vtxOpt = GetRecoParam()->GetVertexer();
+  if(vtxOpt==3){
     Info("CreateVertexer","a AliITSVertexerIons object has been selected\n");
-    return new AliITSVertexerIons("null");
+    return new AliITSVertexerIons();
   }
-  if(selectedVertexer.Contains("smear") || selectedVertexer.Contains("SMEAR")){
+  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);
   }
-  if(selectedVertexer.Contains("3d") || selectedVertexer.Contains("3D")){
-    Info("CreateVertexer","a AliITSVertexer3D object has been selected\n");
-    return new AliITSVertexer3D("null");
+  if(vtxOpt==1){
+    Info("CreateVertexer","a AliITSVertexerZ object has been selected\n");
+    return new AliITSVertexerZ();
   }
-  if(selectedVertexer.Contains("cosmics") || selectedVertexer.Contains("COSMICS")){
+  if(vtxOpt==2){
     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");
-  return new AliITSVertexerZ("null");
+  // by default an AliITSVertexer3D object is instatiated
+  Info("CreateVertexer","a AliITSVertexer3D object has been selected\n");
+  return new AliITSVertexer3D();
 }
 
 //_____________________________________________________________________________
@@ -201,11 +196,10 @@ void AliITSReconstructor::FillESD(TTree * /*digitsTree*/, TTree *clustersTree,
 {
 // make PID, find V0s and cascade
   if(fItsPID!=0) {
-    TString selectedPIDmethod = GetOption();
-    if(selectedPIDmethod.Contains("LandauFitPID")){
+    Int_t pidOpt = GetRecoParam()->GetPID();
+    if(pidOpt==1){
       fItsPID->MakePID(clustersTree,esd);
-    }
-    else{
+    }else{
       fItsPID->MakePID(esd);
     }
   }