AddFriend in Notify()

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

diff --git a/ANALYSIS/AliAnalysisTaskESDfilter.cxx b/ANALYSIS/AliAnalysisTaskESDfilter.cxx
index 9f7526b3d1fc31ee251acc461a15dc04c9504b32..d7497661bd605898eb87c2bd0585fa478321a8e5 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
@@ -384,7 +386,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
 \r
            usedTrack[idxBachFromCascade] = kTRUE;\r
            UInt_t selectInfo = 0;\r
-           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeBach,esd);\r
+           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeBach);\r
            if(mcH)mcH->SelectParticle(esdCascadeBach->GetLabel());\r
            aodTrack = new(tracks[jTracks++]) AliAODTrack(esdCascadeBach->GetID(),\r
                                                          esdCascadeBach->GetLabel(), \r
@@ -465,7 +467,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                usedTrack[idxPosFromV0Dghter] = kTRUE;\r
        \r
                UInt_t selectInfo = 0;\r
-               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadePos,esd);\r
+               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadePos);\r
                if(mcH) mcH->SelectParticle(esdCascadePos->GetLabel());\r
                aodTrack = new(tracks[jTracks++]) AliAODTrack(  esdCascadePos->GetID(),\r
                                                                esdCascadePos->GetLabel(), \r
@@ -509,7 +511,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                usedTrack[idxNegFromV0Dghter] = kTRUE;\r
        \r
                UInt_t selectInfo = 0;\r
-               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeNeg,esd);\r
+               if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdCascadeNeg);\r
                if(mcH)mcH->SelectParticle(esdCascadeNeg->GetLabel());\r
                aodTrack = new(tracks[jTracks++]) AliAODTrack(  esdCascadeNeg->GetID(),\r
                                                                esdCascadeNeg->GetLabel(),\r
@@ -680,7 +682,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        v0objects.AddAt(esdVtx,                  3);\r
        UInt_t selectV0 = 0;\r
        if (fV0Filter) {\r
-         selectV0 = fV0Filter->IsSelected(&v0objects,esd);\r
+         selectV0 = fV0Filter->IsSelected(&v0objects);\r
          // this is a little awkward but otherwise the \r
          // list wants to access the pointer (delete it) \r
          // again when going out of scope\r
@@ -725,7 +727,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        if (!usedTrack[posFromV0]) {\r
            usedTrack[posFromV0] = kTRUE;\r
            UInt_t selectInfo = 0;\r
-           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Pos,esd);\r
+           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Pos);\r
            if(mcH)mcH->SelectParticle(esdV0Pos->GetLabel());\r
            aodTrack = new(tracks[jTracks++]) AliAODTrack(esdV0Pos->GetID(),\r
                                                          esdV0Pos->GetLabel(), \r
@@ -744,7 +746,6 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                                                          selectInfo);\r
            aodTrack->SetTPCClusterMap(esdV0Pos->GetTPCClusterMap());\r
            aodTrack->SetTPCSharedMap (esdV0Pos->GetTPCSharedMap());\r
-\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
@@ -768,7 +769,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        if (!usedTrack[negFromV0]) {\r
            usedTrack[negFromV0] = kTRUE;\r
            UInt_t selectInfo = 0;\r
-           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Neg,esd);\r
+           if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdV0Neg);\r
            if(mcH)mcH->SelectParticle(esdV0Neg->GetLabel());\r
            aodTrack = new(tracks[jTracks++]) AliAODTrack(esdV0Neg->GetID(),\r
                                                          esdV0Neg->GetLabel(),\r
@@ -888,7 +889,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                    \r
                    UInt_t selectInfo = 0;\r
                    if (fTrackFilter) {\r
-                       selectInfo = fTrackFilter->IsSelected(esd->GetTrack(imother),esd);\r
+                       selectInfo = fTrackFilter->IsSelected(esd->GetTrack(imother));\r
                        if (!selectInfo) continue;\r
                    }\r
                    \r
@@ -958,7 +959,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
                        esdTrackD->GetCovarianceXYZPxPyPz(covTr);\r
                        esdTrackD->GetESDpid(pid);\r
                        selectInfo = 0;\r
-                       if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdTrackD,esd);\r
+                       if (fTrackFilter) selectInfo = fTrackFilter->IsSelected(esdTrackD);\r
                        if(mcH)mcH->SelectParticle(esdTrackD->GetLabel());\r
                        daughter = \r
                            new(tracks[jTracks++]) AliAODTrack(esdTrackD->GetID(),\r
@@ -1011,7 +1012,7 @@ void AliAnalysisTaskESDfilter::ConvertESDtoAOD() {
        //\r
        // Track selection\r
        if (fTrackFilter) {\r
-           selectInfo = fTrackFilter->IsSelected(esdTrack,esd);\r
+           selectInfo = fTrackFilter->IsSelected(esdTrack);\r
            if (!selectInfo && !vtx->UsesTrack(esdTrack->GetID())) continue;\r
        }\r
        \r