]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG1/AliComparisonDCA.cxx
Update of the alignment-data fileting macro including a fix for the access to the...
[u/mrichter/AliRoot.git] / PWG1 / AliComparisonDCA.cxx
index ee0458fd3aa607628b92beeb341701e6d29afdbd..63c9e84e38470af955499e22d77f72c39943ebe7 100644 (file)
@@ -16,7 +16,8 @@
   gROOT->LoadMacro("$ALICE_ROOT/PWG1/Macros/LoadMyLibs.C");
   LoadMyLibs();
   TFile f("Output.root");
-  AliComparisonDCA * compObj = (AliComparisonDCA*)f.Get("AliComparisonDCA");
+  //AliComparisonDCA * compObj = (AliComparisonDCA*)f.Get("AliComparisonDCA");
+  AliComparisonDCA * compObj = (AliComparisonDCA*)cOutput->FindObject("AliComparisonDCA");
 
   // Analyse comparison data
   compObj->Analyse();
 
 */
 
-#include <iostream>
-
-#include "TFile.h"
-#include "TCint.h"
-#include "TH3F.h"
-#include "TH2F.h"
-#include "TF1.h"
-#include "TProfile.h"
-#include "TProfile2D.h"
-#include "TGraph2D.h"
-#include "TCanvas.h"
-#include "TGraph.h"
-// 
-#include "AliTracker.h"   
+#include <TAxis.h>
+#include <TCanvas.h>
+#include <TGraph.h>
+#include <TGraph2D.h>
+#include <TH1.h>
+
+#include "AliComparisonDCA.h" 
 #include "AliESDEvent.h"   
-#include "AliESD.h"
-#include "AliESDfriend.h"
-#include "AliESDfriendTrack.h"
-#include "AliRecInfoCuts.h" 
-#include "AliMCInfoCuts.h" 
-#include "AliLog.h" 
+#include "AliESDRecInfo.h" 
 #include "AliESDVertex.h" 
-//
-#include "AliMathBase.h"
-#include "AliTreeDraw.h" 
-
+#include "AliLog.h" 
 #include "AliMCInfo.h" 
-#include "AliESDRecInfo.h" 
-#include "AliComparisonDCA.h" 
+#include "AliMCInfoCuts.h" 
+#include "AliMathBase.h"
+#include "AliRecInfoCuts.h" 
+#include "AliTracker.h"   
 
 using namespace std;
 
@@ -68,17 +56,43 @@ ClassImp(AliComparisonDCA)
 
 //_____________________________________________________________________________
 AliComparisonDCA::AliComparisonDCA():
-//  TNamed("AliComparisonDCA","AliComparisonDCA"),
   AliComparisonObject("AliComparisonDCA"),
 
   // DCA histograms
-  fD0TanSPtB1(0),
-  fD1TanSPtB1(0),
-  fD0TanSPtL1(0),
-  fD1TanSPtL1(0),
-  fD0TanSPtInTPC(0),
-  fD1TanSPtInTPC(0),
-  fVertex(0),
+  fDCAHisto(0),
+  /*
+  fD0TanSPtTPCITS(0),
+  fD1TanSPtTPCITS(0),
+  fD0TanSPt(0),
+  fD1TanSPt(0),
+  fD0TanSPtTPC(0),
+  fD1TanSPtTPC(0),
+  */
+
+  // Cuts 
+  fCutsRC(0), 
+  fCutsMC(0),  
+
+  // histogram folder 
+  fAnalysisFolder(0)
+{
+  // default constructor       
+}
+
+//_____________________________________________________________________________
+AliComparisonDCA::AliComparisonDCA(Char_t* name="AliComparisonDCA", Char_t* title="AliComparisonDCA",Int_t analysisMode=0, Bool_t hptGenerator=kFALSE):
+  AliComparisonObject(name,title),
+
+  // DCA histograms
+  fDCAHisto(0),
+  /*
+  fD0TanSPtTPCITS(0),
+  fD1TanSPtTPCITS(0),
+  fD0TanSPt(0),
+  fD1TanSPt(0),
+  fD0TanSPtTPC(0),
+  fD1TanSPtTPC(0),
+  */
 
   // Cuts 
   fCutsRC(0), 
@@ -87,20 +101,27 @@ AliComparisonDCA::AliComparisonDCA():
   // histogram folder 
   fAnalysisFolder(0)
 {
+  // named constructor  
+
+  SetAnalysisMode(analysisMode);
+  SetHptGenerator(hptGenerator);
   Init();
 }
 
+
 //_____________________________________________________________________________
 AliComparisonDCA::~AliComparisonDCA()
 {
-  //
-  if(fD0TanSPtB1) delete fD0TanSPtB1; fD0TanSPtB1=0;
-  if(fD1TanSPtB1) delete fD1TanSPtB1; fD1TanSPtB1=0;
-  if(fD0TanSPtL1) delete fD0TanSPtL1; fD0TanSPtL1=0;
-  if(fD1TanSPtL1) delete fD1TanSPtL1; fD1TanSPtL1=0;
-  if(fD0TanSPtInTPC) delete fD0TanSPtInTPC; fD0TanSPtInTPC=0;
-  if(fD1TanSPtInTPC) delete fD1TanSPtInTPC; fD1TanSPtInTPC=0;
-  if(fVertex) delete fVertex; fVertex=0;
+  // destructor
+  if(fDCAHisto)  delete fDCAHisto; fDCAHisto=0; 
+  /*
+  if(fD0TanSPtTPCITS) delete fD0TanSPtTPCITS; fD0TanSPtTPCITS=0;
+  if(fD1TanSPtTPCITS) delete fD1TanSPtTPCITS; fD1TanSPtTPCITS=0;
+  if(fD0TanSPt) delete fD0TanSPt; fD0TanSPt=0;
+  if(fD1TanSPt) delete fD1TanSPt; fD1TanSPt=0;
+  if(fD0TanSPtTPC) delete fD0TanSPtTPC; fD0TanSPtTPC=0;
+  if(fD1TanSPtTPC) delete fD1TanSPtTPC; fD1TanSPtTPC=0;
+  */
   if(fAnalysisFolder) delete fAnalysisFolder; fAnalysisFolder=0;
 
 }
@@ -109,35 +130,61 @@ AliComparisonDCA::~AliComparisonDCA()
 void AliComparisonDCA::Init()
 {
   // DCA histograms
-  fD0TanSPtB1 = new TH3F("DCAyTanSPtB1","DCAyTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
-  fD0TanSPtB1->SetXTitle("tan(#theta)");
-  fD0TanSPtB1->SetYTitle("#sqrt{p_{t}(GeV/c)}");
-  fD0TanSPtB1->SetZTitle("DCA_{xy}");
-
-  fD1TanSPtB1 = new TH3F("DCAzTanSPtB1","DCAzTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
-  fD1TanSPtB1->SetXTitle("tan(#theta)");
-  fD1TanSPtB1->SetYTitle("#sqrt(p_{t}(GeV/c))");
-  fD1TanSPtB1->SetZTitle("DCA_{z}");
-
-  fD0TanSPtL1 = new TH3F("DCAyTanSPtL1","DCAyTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
-  fD0TanSPtL1->SetXTitle("tan(#theta)");
-  fD0TanSPtL1->SetYTitle("#sqrt{p_{t}(GeV/c)}");
-  fD0TanSPtL1->SetZTitle("DCA_{xy}");
-
-  fD1TanSPtL1 = new TH3F("DCAzTanSPtL1","DCAzTanSPt",40,-2,2, 10,0.3,3, 100, -1,1);
-  fD1TanSPtL1->SetXTitle("tan(#theta)");
-  fD1TanSPtL1->SetYTitle("#sqrt{p_{t}(GeV/c)}");
-  fD1TanSPtL1->SetZTitle("DCA_{z}");
-
-  fD0TanSPtInTPC = new TH3F("DCAyTanSPtInTPC","DCAyTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
-  fD0TanSPtInTPC->SetXTitle("tan(#theta)");
-  fD0TanSPtInTPC->SetYTitle("#sqrt{p_{t}(GeV/c)}");
-  fD0TanSPtInTPC->SetZTitle("DCA_{xy}");
-
-  fD1TanSPtInTPC = new TH3F("DCAzTanSPtInTPC","DCAzTanSPt",40,-2,2, 10,0.3,3, 100, -1,1);
-  fD1TanSPtInTPC->SetXTitle("tan(#theta)");
-  fD1TanSPtInTPC->SetYTitle("#sqrt{p_{t}(GeV/c)}");
-  fD1TanSPtInTPC->SetZTitle("DCA_{z}");
+
+ Int_t nPBins = 31;
+    Double_t binsP[32] = {0.,0.05,0.1,0.15,0.2,0.25,0.3,0.35,0.4,0.45,0.5,0.55,0.6,0.7,0.8,0.9,1.0,1.2,1.4,1.6,1.8,2.0,2.25,2.5,2.75,3.,3.5,4.,5.,6.,8.,10.};
+    Double_t pMin = 0., pMax = 10.;
+
+    if(IsHptGenerator() == kTRUE) {
+      nPBins = 100;
+      pMin = 0.; pMax = 100.;
+    }
+
+   //dca_r, dca_z, eta, pt
+   Int_t binsQA[4]    = {100,100,20,nPBins};
+   Double_t xminQA[4] = {-10.,-10.,-1., pMin};
+   Double_t xmaxQA[4] = {10.,10.,1., pMax};
+
+   fDCAHisto = new THnSparseF("fDCAHisto","dca_r:dca_z:eta:pt",4,binsQA,xminQA,xmaxQA);
+   if(!IsHptGenerator()) fDCAHisto->SetBinEdges(3,binsP);
+
+   fDCAHisto->GetAxis(0)->SetTitle("dca_r (cm)");
+   fDCAHisto->GetAxis(1)->SetTitle("dca_z (cm)");
+   fDCAHisto->GetAxis(2)->SetTitle("eta");
+   fDCAHisto->GetAxis(3)->SetTitle("pt (GeV/c)");
+   fDCAHisto->Sumw2();
+       
+  /*   
+  fD0TanSPtTPCITS = new TH3F("DCAyTanSPtTPCITS","DCAyTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
+  fD0TanSPtTPCITS->SetXTitle("tan(#theta)");
+  fD0TanSPtTPCITS->SetYTitle("#sqrt{p_{t}(GeV)}");
+  fD0TanSPtTPCITS->SetZTitle("DCA_{xy}");
+
+  fD1TanSPtTPCITS = new TH3F("DCAzTanSPtTPCITS","DCAzTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
+  fD1TanSPtTPCITS->SetXTitle("tan(#theta)");
+  fD1TanSPtTPCITS->SetYTitle("#sqrt(p_{t}(GeV))");
+  fD1TanSPtTPCITS->SetZTitle("DCA_{z}");
+
+  fD0TanSPt = new TH3F("DCAyTanSPt","DCAyTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
+  fD0TanSPt->SetXTitle("tan(#theta)");
+  fD0TanSPt->SetYTitle("#sqrt{p_{t}(GeV)}");
+  fD0TanSPt->SetZTitle("DCA_{xy}");
+
+  fD1TanSPt = new TH3F("DCAzTanSPt","DCAzTanSPt",40,-2,2, 10,0.3,3, 100, -1,1);
+  fD1TanSPt->SetXTitle("tan(#theta)");
+  fD1TanSPt->SetYTitle("#sqrt{p_{t}(GeV)}");
+  fD1TanSPt->SetZTitle("DCA_{z}");
+
+  fD0TanSPtTPC = new TH3F("DCAyTanSPtTPC","DCAyTanSPt",40,-2,2, 10,0.3,3, 100,-1,1);
+  fD0TanSPtTPC->SetXTitle("tan(#theta)");
+  fD0TanSPtTPC->SetYTitle("#sqrt{p_{t}(GeV)}");
+  fD0TanSPtTPC->SetZTitle("DCA_{xy}");
+
+  fD1TanSPtTPC = new TH3F("DCAzTanSPtTPC","DCAzTanSPt",40,-2,2, 10,0.3,3, 100, -1,1);
+  fD1TanSPtTPC->SetXTitle("tan(#theta)");
+  fD1TanSPtTPC->SetYTitle("#sqrt{p_{t}(GeV)}");
+  fD1TanSPtTPC->SetZTitle("DCA_{z}");
+  */
 
   // init cuts
   if(!fCutsMC) 
@@ -147,29 +194,21 @@ void AliComparisonDCA::Init()
  
   // init folder
   fAnalysisFolder = CreateFolder("folderDCA","Analysis DCA Folder");
-
-  // vertex (0,0,0)
-  fVertex = new AliESDVertex();
-  fVertex->SetXv(0.0);
-  fVertex->SetYv(0.0);
-  fVertex->SetZv(0.0);
 }
 
 //_____________________________________________________________________________
-void AliComparisonDCA::Process(AliMCInfo* infoMC, AliESDRecInfo *infoRC)
+void AliComparisonDCA::ProcessTPC(AliMCInfo* const infoMC, AliESDRecInfo * const infoRC)
 {
   // Fill DCA comparison information
   AliExternalTrackParam *track = 0;
   Double_t field      = AliTracker::GetBz(); // nominal Bz field [kG]
   Double_t kMaxD      = 123456.0; // max distance
 
-  Int_t clusterITS[200];
   Double_t dca[2], cov[3]; // dca_xy, dca_z, sigma_xy, sigma_xy_z, sigma_z
-  Float_t dca1[2], cov1[3]; // dca_xy, dca_z, sigma_xy, sigma_xy_z, sigma_z
 
   Float_t mcpt = infoMC->GetParticle().Pt();
-  Float_t tantheta = TMath::Tan(infoMC->GetParticle().Theta()-TMath::Pi()*0.5);
-  Float_t spt = TMath::Sqrt(mcpt);
+  Float_t mceta = infoMC->GetParticle().Eta();
+  //Float_t spt = TMath::Sqrt(mcpt);
 
   // distance to Prim. vertex 
   const Double_t* dv = infoMC->GetVDist(); 
@@ -182,42 +221,72 @@ void AliComparisonDCA::Process(AliMCInfo* infoMC, AliESDRecInfo *infoRC)
   if (infoRC->GetStatus(1)!=3) return;
   if (!infoRC->GetESDtrack()) return;  
   if (infoRC->GetESDtrack()->GetTPCNcls()<fCutsRC->GetMinNClustersTPC()) return;
-  if (!infoRC->GetESDtrack()->GetConstrainedParam()) return;
+  //if (!infoRC->GetESDtrack()->GetConstrainedParam()) return;
 
   // calculate and set prim. vertex
-  fVertex->SetXv( infoMC->GetParticle().Vx() - dv[0] );
-  fVertex->SetYv( infoMC->GetParticle().Vy() - dv[1] );
-  fVertex->SetZv( infoMC->GetParticle().Vz() - dv[2] );
+  AliESDVertex vertexMC;
+  vertexMC.SetXv( infoMC->GetParticle().Vx() - dv[0] );
+  vertexMC.SetYv( infoMC->GetParticle().Vy() - dv[1] );
+  vertexMC.SetZv( infoMC->GetParticle().Vz() - dv[2] );
 
   // calculate track parameters at vertex
   if (infoRC->GetESDtrack()->GetTPCInnerParam())
   {
     if ((track = new AliExternalTrackParam(*infoRC->GetESDtrack()->GetTPCInnerParam())) != 0 )
     {
-      Bool_t bDCAStatus = track->PropagateToDCA(fVertex,field,kMaxD,dca,cov);
+      Bool_t bDCAStatus = track->PropagateToDCA(&vertexMC,field,kMaxD,dca,cov);
 
       if(bDCAStatus) {
-        fD0TanSPtInTPC->Fill(tantheta,spt,dca[0]);
-        fD1TanSPtInTPC->Fill(tantheta,spt,dca[1]);
-         }
-
-         delete track;
+        Double_t vDCAHisto[4]={dca[0],dca[1],mceta,mcpt};
+        fDCAHisto->Fill(vDCAHisto);
+      }
+    delete track;
     }
   }
-  
- // ITS + TPC
- infoRC->GetESDtrack()->GetImpactParameters(dca1,cov1);
+}
+
+//_____________________________________________________________________________
+void AliComparisonDCA::ProcessTPCITS(AliMCInfo* const infoMC, AliESDRecInfo * const infoRC)
+{
+  // Fill DCA comparison information
+  Int_t clusterITS[200];
+  Float_t dca[2], cov[3]; // dca_xy, dca_z, sigma_xy, sigma_xy_z, sigma_z
+
+  Float_t mcpt = infoMC->GetParticle().Pt();
+  Float_t mceta = infoMC->GetParticle().Eta();
+  //Float_t spt = TMath::Sqrt(mcpt);
 
- if(infoRC->GetESDtrack()->GetITSclusters(clusterITS)==0){
-    fD0TanSPtB1->Fill(tantheta,spt,dca1[0]);
-    fD1TanSPtB1->Fill(tantheta,spt,dca1[1]);
+  // distance to Prim. vertex 
+  const Double_t* dv = infoMC->GetVDist(); 
+  Bool_t isPrim = TMath::Sqrt(dv[0]*dv[0] + dv[1]*dv[1])<fCutsMC->GetMaxR() && TMath::Abs(dv[2])<fCutsMC->GetMaxVz();
+
+  // Check selection cuts
+  if (fCutsMC->IsPdgParticle(TMath::Abs(infoMC->GetParticle().GetPdgCode())) == kFALSE) return; 
+  if (!isPrim) return;
+  if (infoRC->GetStatus(1)!=3) return;
+  if (!infoRC->GetESDtrack()) return;  
+  if (infoRC->GetESDtrack()->GetTPCNcls()<fCutsRC->GetMinNClustersTPC()) return;
+  //if (!infoRC->GetESDtrack()->GetConstrainedParam()) return;
+
+  infoRC->GetESDtrack()->GetImpactParameters(dca,cov);
+
+  // ITS + TPC
+  if(infoRC->GetESDtrack()->GetITSclusters(clusterITS)>fCutsRC->GetMinNClustersITS())
+  {
+    Double_t vDCAHisto[4]={dca[0],dca[1],mceta,mcpt};
+    fDCAHisto->Fill(vDCAHisto);
   }
-    fD0TanSPtL1->Fill(tantheta,spt,dca1[0]);
-    fD1TanSPtL1->Fill(tantheta,spt,dca1[1]);
+}
+
+void AliComparisonDCA::ProcessConstrained(AliMCInfo* const /*infoMC*/, AliESDRecInfo * const /*infoRC*/)
+{
+  // Fill DCA comparison information
+  
+  AliDebug(AliLog::kWarning, "Warning: Not implemented");
 }
 
 //_____________________________________________________________________________
-Long64_t AliComparisonDCA::Merge(TCollection* list) 
+Long64_t AliComparisonDCA::Merge(TCollection* const list) 
 {
   // Merge list of objects (needed by PROOF)
 
@@ -236,14 +305,16 @@ Long64_t AliComparisonDCA::Merge(TCollection* list)
   {
     AliComparisonDCA* entry = dynamic_cast<AliComparisonDCA*>(obj);
     if (entry == 0) continue; 
-    
 
-    fD0TanSPtB1->Add(entry->fD0TanSPtB1);
-    fD1TanSPtB1->Add(entry->fD1TanSPtB1);
-    fD0TanSPtL1->Add(entry->fD0TanSPtL1);
-    fD1TanSPtL1->Add(entry->fD1TanSPtL1);
-    fD0TanSPtInTPC->Add(entry->fD0TanSPtInTPC);
-    fD1TanSPtInTPC->Add(entry->fD1TanSPtInTPC);
+    fDCAHisto->Add(entry->fDCAHisto);
+    /*
+    fD0TanSPtTPCITS->Add(entry->fD0TanSPtTPCITS);
+    fD1TanSPtTPCITS->Add(entry->fD1TanSPtTPCITS);
+    fD0TanSPt->Add(entry->fD0TanSPt);
+    fD1TanSPt->Add(entry->fD1TanSPt);
+    fD0TanSPtTPC->Add(entry->fD0TanSPtTPC);
+    fD1TanSPtTPC->Add(entry->fD1TanSPtTPC);
+    */
 
     count++;
   }
@@ -252,9 +323,16 @@ return count;
 }
 
 //_____________________________________________________________________________
-void AliComparisonDCA::Exec(AliMCInfo* infoMC, AliESDRecInfo *infoRC){
+void AliComparisonDCA::Exec(AliMCInfo* const infoMC, AliESDRecInfo * const infoRC)
+{
   // Process comparison information
-  Process(infoMC,infoRC);
+  if(GetAnalysisMode() == 0) ProcessTPC(infoMC,infoRC);
+  else if(GetAnalysisMode() == 1) ProcessTPCITS(infoMC,infoRC);
+  else if(GetAnalysisMode() == 2) ProcessConstrained(infoMC,infoRC);
+  else {
+    printf("ERROR: AnalysisMode %d \n",fAnalysisMode);
+    return;
+  }
 }
 
 //_____________________________________________________________________________
@@ -266,11 +344,12 @@ void AliComparisonDCA::Analyse()
   //
   
   TH1::AddDirectory(kFALSE);
+  TObjArray *aFolderObj = new TObjArray;
 
-  TGraph * gr[4]= { 0,0,0,0 };
-  TGraph2D *gr2[4]= { 0,0,0,0};
+  /*
+  TGraph * gr[8]= { 0,0,0,0,0,0,0,0 };
+  TGraph2D *gr2[8]= { 0,0,0,0,0,0,0,0};
   AliComparisonDCA * comp=this;
-  TObjArray *aFolderObj = new TObjArray;
 
   // write results in the folder 
   // Canvas to draw analysed histograms
@@ -280,90 +359,192 @@ void AliComparisonDCA::Analyse()
   // DCA resolution
   //
   c->cd(1);
-  gr[0] = AliMathBase::MakeStat1D(comp->fD0TanSPtB1,2,5);
+  gr[0] = AliMathBase::MakeStat1D(comp->fD0TanSPtTPC,2,5);
   gr[0]->GetXaxis()->SetTitle("Tan(#theta)");
   gr[0]->GetYaxis()->SetTitle("#sigmaDCA_xy (cm)");
-  gr[0]->SetName("DCAXYResolTan");
+  gr[0]->SetName("DCAXYResolTanTPC");
+  gr[0]->SetTitle("resol. DCA_xy (TPC only)");
   gr[0]->Draw("Al*");
 
   aFolderObj->Add(gr[0]);
 
   c->cd(2);
-  gr[1] = AliMathBase::MakeStat1D(comp->fD1TanSPtB1,2,5);
+  gr[1] = AliMathBase::MakeStat1D(comp->fD1TanSPtTPC,2,5);
   gr[1]->GetXaxis()->SetTitle("Tan(#theta)");
   gr[1]->GetYaxis()->SetTitle("#sigmaDCA_z (cm)");
-  gr[1]->SetName("DCAZResolTan");
+  gr[1]->SetName("DCAZResolTanTPC");
+  gr[1]->SetTitle("resol. DCA_z (TPC only)");
   gr[1]->Draw("Al*");
 
   aFolderObj->Add(gr[1]);
 
-  //
-  // DCA mean value
-  //
   c->cd(3);
-  gr[2] = AliMathBase::MakeStat1D(comp->fD0TanSPtB1,2,4);
+  gr[2] = AliMathBase::MakeStat1D(comp->fD0TanSPtTPCITS,2,5);
   gr[2]->GetXaxis()->SetTitle("Tan(#theta)");
-  gr[2]->GetYaxis()->SetTitle("mean DCA_xy (cm)");
-  gr[2]->SetName("DCAXYMeanTan");
+  gr[2]->GetYaxis()->SetTitle("#sigmaDCA_xy (cm)");
+  gr[2]->SetName("DCAXYResolTanTPCITS");
+  gr[2]->SetTitle("resol. DCA_xy (TPC+ITS)");
   gr[2]->Draw("Al*");
 
   aFolderObj->Add(gr[2]);
 
   c->cd(4);
-  gr[3] = AliMathBase::MakeStat1D(comp->fD1TanSPtB1,2,4);
+  gr[3] = AliMathBase::MakeStat1D(comp->fD1TanSPtTPCITS,2,5);
   gr[3]->GetXaxis()->SetTitle("Tan(#theta)");
-  gr[3]->GetYaxis()->SetTitle("mean DCA_z (cm)");
-  gr[3]->SetName("DCAZMeanTan");
+  gr[3]->GetYaxis()->SetTitle("#sigmaDCA_z (cm)");
+  gr[3]->SetName("DCAZResolTanTPCITS");
+  gr[3]->SetTitle("resol. DCA_z (TPC+ITS)");
   gr[3]->Draw("Al*");
 
   aFolderObj->Add(gr[3]);
 
-  // 2D DCA resolution 
+  //
+  // DCA mean value
+  //
   c->cd(5);
-  gr2[0] = AliMathBase::MakeStat2D(comp->fD0TanSPtB1,4,2,5); 
+  gr[4] = AliMathBase::MakeStat1D(comp->fD0TanSPtTPC,2,4);
+  gr[4]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr[4]->GetYaxis()->SetTitle("mean DCA_xy (cm)");
+  gr[4]->SetName("DCAXYMeanTanTPC");
+  gr[4]->SetTitle("mean DCA_xy (TPC only)");
+  gr[4]->Draw("Al*");
+
+  aFolderObj->Add(gr[4]);
+
+  c->cd(6);
+  gr[5] = AliMathBase::MakeStat1D(comp->fD1TanSPtTPC,2,4);
+  gr[5]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr[5]->GetYaxis()->SetTitle("mean DCA_z (cm)");
+  gr[5]->SetName("DCAZMeanTanTPC");
+  gr[5]->SetTitle("mean DCA_z (TPC only)");
+  gr[5]->Draw("Al*");
+
+  aFolderObj->Add(gr[5]);
+
+  c->cd(7);
+  gr[6] = AliMathBase::MakeStat1D(comp->fD0TanSPtTPCITS,2,4);
+  gr[6]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr[6]->GetYaxis()->SetTitle("mean DCA_xy (cm)");
+  gr[6]->SetName("DCAXYMeanTanTPCITS");
+  gr[6]->SetTitle("mean DCA_xy (TPC+ITS)");
+  gr[6]->Draw("Al*");
+
+  aFolderObj->Add(gr[6]);
+
+  c->cd(8);
+  gr[7] = AliMathBase::MakeStat1D(comp->fD1TanSPtTPCITS,2,4);
+  gr[7]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr[7]->GetYaxis()->SetTitle("mean DCA_z (cm)");
+  gr[7]->SetName("DCAZMeanTanTPCITS");
+  gr[7]->SetTitle("mean DCA_z (TPC+ITS)");
+  gr[7]->Draw("Al*");
+
+  aFolderObj->Add(gr[7]);
+
+  // 2D DCA resolution 
+  TCanvas * c1 = new TCanvas("canDCA1","2D DCA resolution");
+  c1->Divide(2,4);
+
+  // TPC only
+  c1->cd(1);
+  gr2[0] = AliMathBase::MakeStat2D(comp->fD0TanSPtTPC,4,2,5); 
   gr2[0]->GetXaxis()->SetTitle("Tan(#theta)");
-  gr2[0]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV/c)}");
+  gr2[0]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
   gr2[0]->GetZaxis()->SetTitle("#sigmaDCA_xy (cm)");
-  gr2[0]->SetName("DCAXYResolSPTTan");
+  gr2[0]->SetName("DCAXYResolSPTTanTPC");
+  gr2[0]->SetTitle("#sigma DCA_xy (TPC only)");
   gr2[0]->GetHistogram()->Draw("colz");
 
-  gr2[0]->GetHistogram()->SetName("DCAXYResolSPTTan");
+  gr2[0]->GetHistogram()->SetName("DCAXYResolSPTTanTPC");
   aFolderObj->Add(gr2[0]->GetHistogram());
 
-  c->cd(6);
-  gr2[1] = AliMathBase::MakeStat2D(comp->fD1TanSPtB1,4,2,5); 
+  c1->cd(2);
+  gr2[1] = AliMathBase::MakeStat2D(comp->fD1TanSPtTPC,4,2,5); 
   gr2[1]->GetXaxis()->SetTitle("Tan(#theta)");
-  gr2[1]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV/c)}");
+  gr2[1]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
   gr2[1]->GetZaxis()->SetTitle("#sigmaDCA_z (cm)");
-  gr2[1]->SetName("DCAZResolSPTTan");
+  gr2[1]->SetName("DCAZResolSPTTanTPC");
+  gr2[1]->SetTitle("#sigma DCA_z (TPC only)");
   gr2[1]->GetHistogram()->Draw("colz");
 
-  gr2[1]->GetHistogram()->SetName("DCAZResolSPTTan");
+  gr2[1]->GetHistogram()->SetName("DCAZResolSPTTanTPC");
   aFolderObj->Add(gr2[1]->GetHistogram());
 
-  // 2D DCA mean value  
-  c->cd(7);
-  gr2[2] = AliMathBase::MakeStat2D(comp->fD0TanSPtB1,4,2,4); 
+  // TPC+ITS
+  c1->cd(3);
+  gr2[2] = AliMathBase::MakeStat2D(comp->fD0TanSPtTPCITS,4,2,5); 
   gr2[2]->GetXaxis()->SetTitle("Tan(#theta)");
-  gr2[2]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV/c)}");
-  gr2[2]->GetZaxis()->SetTitle("mean DCA_xy (cm)");
-  gr2[2]->SetName("DCAXYMeanSPTTan");
+  gr2[2]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
+  gr2[2]->GetZaxis()->SetTitle("#sigmaDCA_xy (cm)");
+  gr2[2]->SetName("DCAXYResolSPTTanTPCITS");
+  gr2[2]->SetTitle("#sigma DCA_xy (TPC+ITS)");
   gr2[2]->GetHistogram()->Draw("colz");
 
-  gr2[2]->GetHistogram()->SetName("DCAXYMeanSPTTan");
+  gr2[2]->GetHistogram()->SetName("DCAXYResolSPTTanTPCITS");
   aFolderObj->Add(gr2[2]->GetHistogram());
 
-  c->cd(8);
-  gr2[3] = AliMathBase::MakeStat2D(comp->fD1TanSPtB1,4,2,4); 
+  c1->cd(4);
+  gr2[3] = AliMathBase::MakeStat2D(comp->fD1TanSPtTPCITS,4,2,5); 
   gr2[3]->GetXaxis()->SetTitle("Tan(#theta)");
-  gr2[3]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV/c)}");
-  gr2[3]->GetZaxis()->SetTitle("mean DCA_z (cm)");
-  gr2[3]->SetName("DCAZMeanSPTTan");
+  gr2[3]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
+  gr2[3]->GetZaxis()->SetTitle("#sigmaDCA_z (cm)");
+  gr2[3]->SetName("DCAZResolSPTTanTPCITS");
+  gr2[3]->SetTitle("#sigma DCA_z (TPC+ITS)");
   gr2[3]->GetHistogram()->Draw("colz");
 
-  gr2[3]->GetHistogram()->SetName("DCAZMeanSPTTan");
+  gr2[3]->GetHistogram()->SetName("DCAZResolSPTTanTPCITS");
   aFolderObj->Add(gr2[3]->GetHistogram());
 
+  // 2D DCA mean value  
+  c1->cd(5);
+  gr2[4] = AliMathBase::MakeStat2D(comp->fD0TanSPtTPC,4,2,4); 
+  gr2[4]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr2[4]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
+  gr2[4]->GetZaxis()->SetTitle("mean DCA_xy (cm)");
+  gr2[4]->SetName("DCAXYMeanSPTTanTPC");
+  gr2[4]->SetTitle("mean DCA_xy (TPC only)");
+  gr2[4]->GetHistogram()->Draw("colz");
+
+  gr2[4]->GetHistogram()->SetName("DCAXYMeanSPTTanTPC");
+  aFolderObj->Add(gr2[4]->GetHistogram());
+
+  c1->cd(6);
+  gr2[5] = AliMathBase::MakeStat2D(comp->fD1TanSPtTPC,4,2,4); 
+  gr2[5]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr2[5]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
+  gr2[5]->GetZaxis()->SetTitle("mean DCA_z (cm)");
+  gr2[5]->SetName("DCAZMeanSPTTanTPC");
+  gr2[5]->SetTitle("mean DCA_z (TPC only)");
+  gr2[5]->GetHistogram()->Draw("colz");
+
+  gr2[5]->GetHistogram()->SetName("DCAZMeanSPTTanTPC");
+  aFolderObj->Add(gr2[5]->GetHistogram());
+
+  c1->cd(7);
+  gr2[6] = AliMathBase::MakeStat2D(comp->fD0TanSPtTPCITS,4,2,4); 
+  gr2[6]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr2[6]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
+  gr2[6]->GetZaxis()->SetTitle("mean DCA_xy (cm)");
+  gr2[6]->SetName("DCAXYMeanSPTTanTPCITS");
+  gr2[6]->SetTitle("mean DCA_xy (TPC+ITS)");
+  gr2[6]->GetHistogram()->Draw("colz");
+
+  gr2[6]->GetHistogram()->SetName("DCAXYMeanSPTTanTPCITS");
+  aFolderObj->Add(gr2[6]->GetHistogram());
+
+  c1->cd(8);
+  gr2[7] = AliMathBase::MakeStat2D(comp->fD1TanSPtTPCITS,4,2,4); 
+  gr2[7]->GetXaxis()->SetTitle("Tan(#theta)");
+  gr2[7]->GetYaxis()->SetTitle("#sqrt{p_{t}(GeV)}");
+  gr2[7]->GetZaxis()->SetTitle("mean DCA_z (cm)");
+  gr2[7]->SetName("DCAZMeanSPTTanTPCITS");
+  gr2[7]->SetTitle("mean DCA_z (TPC+ITS)");
+  gr2[7]->GetHistogram()->Draw("colz");
+
+  gr2[7]->GetHistogram()->SetName("DCAZMeanSPTTanTPCITS");
+  aFolderObj->Add(gr2[7]->GetHistogram());
+
+  */
   // export objects to analysis folder
   fAnalysisFolder = ExportToFolder(aFolderObj);