UserExec becomes Run

diff --git a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
index 87dfaff0dcce6ab996c0160e15a8456eae63f319..f1fa1176624674265a068a08348bf4139d558240 100644 (file)
--- a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
+++ b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.cxx
@@ -217,7 +217,7 @@ void AliAnalysisTaskFlavourJetCorrelations::UserCreateOutputObjects() {
 
 //_______________________________________________________________________________
 
-void AliAnalysisTaskFlavourJetCorrelations::UserExec(Option_t *)
+Bool_t AliAnalysisTaskFlavourJetCorrelations::Run()
 {
    // user exec
    if (!fInitialized){
@@ -259,7 +259,7 @@ void AliAnalysisTaskFlavourJetCorrelations::UserExec(Option_t *)
       mcArray = dynamic_cast<TClonesArray*>(aodEvent->FindListObject(AliAODMCParticle::StdBranchName()));
       if (!mcArray) {
         printf("AliAnalysisTaskSEDStarSpectra::UserExec: MC particles not found!\n");
-        return;
+        return kFALSE;
       }
    }
    
@@ -271,15 +271,15 @@ void AliAnalysisTaskFlavourJetCorrelations::UserExec(Option_t *)
    
    if(!trackArr){
       AliInfo(Form("Could not find the track array\n"));
-      return;
+      return kFALSE;
    }
    
     
    fCandidateArray = dynamic_cast<TClonesArray*>(GetInputData(1));
-   if (!fCandidateArray) return;
+   if (!fCandidateArray) return kFALSE;
    if (fCandidateType==1) {
       fSideBandArray = dynamic_cast<TClonesArray*>(GetInputData(2));
-      if (!fSideBandArray) return;
+      if (!fSideBandArray) return kFALSE;
    }
    //Printf("ncandidates found %d",fCandidateArray->GetEntriesFast());
    
@@ -306,12 +306,12 @@ void AliAnalysisTaskFlavourJetCorrelations::UserExec(Option_t *)
    
    // fix for temporary bug in ESDfilter 
    // the AODs with null vertex pointer didn't pass the PhysSel
-   if(!aodEvent->GetPrimaryVertex() || TMath::Abs(aodEvent->GetMagneticField())<0.001) return;
+   if(!aodEvent->GetPrimaryVertex() || TMath::Abs(aodEvent->GetMagneticField())<0.001) return kFALSE;
    
    //Event selection
    Bool_t iseventselected=fCuts->IsEventSelected(aodEvent);
    TString firedTriggerClasses=((AliAODEvent*)aodEvent)->GetFiredTriggerClasses();
-   if(!iseventselected) return;
+   if(!iseventselected) return kFALSE;
    
    hstat->Fill(1);
 
@@ -330,7 +330,7 @@ void AliAnalysisTaskFlavourJetCorrelations::UserExec(Option_t *)
         hptDPerEvNoJet->Fill(cand->Pt());
       
       }
-      return;
+      return kFALSE;
       
    }
    
@@ -499,7 +499,7 @@ void AliAnalysisTaskFlavourJetCorrelations::UserExec(Option_t *)
    hNJetPerEv->Fill(cntjet);
    if(candidates==0) hNJetPerEvNoD->Fill(cntjet);
    PostData(1,fmyOutput);
-   
+   return kTRUE;
 }
 
 //_______________________________________________________________________________

diff --git a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h
index 2b34d86efb75d883f880ef02edf6289a69ecc52e..d05ab1a954b47112c0a763deaa0676db51b6f815 100644 (file)
--- a/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h
+++ b/PWGJE/FlavourJetTasks/AliAnalysisTaskFlavourJetCorrelations.h
@@ -50,7 +50,7 @@ class AliAnalysisTaskFlavourJetCorrelations : public AliAnalysisTaskEmcalJet
   virtual ~AliAnalysisTaskFlavourJetCorrelations();
 
   virtual void     UserCreateOutputObjects();
-  virtual void     UserExec(Option_t *option);
+  virtual Bool_t   Run();
   virtual void     Terminate(Option_t *);
   virtual void     Init();
   virtual void     LocalInit() {Init();}

diff --git a/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C b/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C
index b40466d384b65aad8e12e9ccfe80177469ae62d7..fda7a5f3b1223a42665622448f5e747c253c6e7b 100644 (file)
--- a/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C
+++ b/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C
@@ -57,6 +57,9 @@ void *AddTaskDFilterAndCorrelations(
   taskFilter->SetMC(theMCon); //D meson settings
   taskFilter->SetUseReco(reco);
   taskFilter->SetName("AliAnalysisTaskSEDmesonsFilterCJ");
+//  taskFilter->SetCaloTriggerPatchInfoName("EmcalTriggers");
+//  taskFilter->SetTriggerTypeSel(AliAnalysisTaskEmcal::kJ1);
+  
   mgr->AddTask(taskFilter);
   
     // create the task
@@ -71,7 +74,9 @@ void *AddTaskDFilterAndCorrelations(
   taskCorr->SetJetAcceptanceType(cutType);
   taskCorr->SetJetPtCut(jptcut);
   taskCorr->SetPercAreaCut(percjetareacut);
-  
+  taskCorr->SetCaloTriggerPatchInfoName("EmcalTriggers");
+  taskCorr->SetTriggerTypeSel(AliAnalysisTaskEmcal::kJ1);
+
   mgr->AddTask(taskCorr);
 
   if(theMCon) {