]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PWG0/dNdPt/AlidNdPtCutAnalysis.cxx
small changes
[u/mrichter/AliRoot.git] / PWG0 / dNdPt / AlidNdPtCutAnalysis.cxx
index c74923839a9b50ab7b35cc26ee32ee71c79645b0..ff144c1c4882193bcf114d642563d216cb2e9132 100644 (file)
  * about the suitability of this software for any purpose. It is          *\r
  * provided "as is" without express or implied warranty.                  *\r
  **************************************************************************/\r
-\r
-#include <iostream>\r
-\r
-#include "TFile.h"\r
-#include "TCint.h"\r
+//------------------------------------------------------------------------------\r
+// AlidNdPtCutAnalysis class. \r
+//\r
+// a. functionality:\r
+// - fills generic cut histograms\r
+// - generates cuts (selection criteria)\r
+//\r
+// b. data members:\r
+// - generic cut histograms\r
+// - control histograms\r
+//\r
+// Author: J.Otwinowski 04/11/2008 \r
+//------------------------------------------------------------------------------\r
 #include "TH1.h"\r
 #include "TH2.h"\r
 \r
 #include "AliMCEvent.h"  \r
 #include "AliESDtrackCuts.h"  \r
 #include "AliLog.h" \r
+#include "AliTracker.h" \r
 \r
 #include "AlidNdPtEventCuts.h"\r
 #include "AlidNdPtAcceptanceCuts.h"\r
+#include "AlidNdPtBackgroundCuts.h"\r
+#include "AlidNdPtAnalysis.h"\r
+#include "AliPhysicsSelection.h"\r
 \r
 #include "AliPWG0Helper.h"\r
 #include "AlidNdPtHelper.h"\r
@@ -42,6 +54,7 @@ ClassImp(AlidNdPtCutAnalysis)
 //_____________________________________________________________________________\r
   AlidNdPtCutAnalysis::AlidNdPtCutAnalysis(): AlidNdPt(),\r
   fAnalysisFolder(0),\r
+  fEventCount(0),\r
   fRecEventHist(0),\r
   fMCEventHist(0),\r
   fRecMCEventHist(0),\r
@@ -54,6 +67,7 @@ ClassImp(AlidNdPtCutAnalysis)
 //_____________________________________________________________________________\r
 AlidNdPtCutAnalysis::AlidNdPtCutAnalysis(Char_t* name, Char_t* title): AlidNdPt(name,title),\r
   fAnalysisFolder(0),\r
+  fEventCount(0),\r
   fRecEventHist(0),\r
   fMCEventHist(0),\r
   fRecMCEventHist(0),\r
@@ -66,6 +80,7 @@ AlidNdPtCutAnalysis::AlidNdPtCutAnalysis(Char_t* name, Char_t* title): AlidNdPt(
 //_____________________________________________________________________________\r
 AlidNdPtCutAnalysis::~AlidNdPtCutAnalysis() {\r
   // \r
+  if(fEventCount) delete fEventCount; fEventCount=0;\r
   if(fRecEventHist) delete fRecEventHist; fRecEventHist=0;\r
   if(fMCEventHist) delete fMCEventHist; fMCEventHist=0;\r
   if(fRecMCEventHist) delete fRecMCEventHist; fRecMCEventHist=0;\r
@@ -85,10 +100,21 @@ void AlidNdPtCutAnalysis::Init(){
 \r
   Double_t binsPt[ptNbins+1] = {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.65,0.7,0.75,0.8,0.85,0.9,0.95,1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2.0,2.2,2.4,2.6,2.8,3.0,3.2,3.4,3.6,3.8,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,8.0,9.0,10.0,11.0,12.0,13.0,14.0,15.0,16.0};\r
 \r
+  // \r
+  Int_t binsEventCount[2]={2,2};\r
+  Double_t minEventCount[2]={0,0}; \r
+  Double_t maxEventCount[2]={2,2}; \r
+  fEventCount = new THnSparseF("fEventCount","trig vs trig+vertex",2,binsEventCount,minEventCount,maxEventCount);\r
+  fEventCount->GetAxis(0)->SetTitle("trig");\r
+  fEventCount->GetAxis(1)->SetTitle("trig+vert");\r
+  fEventCount->Sumw2();\r
+\r
   //Xv:Yv:Zv:ResZv:Mult\r
-  Int_t binsRecEventHist[5]={100,100,140,100,150};\r
-  Double_t minRecEventHist[5]={-3.,-3.,-35.,0.,0.}; \r
-  Double_t maxRecEventHist[5]={3.,3.,35.,10.,150.}; \r
+  Double_t kFact = 1.0;\r
+\r
+  Int_t binsRecEventHist[5]={80,80,100,80,150};\r
+  Double_t minRecEventHist[5]={-3.*kFact,-3.*kFact,-35.,0.,0.}; \r
+  Double_t maxRecEventHist[5]={3.*kFact,3.*kFact,35.,10.,150.}; \r
   fRecEventHist = new THnSparseF("fRecEventHist","Xv:Yv:Zv:ResZv:Mult",5,binsRecEventHist,minRecEventHist,maxRecEventHist);\r
   fRecEventHist->GetAxis(0)->SetTitle("Xv (cm)");\r
   fRecEventHist->GetAxis(1)->SetTitle("Yv (cm)");\r
@@ -98,7 +124,7 @@ void AlidNdPtCutAnalysis::Init(){
   fRecEventHist->Sumw2();\r
 \r
   //Xv:Yv:Zv\r
-  Int_t binsMCEventHist[3]={100,100,140};\r
+  Int_t binsMCEventHist[3]={80,80,100};\r
   Double_t minMCEventHist[3]={-0.1,-0.1,-35.}; \r
   Double_t maxMCEventHist[3]={0.1,0.1,35.}; \r
   fMCEventHist = new THnSparseF("fMCEventHist","mcXv:mcYv:mcZv",3,binsMCEventHist,minMCEventHist,maxMCEventHist);\r
@@ -109,12 +135,12 @@ void AlidNdPtCutAnalysis::Init(){
 \r
   //Xv-mcXv:Yv-mcYv:Zv-mcZv:Mult\r
   Int_t binsRecMCEventHist[4]={100,100,100,150};\r
-  Double_t minRecMCEventHist[4]={-10.0,-10.0,-10.0,0.}; \r
-  Double_t maxRecMCEventHist[4]={10.0,10.0,10.0,150.}; \r
-  fRecMCEventHist = new THnSparseF("fRecMCEventHist","mcXv-Xv:mcYv-Yv:mcZv-Zv:Mult",4,binsRecMCEventHist,minRecMCEventHist,maxRecMCEventHist);\r
-  fRecMCEventHist->GetAxis(0)->SetTitle("mcXv-Xv (cm)");\r
-  fRecMCEventHist->GetAxis(1)->SetTitle("mcYv-Yv (cm)");\r
-  fRecMCEventHist->GetAxis(2)->SetTitle("mcZv-Zv (cm)");\r
+  Double_t minRecMCEventHist[4]={-1.0*kFact,-1.0*kFact,-1.0*kFact,0.}; \r
+  Double_t maxRecMCEventHist[4]={1.0*kFact,1.0*kFact,1.0*kFact,150.}; \r
+  fRecMCEventHist = new THnSparseF("fRecMCEventHist","Xv-mcXv:Yv-mcYv:Zv-mcZv:Mult",4,binsRecMCEventHist,minRecMCEventHist,maxRecMCEventHist);\r
+  fRecMCEventHist->GetAxis(0)->SetTitle("Xv-mcXv (cm)");\r
+  fRecMCEventHist->GetAxis(1)->SetTitle("Yv-mcYv (cm)");\r
+  fRecMCEventHist->GetAxis(2)->SetTitle("Zv-mcZv (cm)");\r
   fRecMCEventHist->GetAxis(3)->SetTitle("Mult");\r
   fRecMCEventHist->Sumw2();\r
 \r
@@ -122,12 +148,12 @@ void AlidNdPtCutAnalysis::Init(){
   // THnSparse track histograms\r
   //\r
 \r
-  //nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:isKink:isPrim\r
-  Int_t binsRecMCTrackHist[10]={160,100,100,100,100,30,90,ptNbins, 2,2};\r
-  Double_t minRecMCTrackHist[10]={0., 0., 0., -10.,-10.,-1.5, 0., ptMin, 0., 0.};\r
-  Double_t maxRecMCTrackHist[10]={160.,10.,1.2, 10.,10.,1.5, 2.*TMath::Pi(), ptMax, 2.,2.};\r
+  //nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:kinkIdx:isPrim:polarity\r
+  Int_t binsRecMCTrackHist[11]={160,80,80,100,100,30,90,ptNbins, 3, 2, 2};\r
+  Double_t minRecMCTrackHist[11]={0., 0., 0., -5.,-5.,-1.5, 0., ptMin, -1., 0., 0.};\r
+  Double_t maxRecMCTrackHist[11]={160.,10.,1.2, 5.,5.,1.5, 2.*TMath::Pi(), ptMax, 2., 2., 2.};\r
 \r
-  fRecMCTrackHist = new THnSparseF("fRecMCTrackHist","nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:isKink:isPrim",10,binsRecMCTrackHist,minRecMCTrackHist,maxRecMCTrackHist);\r
+  fRecMCTrackHist = new THnSparseF("fRecMCTrackHist","nClust:chi2PerClust:nClust/nFindableClust:DCAy:DCAz:eta:phi:pt:kinkIdx:isPrim:polarity",11,binsRecMCTrackHist,minRecMCTrackHist,maxRecMCTrackHist);\r
   fRecMCTrackHist->SetBinEdges(7,binsPt);\r
 \r
   fRecMCTrackHist->GetAxis(0)->SetTitle("nClust");\r
@@ -138,8 +164,9 @@ void AlidNdPtCutAnalysis::Init(){
   fRecMCTrackHist->GetAxis(5)->SetTitle("#eta");\r
   fRecMCTrackHist->GetAxis(6)->SetTitle("#phi (rad)");\r
   fRecMCTrackHist->GetAxis(7)->SetTitle("p_{T} (GeV/c)");\r
-  fRecMCTrackHist->GetAxis(8)->SetTitle("isKink");\r
+  fRecMCTrackHist->GetAxis(8)->SetTitle("kinkIdx"); // 0 - no kink, -1 - kink mother, 1 - kink daugther \r
   fRecMCTrackHist->GetAxis(9)->SetTitle("isPrim");\r
+  fRecMCTrackHist->GetAxis(10)->SetTitle("polarity");\r
   fRecMCTrackHist->Sumw2();\r
 \r
   // init output folder\r
@@ -170,9 +197,50 @@ void AlidNdPtCutAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent * cons
 \r
   // trigger selection\r
   Bool_t isEventTriggered = kTRUE;\r
-  if(evtCuts->IsTriggerRequired())  {\r
-    static AliTriggerAnalysis* triggerAnalysis = new AliTriggerAnalysis;\r
-    isEventTriggered = triggerAnalysis->IsTriggerFired(esdEvent, GetTrigger());\r
+  AliPhysicsSelection *trigSel = NULL;\r
+  AliTriggerAnalysis *trigAna = NULL; // needed for andV0\r
+\r
+  if(evtCuts->IsTriggerRequired())  \r
+  {\r
+    //\r
+    trigSel = GetPhysicsTriggerSelection();\r
+    if(!trigSel) {\r
+      AliDebug(AliLog::kError, "cannot get trigSel");\r
+      return;\r
+    }\r
+    \r
+    if(IsUseMCInfo()) { \r
+      trigSel->SetAnalyzeMC();\r
+      isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
+\r
+      trigAna = trigSel->GetTriggerAnalysis();\r
+      if(!trigAna) \r
+        return;\r
+\r
+      if(GetTrigger() == AliTriggerAnalysis::kV0AND)\r
+        isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
+    }\r
+    else {\r
+      //\r
+      // 0-multiplicity bin for LHC background correction\r
+      //\r
+      if(GetAnalysisMode() == AlidNdPtHelper::kTPCTrackSPDvtx || GetAnalysisMode() == AlidNdPtHelper::kTPCTrackSPDvtxUpdate || \r
+         GetAnalysisMode() == AlidNdPtHelper::kTPCITSHybridTrackSPDvtx || GetAnalysisMode() == AlidNdPtHelper::kTPCITSHybridTrackSPDvtxDCArPt) \r
+      {\r
+        trigSel->SetBin0CallbackViaPointer(&AlidNdPtAnalysis::IsBinZeroTrackSPDvtx);\r
+      } else {\r
+        trigSel->SetBin0CallbackViaPointer(&AlidNdPtAnalysis::IsBinZeroSPDvtx);\r
+      }\r
+\r
+      isEventTriggered = trigSel->IsCollisionCandidate(esdEvent);\r
+\r
+      trigAna = trigSel->GetTriggerAnalysis();\r
+      if(!trigAna) \r
+        return;\r
+\r
+      if(GetTrigger() == AliTriggerAnalysis::kV0AND)\r
+        isEventTriggered = trigAna->IsOfflineTriggerFired(esdEvent, GetTrigger());\r
+    }\r
   }\r
 \r
   // use MC information\r
@@ -180,7 +248,6 @@ void AlidNdPtCutAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent * cons
   AliGenEventHeader* genHeader = 0;\r
   AliStack* stack = 0;\r
   TArrayF vtxMC(3);\r
-  //AlidNdPtHelper::MCProcessType evtType = AlidNdPtHelper::kInvalidProcess;\r
   AliPWG0Helper::MCProcessType evtType = AliPWG0Helper::kInvalidProcess;\r
 \r
   if(IsUseMCInfo())\r
@@ -226,13 +293,47 @@ void AlidNdPtCutAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent * cons
   Bool_t bRedoTPCVertex = evtCuts->IsRedoTPCVertex();\r
   Bool_t bUseConstraints = evtCuts->IsUseBeamSpotConstraint();\r
   const AliESDVertex* vtxESD = AlidNdPtHelper::GetVertex(esdEvent,evtCuts,accCuts,esdTrackCuts,GetAnalysisMode(),kFALSE,bRedoTPCVertex,bUseConstraints); \r
-  if(!vtxESD) return; \r
-\r
-  Bool_t isRecVertex = AlidNdPtHelper::TestRecVertex(vtxESD, GetAnalysisMode(), kFALSE);\r
+  Bool_t isRecVertex = AlidNdPtHelper::TestRecVertex(vtxESD, esdEvent->GetPrimaryVertexSPD(), GetAnalysisMode(), kFALSE);\r
   Bool_t isEventOK = evtCuts->AcceptEvent(esdEvent,mcEvent,vtxESD) && isRecVertex;\r
 \r
   TObjArray *allChargedTracks=0;\r
   Int_t multAll=0;\r
+  \r
+  //\r
+  // event counter\r
+  // \r
+  //printf("isEventOK %d, isEventTriggered %d \n",isEventOK,isEventTriggered);\r
+\r
+  Bool_t isTrigAndVertex = isEventTriggered && isEventOK;\r
+  Double_t vEventCount[2] = { isEventTriggered, isTrigAndVertex};\r
+  fEventCount->Fill(vEventCount);\r
+\r
+  //\r
+  // cosmic background and splitted tracks\r
+  //\r
+  if(GetParticleMode() == AlidNdPtHelper::kBackgroundTrack) \r
+  {\r
+    AlidNdPtBackgroundCuts *backCuts = GetBackgroundCuts(); \r
+    if(!backCuts) return;\r
+\r
+    for (Int_t iTrack = 0; iTrack < esdEvent->GetNumberOfTracks(); iTrack++) \r
+    {\r
+      AliESDtrack *track1 = esdEvent->GetTrack(iTrack);\r
+      if(!track1) continue; \r
+      if(track1->Charge()==0) continue; \r
+\r
+      for (Int_t jTrack = iTrack+1; jTrack < esdEvent->GetNumberOfTracks(); jTrack++) \r
+      {\r
+        AliESDtrack *track2 = esdEvent->GetTrack(jTrack);\r
+        if(!track2) continue; \r
+        if(track2->Charge()==0) continue; \r
+\r
+       //printf("track2->Charge() %d\n",track2->Charge());\r
+\r
+        backCuts->IsBackgroundTrack(track1, track2);\r
+      }\r
+    }\r
+  }\r
 \r
   // check event cuts\r
   if(isEventOK && isEventTriggered)\r
@@ -247,24 +348,63 @@ void AlidNdPtCutAnalysis::Process(AliESDEvent *const esdEvent, AliMCEvent * cons
       AliESDtrack *track = (AliESDtrack*)allChargedTracks->At(i);\r
       if(!track) continue;\r
 \r
+      if(!esdTrackCuts->AcceptTrack(track)) continue;\r
+\r
+      //\r
+      Bool_t isOK = kFALSE;\r
+      Double_t x[3]; track->GetXYZ(x);\r
+      Double_t b[3]; AliTracker::GetBxByBz(x,b);\r
+\r
+      //\r
+      // if TPC-ITS hybrid tracking (kTPCITSHybrid)\r
+      // replace track parameters with TPC-ony track parameters\r
+      //\r
+      if( GetAnalysisMode() == AlidNdPtHelper::kTPCITSHybrid || GetAnalysisMode() == AlidNdPtHelper::kTPCITSHybridTrackSPDvtx || GetAnalysisMode() == AlidNdPtHelper::kTPCITSHybridTrackSPDvtxDCArPt) \r
+      {\r
+        // Relate TPC-only tracks to SPD vertex\r
+        isOK = track->RelateToVertexTPCBxByBz(vtxESD, b, kVeryBig);\r
+        if(!isOK) continue;\r
+\r
+       // replace esd track parameters with TPCinner\r
+        AliExternalTrackParam  *tpcTrack  = new AliExternalTrackParam(*(track->GetTPCInnerParam()));\r
+       if (!tpcTrack) return;\r
+        track->Set(tpcTrack->GetX(),tpcTrack->GetAlpha(),tpcTrack->GetParameter(),tpcTrack->GetCovariance());\r
+\r
+        if(tpcTrack) delete tpcTrack; \r
+      } \r
+\r
+      //\r
+      if (GetAnalysisMode()==AlidNdPtHelper::kTPCSPDvtxUpdate || GetAnalysisMode() == AlidNdPtHelper::kTPCTrackSPDvtxUpdate) \r
+      {\r
+        //\r
+        // update track parameters\r
+       //\r
+        AliExternalTrackParam cParam;\r
+        isOK = track->RelateToVertexTPCBxByBz(vtxESD, b, kVeryBig, &cParam);\r
+       if(!isOK) continue;\r
+\r
+       track->Set(cParam.GetX(),cParam.GetAlpha(),cParam.GetParameter(),cParam.GetCovariance());\r
+      }\r
+\r
       FillHistograms(track, stack);\r
       multAll++;\r
     }\r
 \r
-  Double_t vRecEventHist[5] = {vtxESD->GetXv(),vtxESD->GetYv(),vtxESD->GetZv(),vtxESD->GetZRes(),multAll};\r
-  fRecEventHist->Fill(vRecEventHist);\r
+    Double_t vRecEventHist[5] = {vtxESD->GetXv(),vtxESD->GetYv(),vtxESD->GetZv(),vtxESD->GetZRes(),multAll};\r
+    fRecEventHist->Fill(vRecEventHist);\r
 \r
-  if(IsUseMCInfo()) {\r
-    Double_t vRecMCEventHist[5] = {vtxESD->GetXv()-vtxMC[0],vtxESD->GetYv()-vtxMC[1],vtxESD->GetZv()-vtxMC[2],multAll};\r
-    fRecMCEventHist->Fill(vRecMCEventHist);\r
-  }\r
+    if(IsUseMCInfo()) {\r
+      Double_t vRecMCEventHist[5] = {vtxESD->GetXv()-vtxMC[0],vtxESD->GetYv()-vtxMC[1],vtxESD->GetZv()-vtxMC[2],multAll};\r
+      fRecMCEventHist->Fill(vRecMCEventHist);\r
+    }\r
   }\r
 \r
   if(allChargedTracks) delete allChargedTracks; allChargedTracks = 0;\r
+\r
 }\r
 \r
 //_____________________________________________________________________________\r
-void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *const stack)\r
+void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *const stack) const\r
 {\r
   //\r
   // Fill ESD track and MC histograms \r
@@ -275,11 +415,13 @@ void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *
   Float_t pt = esdTrack->Pt();\r
   Float_t eta = esdTrack->Eta();\r
   Float_t phi = esdTrack->Phi();\r
-  Int_t nClust = esdTrack->GetTPCclusters(0);\r
+  //Int_t nClust = esdTrack->GetTPCclusters(0);\r
+  Int_t nClust = esdTrack->GetTPCNclsIter1();\r
   Int_t nFindableClust = esdTrack->GetTPCNclsF();\r
 \r
   Float_t chi2PerCluster = 0.;\r
-  if(nClust>0.) chi2PerCluster = esdTrack->GetTPCchi2()/Float_t(nClust);\r
+  //if(nClust>0.) chi2PerCluster = esdTrack->GetTPCchi2()/Float_t(nClust);\r
+  if(nClust>0.) chi2PerCluster = esdTrack->GetTPCchi2Iter1()/Float_t(nClust);\r
 \r
   Float_t clustPerFindClust = 0.;\r
   if(nFindableClust>0.) clustPerFindClust = Float_t(nClust)/nFindableClust;\r
@@ -287,14 +429,21 @@ void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *
   Float_t b[2], bCov[3];\r
   esdTrack->GetImpactParameters(b,bCov);\r
 \r
-  // kink daughter\r
-  Bool_t isKink = kFALSE;\r
-  if(esdTrack->GetKinkIndex(0)>0) isKink=kTRUE;\r
+  // kink idx\r
+  Int_t kinkIdx = 0;\r
+  //if(esdTrack->GetKinkIndex(0) > 0.)   isKink  = kTRUE;\r
+  if(esdTrack->GetKinkIndex(0) > 0)      kinkIdx = 1;   // kink daughter\r
+  else if(esdTrack->GetKinkIndex(0) < 0) kinkIdx = -1;  // kink mother\r
+  else kinkIdx = 0; // not kink\r
+\r
+  //printf("esdTrack->GetKinkIndex(0) %d \n", esdTrack->GetKinkIndex(0));\r
+  //printf("esdTrack->GetKinkIndex(1) %d \n", esdTrack->GetKinkIndex(1));\r
+  //printf("esdTrack->GetKinkIndex(2) %d \n", esdTrack->GetKinkIndex(2));\r
+  //printf("kinkIdx %d \n", kinkIdx);\r
 \r
   //\r
   // Fill rec vs MC information\r
   //\r
-\r
   Bool_t isPrim = kTRUE;\r
 \r
   if(IsUseMCInfo()) {\r
@@ -304,15 +453,20 @@ void AlidNdPtCutAnalysis::FillHistograms(AliESDtrack *const esdTrack, AliStack *
     if(!particle) return;\r
     if(particle->GetPDG() && particle->GetPDG()->Charge()==0.) return;\r
     isPrim = stack->IsPhysicalPrimary(label);\r
-  }\r
 \r
+    //if(isPrim && pt > 1.5 && kinkIdx == -1) printf("nClust  %d \n", nClust);\r
+  }\r
+  \r
   // fill histo\r
-  Double_t vRecMCTrackHist[10] = {nClust,chi2PerCluster,clustPerFindClust,b[0],b[1],eta,phi,pt,isKink,isPrim}; \r
+  Int_t polarity = -2;\r
+  if (esdTrack->Charge() < 0.) polarity = 0; \r
+  else polarity = 1; \r
+  Double_t vRecMCTrackHist[11] = { nClust,chi2PerCluster,clustPerFindClust,b[0],b[1],eta,phi,pt,kinkIdx,isPrim, polarity }; \r
   fRecMCTrackHist->Fill(vRecMCTrackHist);\r
 }\r
 \r
 //_____________________________________________________________________________\r
-Long64_t AlidNdPtCutAnalysis::Merge(TCollection* list) \r
+Long64_t AlidNdPtCutAnalysis::Merge(TCollection* const list) \r
 {\r
   // Merge list of objects (needed by PROOF)\r
 \r
@@ -325,6 +479,8 @@ Long64_t AlidNdPtCutAnalysis::Merge(TCollection* list)
   TIterator* iter = list->MakeIterator();\r
   TObject* obj = 0;\r
 \r
+  //TList *collPhysSelection = new TList;\r
+\r
   // collection of generated histograms\r
   Int_t count=0;\r
   while((obj = iter->Next()) != 0) {\r
@@ -332,16 +488,25 @@ Long64_t AlidNdPtCutAnalysis::Merge(TCollection* list)
     if (entry == 0) continue; \r
   \r
     // event histo\r
+    fEventCount->Add(entry->fEventCount);\r
     fRecEventHist->Add(entry->fRecEventHist);\r
     fRecMCEventHist->Add(entry->fRecMCEventHist);\r
     fMCEventHist->Add(entry->fMCEventHist);\r
 \r
     // track histo\r
     fRecMCTrackHist->Add(entry->fRecMCTrackHist);\r
+\r
+    // physics selection\r
+    //collPhysSelection->Add(entry->GetPhysicsTriggerSelection());\r
     \r
   count++;\r
   }\r
 \r
+  //AliPhysicsSelection *trigSelection = GetPhysicsTriggerSelection();\r
+  //trigSelection->Merge(collPhysSelection);\r
+\r
+  //if(collPhysSelection) delete collPhysSelection;\r
+\r
 return count;\r
 }\r
 \r
@@ -379,9 +544,38 @@ void AlidNdPtCutAnalysis::Analyse()
 \r
   Double_t maxDCAr = accCuts->GetMaxDCAr();\r
 \r
+  //\r
+  // Event counters\r
+  //\r
+  h2D = (TH2D*)fEventCount->Projection(0,1);\r
+  h2D->SetName("trig_vs_trigANDvertex");\r
+  aFolderObj->Add(h2D);\r
+\r
+  fEventCount->GetAxis(0)->SetRange(2,2); // triggered\r
+  h1D = (TH1D*)fEventCount->Projection(1);\r
+  h1D->SetTitle("rec. vertex for triggered events");\r
+  h1D->SetName("trigANDvertex");\r
+  aFolderObj->Add(h1D);\r
+\r
   //\r
   // Create rec. event histograms\r
   //\r
+  h1D = (TH1D *)fRecEventHist->Projection(0);\r
+  h1D->SetName("rec_xv");\r
+  aFolderObj->Add(h1D);\r
+\r
+  h1D = (TH1D *)fRecEventHist->Projection(1);\r
+  h1D->SetName("rec_yv");\r
+  aFolderObj->Add(h1D);\r
+\r
+  h1D = (TH1D *)fRecEventHist->Projection(2);\r
+  h1D->SetName("rec_zv");\r
+  aFolderObj->Add(h1D);\r
+\r
+  h2D = (TH2D *)fRecEventHist->Projection(3,4);\r
+  h2D->SetName("rec_resZv_vs_Mult");\r
+  aFolderObj->Add(h2D);\r
+\r
   h2D = (TH2D *)fRecEventHist->Projection(0,1);\r
   h2D->SetName("rec_xv_vs_yv");\r
   aFolderObj->Add(h2D);\r
@@ -394,7 +588,6 @@ void AlidNdPtCutAnalysis::Analyse()
   h2D->SetName("rec_resZv_vs_Mult");\r
   aFolderObj->Add(h2D);\r
 \r
-\r
   //\r
   // MC available\r
   //\r
@@ -456,8 +649,12 @@ void AlidNdPtCutAnalysis::Analyse()
   h2D->SetName("ratio_nClust_nFindableClust_vs_eta");\r
   aFolderObj->Add(h2D);\r
 \r
+  h2D = (TH2D *)fRecMCTrackHist->Projection(5,6);\r
+  h2D->SetName("eta_vs_phi");\r
+  aFolderObj->Add(h2D);\r
+\r
   //\r
-  fRecMCTrackHist->GetAxis(7)->SetRangeUser(minEta,maxEta);  \r
+  fRecMCTrackHist->GetAxis(5)->SetRangeUser(minEta,maxEta);  \r
 \r
   h2D = (TH2D *)fRecMCTrackHist->Projection(0,6);\r
   h2D->SetName("nClust_vs_phi");\r
@@ -471,10 +668,6 @@ void AlidNdPtCutAnalysis::Analyse()
   h2D->SetName("ratio_nClust_nFindableClust_vs_phi");\r
   aFolderObj->Add(h2D);\r
 \r
-  h2D = (TH2D *)fRecMCTrackHist->Projection(5,6);\r
-  h2D->SetName("eta_vs_phi");\r
-  aFolderObj->Add(h2D);\r
-\r
   //\r
   fRecMCTrackHist->GetAxis(7)->SetRangeUser(0.0,maxPt);  \r
 \r
@@ -511,9 +704,14 @@ void AlidNdPtCutAnalysis::Analyse()
   h2D->SetName("nClust_vs_ratio_nClust_nFindableClust");\r
   aFolderObj->Add(h2D);\r
 \r
+  //\r
   // DCAy cuts\r
+  //\r
+  fRecMCTrackHist->GetAxis(0)->SetRange(50,160); // nClust/track > 50\r
+  fRecMCTrackHist->GetAxis(1)->SetRangeUser(0.,3.9999); // chi2/cluster < 4.0\r
   fRecMCTrackHist->GetAxis(3)->SetRange(1,fRecMCTrackHist->GetAxis(3)->GetNbins());\r
-  fRecMCTrackHist->GetAxis(4)->SetRangeUser(-1.0,1.0);\r
+  //fRecMCTrackHist->GetAxis(4)->SetRangeUser(-1.0,1.0);\r
+  fRecMCTrackHist->GetAxis(4)->SetRange(1,fRecMCTrackHist->GetAxis(4)->GetNbins());\r
 \r
   // sec\r
   fRecMCTrackHist->GetAxis(9)->SetRange(1,1);\r
@@ -528,7 +726,7 @@ void AlidNdPtCutAnalysis::Analyse()
   aFolderObj->Add(h1D);\r
 \r
   // DCAz cuts\r
-  fRecMCTrackHist->GetAxis(3)->SetRangeUser(-1.0,1.0);\r
+  //fRecMCTrackHist->GetAxis(3)->SetRangeUser(-1.0,1.0);\r
   fRecMCTrackHist->GetAxis(4)->SetRange(1,fRecMCTrackHist->GetAxis(4)->GetNbins());\r
 \r
   // sec\r
@@ -552,7 +750,7 @@ void AlidNdPtCutAnalysis::Analyse()
 }\r
 \r
 //_____________________________________________________________________________\r
-TFolder* AlidNdPtCutAnalysis::ExportToFolder(TObjArray * array) \r
+TFolder* AlidNdPtCutAnalysis::ExportToFolder(TObjArray * const array) \r
 {\r
   // recreate folder avery time and export objects to new one\r
   //\r