X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSReconstructor.cxx;h=a442abb83b0846099c52287ca83a066bf0d0e734;hb=f2e6e664629c4d6cb101bea4969a5754571ef7fc;hp=cf2343c17aba63b16a841b826d5e32e7681c0e67;hpb=131adda9db48a2c3932dcd9adea19610d4d88b4e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSReconstructor.cxx b/ITS/AliITSReconstructor.cxx
index cf2343c17ab..a442abb83b0 100644
--- a/ITS/AliITSReconstructor.cxx
+++ b/ITS/AliITSReconstructor.cxx
@@ -24,29 +24,33 @@
 #include "Riostream.h"
 #include "AliITSReconstructor.h"
 #include "AliRun.h"
-#include "AliRunLoader.h"
 #include "AliRawReader.h"
 #include "AliITSDetTypeRec.h"
+#include "AliITSgeom.h"
 #include "AliITSLoader.h"
 #include "AliITStrackerMI.h"
 #include "AliITStrackerV2.h"
 #include "AliITStrackerSA.h"
 #include "AliITSVertexerIons.h"
 #include "AliITSVertexerFast.h"
+#include "AliITSVertexerFixed.h"
 #include "AliITSVertexer3D.h"
 #include "AliITSVertexerZ.h"
 #include "AliITSVertexerCosmics.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliITSpidESD.h"
 #include "AliITSpidESD1.h"
 #include "AliITSpidESD2.h"
 #include "AliITSInitGeometry.h"
+#include "AliITSTrackleterSPDEff.h"
+
 
 ClassImp(AliITSReconstructor)
 
 //___________________________________________________________________________
 AliITSReconstructor::AliITSReconstructor() : AliReconstructor(),
-fItsPID(0)
+fItsPID(0),
+fDetTypeRec(0)
 {
   // Default constructor
 }
@@ -54,29 +58,15 @@ fItsPID(0)
 AliITSReconstructor::~AliITSReconstructor(){
 // destructor
   delete fItsPID;
+  if(fDetTypeRec) delete fDetTypeRec;
 } 
-//______________________________________________________________________
-AliITSReconstructor::AliITSReconstructor(const AliITSReconstructor &ob) :AliReconstructor(ob),
-fItsPID(ob.fItsPID) 
-{
-  // Copy constructor
-}
 
 //______________________________________________________________________
-AliITSReconstructor& AliITSReconstructor::operator=(const AliITSReconstructor&  ob ){
-  // Assignment operator
-  this->~AliITSReconstructor();
-  new(this) AliITSReconstructor(ob);
-  return *this;
-}
-//______________________________________________________________________
-void AliITSReconstructor::Init(AliRunLoader *runLoader) const{
+void AliITSReconstructor::Init() {
     // Initalize this constructor bet getting/creating the objects
     // nesseary for a proper ITS reconstruction.
     // Inputs:
-    //    AliRunLoader *runLoader   Pointer to the run loader to allow
-    //                              the getting of files/folders data
-    //                              needed to do reconstruction
+    //   none.
     // Output:
     //   none.
     // Return:
@@ -85,187 +75,167 @@ void AliITSReconstructor::Init(AliRunLoader *runLoader) const{
     AliITSInitGeometry initgeom;
     AliITSgeom *geom = initgeom.CreateAliITSgeom();
     AliInfo(Form("Geometry name: %s",(initgeom.GetGeometryName()).Data()));
-    AliITSLoader* loader = static_cast<AliITSLoader*>
-	(runLoader->GetLoader("ITSLoader"));
-    if (!loader) {
-	Error("Init", "ITS loader not found");
-	return;
-    }
-    loader->SetITSgeom(geom);
+
+    fDetTypeRec = new AliITSDetTypeRec();
+    fDetTypeRec->SetITSgeom(geom);
+    fDetTypeRec->SetDefaults();
+
     return;
 }
+
 //_____________________________________________________________________________
-void AliITSReconstructor::Reconstruct(AliRunLoader* runLoader) const
+void AliITSReconstructor::Reconstruct(TTree *digitsTree, TTree *clustersTree) const
 {
 // reconstruct clusters
 
+  Int_t cluFindOpt = GetRecoParam()->GetClusterFinder();
 
-  AliITSLoader* loader = static_cast<AliITSLoader*>(runLoader->GetLoader("ITSLoader"));
-  if (!loader) {
-    Error("Reconstruct", "ITS loader not found");
-    return;
-  }
-  AliITSDetTypeRec* rec = new AliITSDetTypeRec(loader);
-  rec->SetDefaults();
-
-  loader->LoadRecPoints("recreate");
-  loader->LoadDigits("read");
-  runLoader->LoadKinematics();
-  TString option = GetOption();
-  Bool_t clusfinder=kTRUE;   // Default: V2 cluster finder
-  if(option.Contains("OrigCF"))clusfinder=kFALSE;
-
-  Int_t nEvents = runLoader->GetNumberOfEvents();
-
-  for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
-    runLoader->GetEvent(iEvent);
-    if(loader->TreeR()==0x0) loader->MakeTree("R");
-    rec->MakeBranch("R");
-    rec->SetTreeAddress();
-    rec->DigitsToRecPoints(iEvent,0,"All",clusfinder);    
-  }
-
-  loader->UnloadRecPoints();
-  loader->UnloadDigits();
-  runLoader->UnloadKinematics();
+  fDetTypeRec->SetTreeAddressD(digitsTree);
+  fDetTypeRec->MakeBranch(clustersTree,"R");
+  fDetTypeRec->SetTreeAddressR(clustersTree);
+  fDetTypeRec->DigitsToRecPoints(digitsTree,clustersTree,0,"All",cluFindOpt);    
 }
 
 //_________________________________________________________________
-void AliITSReconstructor::Reconstruct(AliRunLoader* runLoader, 
-                                      AliRawReader* rawReader) const
+void AliITSReconstructor::Reconstruct(AliRawReader* rawReader, TTree *clustersTree) const
 {
-// reconstruct clusters
-
+  // reconstruct clusters from raw data
  
-  AliITSLoader* loader = static_cast<AliITSLoader*>(runLoader->GetLoader("ITSLoader"));
-  if (!loader) {
-    Error("Reconstruct", "ITS loader not found");
-    return;
-  }
-
-  AliITSDetTypeRec* rec = new AliITSDetTypeRec(loader);
-  rec->SetDefaults();
-  rec->SetDefaultClusterFindersV2(kTRUE);
-
-  loader->LoadRecPoints("recreate");
-
-  Int_t iEvent = 0;
-
-  while(rawReader->NextEvent()) {
-    runLoader->GetEvent(iEvent++);
-    if(loader->TreeR()==0x0) loader->MakeTree("R");
-    rec->DigitsToRecPoints(rawReader);
-  }
-
-  loader->UnloadRecPoints();
+  fDetTypeRec->SetDefaultClusterFindersV2(kTRUE);
+  fDetTypeRec->DigitsToRecPoints(rawReader,clustersTree);
+}
+//_____________________________________________________________________________
+AliTracker* AliITSReconstructor::CreateTrackleter() const
+{
+// create the SPD trackeleter (for SPD PlaneEfficiency evaluation)
+  if(!GetRecoParam()->GetComputePlaneEff() || !GetRecoParam()->GetUseTrackletsPlaneEff()) return NULL;
+  //Int_t trackerOpt = GetRecoParam()->GetTracker();
+  AliTracker* trackleter;
+  trackleter = new AliITSTrackleterSPDEff();
+  AliITSTrackleterSPDEff *spdtrackleter=(AliITSTrackleterSPDEff*)trackleter;
+  // here set cuts (from RecoParam)
+  if(GetRecoParam()->GetBkgTrackletsPlaneEff()) spdtrackleter->SetReflectClusterAroundZAxisForLayer(1,kTRUE);
+  if(GetRecoParam()->GetMCTrackletsPlaneEff()) spdtrackleter->SetMC();
+  spdtrackleter->SetHistOn();
+  spdtrackleter->SetPhiWindowL2(GetRecoParam()->GetTrackleterPhiWindowL2());
+  spdtrackleter->SetZetaWindowL2(GetRecoParam()->GetTrackleterZetaWindowL2());
+  spdtrackleter->SetPhiWindowL1(GetRecoParam()->GetTrackleterPhiWindowL1());
+  spdtrackleter->SetZetaWindowL1(GetRecoParam()->GetTrackleterZetaWindowL1());
+  if(GetRecoParam()->GetUpdateOncePerEventPlaneEff()) spdtrackleter->SetUpdateOncePerEventPlaneEff();
+  spdtrackleter->SetMinContVtx(GetRecoParam()->GetMinContVtxPlaneEff());
+  return trackleter;
 }
 
 //_____________________________________________________________________________
-AliTracker* AliITSReconstructor::CreateTracker(AliRunLoader* runLoader)const
+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(GetRecoParam()->GetInwardFindingSA()){
+       sat->SetInwardFinding();
+       sat->SetInnerStartLayer(GetRecoParam()->GetInnerStartLayerSA());
+	}else{
+      sat->SetOutwardFinding();
+      sat->SetOuterStartLayer(GetRecoParam()->GetOuterStartLayerSA());
+	}
+    sat->SetMinNPoints(GetRecoParam()->GetMinNPointsSA());
   }
 
-  TString selectedPIDmethod = GetOption();
-  AliITSLoader *loader = (AliITSLoader*)runLoader->GetLoader("ITSLoader");
-  if (!loader) {
-    Error("CreateTracker", "ITS loader not found");
-  }
-  if(selectedPIDmethod.Contains("LandauFitPID")){
-    loader->AdoptITSpid(new AliITSpidESD2((AliITStrackerMI*)tracker,loader));
+  Int_t pidOpt = GetRecoParam()->GetPID();
+
+  AliITSReconstructor* nc = const_cast<AliITSReconstructor*>(this);
+  if(pidOpt==1){
+    Info("FillESD","ITS LandauFitPID option has been selected\n");
+    nc->fItsPID = new AliITSpidESD2();
   }
   else{
-    Double_t parITS[] = {76., 0.15, 10.}; //PH positions of the MIP peak
-    loader->AdoptITSpid(new AliITSpidESD1(parITS));
+    Info("FillESD","ITS default PID\n");
+    Double_t parITS[] = {79.,0.13, 5.}; //IB: this is  "pp tuning"
+    nc->fItsPID = new AliITSpidESD1(parITS);
   }
+ 
   return tracker;
   
 }
 
 //_____________________________________________________________________________
-AliVertexer* AliITSReconstructor::CreateVertexer(AliRunLoader* /*runLoader*/) const
+AliVertexer* AliITSReconstructor::CreateVertexer() const
 {
 // create a ITS vertexer
 
-  TString selectedVertexer = GetOption();
-  if(selectedVertexer.Contains("ions") || selectedVertexer.Contains("IONS")){
-    Info("CreateVertexer","a AliITSVertexerIons object has been selected\n");
-    return new AliITSVertexerIons("null");
+  AliITSVertexer *vptr;
+  Int_t vtxOpt = GetRecoParam()->GetVertexer();
+  if(vtxOpt==3){
+    AliInfo("AliITSVertexerIons has been selected");
+    vptr =  new AliITSVertexerIons();
   }
-  if(selectedVertexer.Contains("smear") || selectedVertexer.Contains("SMEAR")){
-    Double_t smear[3]={0.005,0.005,0.01};
-    Info("CreateVertexer","a AliITSVertexerFast object has been selected\n"); 
-    return new AliITSVertexerFast(smear);
+  else if(vtxOpt==4){
+    Double_t smear[3]={GetRecoParam()->GetVertexerFastSmearX(),
+		       GetRecoParam()->GetVertexerFastSmearY(),
+		       GetRecoParam()->GetVertexerFastSmearZ()};
+    AliInfo("AliITSVertexerFast has been selected"); 
+    vptr = new AliITSVertexerFast(smear);
   }
-  if(selectedVertexer.Contains("3d") || selectedVertexer.Contains("3D")){
-    Info("CreateVertexer","a AliITSVertexer3D object has been selected\n");
-    return new AliITSVertexer3D("null");
+  else if(vtxOpt==1){
+    AliInfo("AliITSVertexerZ has been selected");
+    vptr =  new AliITSVertexerZ();
   }
-  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");
-  return new AliITSVertexerZ("null");
-}
-
-//_____________________________________________________________________________
-void AliITSReconstructor::FillESD(AliRunLoader* runLoader, 
-				  AliESD* esd) const
-{
-// make PID, find V0s and cascade
-  AliITSLoader *loader = (AliITSLoader*)runLoader->GetLoader("ITSLoader");
-  AliITSpidESD *pidESD = 0;
-  TString selectedPIDmethod = GetOption();
-  if(selectedPIDmethod.Contains("LandauFitPID")){
-    Info("FillESD","ITS LandauFitPID option has been selected\n");
-    pidESD=loader->GetITSpid();
+  else if(vtxOpt==2){
+    AliInfo("AliITSVertexerCosmics has been selected");
+    vptr = new AliITSVertexerCosmics();
   }
-  else{
-    Info("FillESD","ITS default PID\n");
-    pidESD=loader->GetITSpid();
+  else if(vtxOpt==5){ 
+    AliInfo("Vertex is fixed in the position of the TDI\n");
+    vptr = new AliITSVertexerFixed("TDI");
   }
-  if(pidESD!=0){
-    pidESD->MakePID(esd);
+  else if(vtxOpt==6){ 
+    AliInfo("Vertex is fixed in the position of the TED\n");
+    vptr = new AliITSVertexerFixed("TED");
   }
   else {
-    Error("FillESD","!! cannot do the PID !!\n");
-  }
+  // by default an AliITSVertexer3D object is instatiated
+    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);
+    Int_t pileupAlgo=GetRecoParam()->GetSPDVertexerPileupAlgo();
+    vtxr->SetPileupAlgo(pileupAlgo);
+    AliInfo(Form("AliITSVertexer3D with pileup algo %d has been selected",pileupAlgo));
+    vptr = vtxr;
+  }
+  vptr->SetDetTypeRec(fDetTypeRec);
+  return vptr;
 }
 
-
 //_____________________________________________________________________________
-AliITSgeom* AliITSReconstructor::GetITSgeom(AliRunLoader* runLoader) const
+void AliITSReconstructor::FillESD(TTree * /*digitsTree*/, TTree * /*clustersTree*/, 
+				  AliESDEvent* esd) const
 {
-// get the ITS geometry
-
-  if (!runLoader->GetAliRun()) runLoader->LoadgAlice();
-  if (!runLoader->GetAliRun()) {
-    Error("GetITSgeom", "couldn't get AliRun object");
-    return NULL;
-  }
-  AliITSLoader *loader = (AliITSLoader*)runLoader->GetLoader("ITSLoader");
-  AliITSgeom* geom = (AliITSgeom*)loader->GetITSgeom();
-  if(!geom){
-    Error("GetITSgeom","no ITS geometry available");
-    return NULL;
-  }
-  
-  return geom;
+// make PID, find V0s and cascade
+  if(fItsPID!=0) fItsPID->MakePID(esd);
+  else AliError("!! cannot do the PID !!");
 }