Use aod track selection wrapper inside the task, when running on aods

diff --git a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
index d42c9ac31dd219976068dd161feb87483a2fda5d..1467606a7b5aa858d0de10022aae5f37e7d24547 100644 (file)
--- a/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
+++ b/PWGJE/CMakelibPWGJEEMCALJetTasks.pkg
@@ -90,6 +90,7 @@ set ( SRCS
  EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx 
  EMCALJetTasks/UserTasks/AliEMCalPtTaskVTrackSelection.cxx
  EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx
+ EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionAOD.cxx
 )
 
 # Add code that needs fastjet or FJWrapper here

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
index a26ca34375ca2531ad5be283ab03d90052d11a2e..8cbeaa730a7c6551ad0fa0a2b89d20cb77e0aecf 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
@@ -49,6 +49,7 @@
 
 #include "AliEMCalHistoContainer.h"
 #include "AliEMCalPtTaskVTrackSelection.h"
+#include "AliEMCalPtTaskTrackSelectionAOD.h"
 #include "AliEMCalPtTaskTrackSelectionESD.h"
 #include "AliAnalysisTaskPtEMCalTrigger.h"
 
@@ -694,6 +695,17 @@ namespace EMCalTriggerPtAnalysis {
                fListTrackCuts->AddLast(new AliEMCalPtTaskTrackSelectionESD(trackCuts));
        }
 
+       //______________________________________________________________________________
+       void AliAnalysisTaskPtEMCalTrigger::AddCutsForAOD(AliESDtrackCuts* trackCuts, UInt_t filterbits) {
+               /*
+                * Add new track cuts to the task
+                *
+                * @param trackCuts: Object of type AliESDtrackCuts
+                */
+               fListTrackCuts->AddLast(new AliEMCalPtTaskTrackSelectionAOD(trackCuts, filterbits));
+       }
+
+
        //______________________________________________________________________________
        TString AliAnalysisTaskPtEMCalTrigger::BuildTriggerString() {
                /*

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
index 08258d41f070f4401930e6b682a176b7144f3498..434d6cb10405b5f768caddd83f1f3850e569a914 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
@@ -36,6 +36,7 @@ public:
        virtual Bool_t Run();
 
        void AddESDTrackCuts(AliESDtrackCuts *trackCuts);
+       void AddCutsForAOD(AliESDtrackCuts *trackCuts, UInt_t filterBits);
        void SetEtaRange(double etamin, double etamax) { fEtaRange.SetLimits(etamin, etamax); }
        void SetPtRange(double ptmin, double ptmax) { fPtRange.SetLimits(ptmin, ptmax); }
        void SetSwapEta() { fSwapEta = kTRUE; }

diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx
index d885ebc667a3d88efa0ab3d09fd4133ffc993644..e817c50533877846f7adf803d43475148cef3c04 100644 (file)
--- a/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx
+++ b/PWGJE/EMCALJetTasks/UserTasks/AliEMCalPtTaskTrackSelectionESD.cxx
@@ -74,9 +74,12 @@ AliEMCalPtTaskTrackSelectionESD& AliEMCalPtTaskTrackSelectionESD::operator=(
         */
        AliEMCalPtTaskVTrackSelection::operator=(ref);
        if(&ref != this){
-               this->~AliEMCalPtTaskTrackSelectionESD();
+               if(fTrackCuts) {
+                       delete fTrackCuts;
+                       fTrackCuts = NULL;
+               }
+               if(ref.fTrackCuts) fTrackCuts = new AliESDtrackCuts(*(ref.fTrackCuts));
        }
-       if(ref.fTrackCuts) fTrackCuts = new AliESDtrackCuts(*(ref.fTrackCuts));
        return *this;
 }
 

diff --git a/PWGJE/PWGJEEMCALJetTasksLinkDef.h b/PWGJE/PWGJEEMCALJetTasksLinkDef.h
index 89bb4b0636d71f505cb9105528b2e8485e7f017e..b96ee9cb4d67f5e1f7c6744fc3d7be205339137e 100644 (file)
--- a/PWGJE/PWGJEEMCALJetTasksLinkDef.h
+++ b/PWGJE/PWGJEEMCALJetTasksLinkDef.h
@@ -77,6 +77,7 @@
 #pragma link C++ class EMCalTriggerPtAnalysis::AliAnalysisTaskPtEMCalTrigger+;
 #pragma link C++ class EMCalTriggerPtAnalysis::AliEMCalPtTaskVTrackSelection+;
 #pragma link C++ class EMCalTriggerPtAnalysis::AliEMCalPtTaskTrackSelectionESD+;
+#pragma link C++ class EMCalTriggerPtAnalysis::AliEMCalPtTaskTrackSelectionAOD+;
 
 #ifdef HAVE_FASTJET
 #pragma link C++ class AliEmcalJetTask+;