Fixed shadowed variable

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisTaskESDfilter.cxx

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index d8a72a1c2f8e131f69435e3a41201a86377fba3f..8084626ed0ac38f0bed1c2c29f21c34449c46035 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
@@ -139,6 +139,8 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
     // loop over events and fill them\r
     // Multiplicity information needed by the header (to be revised!)\r
     Int_t nTracks    = esd->GetNumberOfTracks();\r
+    for (Int_t iTrack=0; iTrack<nTracks; ++iTrack) esd->GetTrack(iTrack)->SetESDEvent(esd);\r
+\r
     //    if (fDebug > 0) printf("-------------------Bo: Number of ESD tracks %d \n",nTracks);\r
 \r
     Int_t nPosTracks = 0;\r
@@ -266,8 +268,10 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        AliAODVertex(pos, covVtx, vtx->GetChi2toNDF(), NULL, -1, AliAODVertex::kPrimary);\r
     primary->SetName(vtx->GetName());\r
     primary->SetTitle(vtx->GetTitle());\r
-    \r
-    if (!strcmp(vtx->GetTitle(), "vertexer: 3D")) primary->SetNContributors(vtx->GetNContributors());\r
+\r
+    TString vtitle = vtx->GetTitle();\r
+    if (!vtitle.Contains("VertexerTracks")) \r
+      primary->SetNContributors(vtx->GetNContributors());\r
 \r
     if (fDebug > 0) primary->Print();\r
 \r
@@ -403,6 +407,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                                                          selectInfo);\r
            aodTrack->SetTPCClusterMap(esdCascadeBach->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdCascadeBach->GetTPCSharedMap());\r
+           aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadeBach));\r
            aodTrackRefs->AddAt(aodTrack,idxBachFromCascade);\r
            \r
            if (esdCascadeBach->GetSign() > 0) nPosTracks++;\r
@@ -484,8 +489,9 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                                                                selectInfo);\r
                aodTrack->SetTPCClusterMap(esdCascadePos->GetTPCClusterMap());\r
                aodTrack->SetTPCSharedMap (esdCascadePos->GetTPCSharedMap());\r
+               aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadePos));\r
                aodTrackRefs->AddAt(aodTrack,idxPosFromV0Dghter);\r
-               \r
+\r
                if (esdCascadePos->GetSign() > 0) nPosTracks++;\r
                aodTrack->ConvertAliPIDtoAODPID();\r
                aodTrack->SetFlags(esdCascadePos->GetStatus());\r
@@ -528,6 +534,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                                                                selectInfo);\r
                aodTrack->SetTPCClusterMap(esdCascadeNeg->GetTPCClusterMap());\r
                aodTrack->SetTPCSharedMap (esdCascadeNeg->GetTPCSharedMap());\r
+               aodTrack->SetChi2perNDF(Chi2perNDF(esdCascadeNeg));\r
                aodTrackRefs->AddAt(aodTrack,idxNegFromV0Dghter);\r
                \r
                if (esdCascadeNeg->GetSign() > 0) nPosTracks++;\r
@@ -744,7 +751,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                                                          selectInfo);\r
            aodTrack->SetTPCClusterMap(esdV0Pos->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdV0Pos->GetTPCSharedMap());\r
-\r
+           aodTrack->SetChi2perNDF(Chi2perNDF(esdV0Pos));\r
            aodTrackRefs->AddAt(aodTrack,posFromV0);\r
            //      if (fDebug > 0) printf("-------------------Bo: pos track from original pt %.3f \n",aodTrack->Pt());\r
            if (esdV0Pos->GetSign() > 0) nPosTracks++;\r
@@ -787,6 +794,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                                                          selectInfo);\r
            aodTrack->SetTPCClusterMap(esdV0Neg->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdV0Neg->GetTPCSharedMap());\r
+           aodTrack->SetChi2perNDF(Chi2perNDF(esdV0Neg));\r
            \r
            aodTrackRefs->AddAt(aodTrack,negFromV0);\r
            //      if (fDebug > 0) printf("-------------------Bo: neg track from original pt %.3f \n",aodTrack->Pt());\r
@@ -920,6 +928,8 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                                                               selectInfo);\r
                        mother->SetTPCClusterMap(esdTrackM->GetTPCClusterMap());\r
                        mother->SetTPCSharedMap (esdTrackM->GetTPCSharedMap());\r
+                       mother->SetChi2perNDF(Chi2perNDF(esdTrackM));\r
+\r
                        aodTrackRefs->AddAt(mother, imother);\r
                        \r
                        if (esdTrackM->GetSign() > 0) nPosTracks++;\r
@@ -1040,6 +1050,8 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                             );\r
        aodTrack->SetTPCClusterMap(esdTrack->GetTPCClusterMap());\r
        aodTrack->SetTPCSharedMap (esdTrack->GetTPCSharedMap());\r
+       aodTrack->SetChi2perNDF(Chi2perNDF(esdTrack));\r
+\r
        aodTrackRefs->AddAt(aodTrack, nTrack);\r
 \r
        \r
@@ -1295,6 +1307,20 @@ void AliAnalysisTaskESDfilter::SetDetectorRawSignals(AliAODPid *aodpid, AliESDtr
 \r
 }\r
 \r
+Double_t  AliAnalysisTaskESDfilter::Chi2perNDF(AliESDtrack* track)\r
+{\r
+    // Calculate chi2 per ndf for track\r
+    Int_t  nClustersTPC = track->GetTPCNcls();\r
+\r
+    if ( nClustersTPC > 5) {\r
+       return (track->GetTPCchi2()/Float_t(nClustersTPC - 5));\r
+    } else {\r
+       return (-1.);\r
+    }\r
+ }\r
+\r
+\r
+\r
 void AliAnalysisTaskESDfilter::Terminate(Option_t */*option*/)\r
 {\r
 // Terminate analysis\r