from Redmer Bertens:

additions in the jet flow, adds a dependency on the PWGJE dir

diff --git a/PWG/CMakelibPWGflowTasks.pkg b/PWG/CMakelibPWGflowTasks.pkg
index 969ea607f9e996a705ec60b3163cd4f9848206db..cda9c3d0447181993f312a2398ec0dfb4458e42c 100644 (file)
--- a/PWG/CMakelibPWGflowTasks.pkg
+++ b/PWG/CMakelibPWGflowTasks.pkg
@@ -67,7 +67,7 @@ set ( DHDR PWGflowTasksLinkDef.h)
 set ( EXPORT ${HDRS} )
 
 if( ALICE_TARGET STREQUAL "win32gcc")
-        set ( ELIBS -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lPWGflowBase -lPWGmuon -lANALYSISalice -lANALYSIS -lAOD -lESD -lSTEERBase ${ROOTCLIBS} -lEG )
+        set ( ELIBS -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lPWGflowBase -lPWGJE/EMCALJetTasks/ -lPWGmuon -lANALYSISalice -lANALYSIS -lAOD -lESD -lSTEERBase ${ROOTCLIBS} -lEG )
 endif( ALICE_TARGET STREQUAL "win32gcc")
 
-set ( EINCLUDE PWG/FLOW/Base PWG/FLOW/Tasks STEER/ESD STEER/STEERBase PWG/muon)
+set ( EINCLUDE PWG/FLOW/Base PWG/FLOW/Tasks STEER/ESD STEER/STEERBase PWGJE/EMCALJetTasks/ PWG/muon)

diff --git a/PWG/FLOW/Tasks/AliAnalysisTaskJetFlow.cxx b/PWG/FLOW/Tasks/AliAnalysisTaskJetFlow.cxx
index f7982e9ebb1eef2d5609642a26a584e593ad4407..39db2ff0f3cb3eb1641224a7ed80d90743c6841f 100644 (file)
--- a/PWG/FLOW/Tasks/AliAnalysisTaskJetFlow.cxx
+++ b/PWG/FLOW/Tasks/AliAnalysisTaskJetFlow.cxx
@@ -37,6 +37,7 @@
 #include <TString.h>
 #include <AliAODEvent.h>
 #include <AliESDEvent.h>
+#include <AliEmcalJet.h>
 
 #include "AliAnalysisTaskJetFlow.h"
 
@@ -107,6 +108,7 @@ void AliAnalysisTaskJetFlow::UserExec(Option_t *)
     if(!InputEvent() || !fCutsNull || !fCutsRP) return; // coverity (and sanity)
     // get the jet array, which is added as an extension to the AliVEvent by the jetfinder
     TClonesArray* jets = dynamic_cast<TClonesArray*>(InputEvent()->FindListObject(fJetsName.Data()));
+    Int_t nAcceptedJets(0);
     if(jets) {
         Int_t iJets = jets->GetEntriesFast();
         if(iJets <= 0) {
@@ -122,21 +124,26 @@ void AliAnalysisTaskJetFlow::UserExec(Option_t *)
         fFlowEvent->DefineDeadZone(0, 0, 0, 0);
         // loop over jets and inject them as POI's
         for(Int_t i(0); i < iJets; i++) {
-            AliVParticle* jet = static_cast<AliVParticle*>(jets->At(i));
+            AliEmcalJet* jet = static_cast<AliEmcalJet*>(jets->At(i));
             if(jet) {
-                if(jet->Pt() + fPtBump <= 0) {
+                if(jet->Pt() + fPtBump <= .15) {
                     fHistAnalysisSummary->SetBinContent(4, 1);
                     continue;
                 }
+                nAcceptedJets++;
                 AliFlowTrack* flowTrack = new AliFlowTrack(jet);
-                flowTrack->SetPt(flowTrack->Pt() + fPtBump);
+                flowTrack->SetPt(jet->PtSub() + fPtBump);
                 flowTrack->SetForPOISelection(kTRUE);
                 flowTrack->SetForRPSelection(kFALSE);
                 fFlowEvent->InsertTrack(flowTrack);
-            }       
+            }
         }
     }
     else if(fDebug > 0 ) printf(" Failed to find TClones Jet array while using name %s \n ", fJetsName.Data());
+    if(nAcceptedJets < 1) {
+        printf(" > No accepted jets in event ! < " );
+        return;
+    }
     PostData(1, fOutputList);
     PostData(2, fFlowEvent);
     if(fDebug>0) {

diff --git a/PWGCF/FLOW/macros/AddTaskJetFlow.C b/PWGCF/FLOW/macros/AddTaskJetFlow.C
index 1cf07c2f844a34e59cb1a4190b8a0cb1910efc63..beb2bf1eb8f2d437eb940e81cb85aa598df8e7e8 100644 (file)
--- a/PWGCF/FLOW/macros/AddTaskJetFlow.C
+++ b/PWGCF/FLOW/macros/AddTaskJetFlow.C
@@ -9,7 +9,7 @@ class AliFlowTrackCuts;
 
 void AddTaskJetFlow( TString name    = "name",
                      TString jets    = "jets",
-                     Float_t ptbump  = 200,
+                     Float_t ptbump  = 0,
                      TArrayI* cent   = 0x0,
                      Bool_t debug    = kTRUE  )
 {
@@ -29,7 +29,7 @@ void AddTaskJetFlow( TString name    = "name",
     }
     // check the centrality setup
     if(!cent) {
-        Int_t c[] = {0, 20, 40, 60, 80, 100};
+        Int_t c[] = {0, 10, 30, 50, 70, 90};
         cent = new TArrayI(sizeof(c)/sizeof(c[0]), c);
         printf(" > Setup default centrality binning with %i bins \n ", cent->GetSize());
     }