mult bug fix and updated selection JO

[u/mrichter/AliRoot.git] / PWGPP / AliAnalysisTaskFilteredTree.cxx

diff --git a/PWGPP/AliAnalysisTaskFilteredTree.cxx b/PWGPP/AliAnalysisTaskFilteredTree.cxx
index d78a31e6cf84496746e5a91b8b93f73d5d3460cd..aa9a8d4b742ee6ac6edbf249250e74dfaaadf304 100644 (file)
--- a/PWGPP/AliAnalysisTaskFilteredTree.cxx
+++ b/PWGPP/AliAnalysisTaskFilteredTree.cxx
@@ -1347,7 +1347,7 @@ void AliAnalysisTaskFilteredTree::ProcessAll(AliESDEvent *const esdEvent, AliMCE
       Int_t ntracks = esdEvent->GetNumberOfTracks();\r
       \r
       // fill histograms\r
-      FillHistograms(ptrack, ptpcInnerC, mult, (Double_t)chi2(0,0));\r
+      FillHistograms(ptrack, ptpcInnerC, centralityF, (Double_t)chi2(0,0));\r
 \r
       if(fTreeSRedirector && dumpToTree && fFillTree) \r
       {\r
@@ -2514,18 +2514,19 @@ void AliAnalysisTaskFilteredTree::FillHistograms(AliESDtrack* const ptrack, AliE
 \r
 // TPC+ITS primary tracks \r
 if( abs(ptrack->Eta())<0.8 && \r
-    ptrack->GetTPCClusterInfo(3,1)>130 && \r
+    ptrack->GetTPCClusterInfo(3,1)>120 && \r
     ptrack->IsOn(0x40) && \r
     ptrack->GetTPCclusters(0)>0.0 &&  \r
-    ptrack->GetTPCnclsS()/ptrack->GetTPCclusters(0)<0.2 && \r
-    abs(innerParam->GetX())>0.0 && \r
-    abs(innerParam->GetY()/innerParam->GetX())<0.14 && \r
-    abs(innerParam->GetTgl())<0.85 && \r
+    ptrack->GetTPCnclsS()/ptrack->GetTPCclusters(0)<0.4 && \r
+    //abs(innerParam->GetX())>0.0 && \r
+    //abs(innerParam->GetY()/innerParam->GetX())<0.14 && \r
+    //abs(innerParam->GetTgl())<0.85 && \r
     ptrack->IsOn(0x0004) && \r
     ptrack->GetNcls(0)>0 &&\r
     ptrack->GetITSchi2()>0 && \r
     sqrt(ptrack->GetITSchi2()/ptrack->GetNcls(0))<6 &&\r
     sqrt(chi2TPCInnerC)<6 &&\r
+    (ptrack->HasPointOnITSLayer(0) || ptrack->HasPointOnITSLayer(1)) &&\r
     abs(dz)<2.0 && \r
     abs(dxy)<(0.018+0.035*abs(ptrack->GetSigned1Pt())) )\r
     {\r
@@ -2545,13 +2546,13 @@ if( abs(ptrack->Eta())<0.8 &&
    ptrack->GetImpactParametersTPC(dxyTPC,dzTPC);\r
 \r
 if( abs(ptrack->Eta())<0.8 && \r
-    ptrack->GetTPCClusterInfo(3,1)>130 && \r
+    ptrack->GetTPCClusterInfo(3,1)>120 && \r
     ptrack->IsOn(0x40)&& \r
     ptrack->GetTPCclusters(0)>0.0 &&  \r
-    ptrack->GetTPCnclsS()/ptrack->GetTPCclusters(0)<0.2 && \r
-    abs(innerParam->GetX())>0.0 && \r
-    abs(innerParam->GetY()/innerParam->GetX())<0.14 && \r
-    abs(innerParam->GetTgl())<0.85 && \r
+    ptrack->GetTPCnclsS()/ptrack->GetTPCclusters(0)<0.4 && \r
+    //abs(innerParam->GetX())>0.0 && \r
+    //abs(innerParam->GetY()/innerParam->GetX())<0.14 && \r
+    //abs(innerParam->GetTgl())<0.85 && \r
     abs(dzTPC)<3.2 && \r
     abs(dxyTPC)<2.4 )\r
     {\r