fixes from Ruediger for Lego train

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C b/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C
index cdc1b46a610c64da358c1cd3d648e35e08ab5157..8886aa5ca837977c3d172ad1bd9453ee1db0735f 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C
@@ -41,9 +41,9 @@ AliAnalysisTaskChargedJetsPA* AddTaskChargedJetsPA(
   }
   TString myContName("");
   if(isMC)
-    myContName = Form("ChargedJetsPA_R0%2.0f_%s_MC",jetRadius*100,triggerName.Data());
+    myContName = Form("AnalysisR0%2.0f_%s_MC",jetRadius*100,triggerName.Data());
   else
-    myContName = Form("ChargedJetsPA_R0%2.0f_%s",jetRadius*100,triggerName.Data());
+    myContName = Form("AnalysisR0%2.0f_%s",jetRadius*100,triggerName.Data());
 
   // #### Add necessary jet finder tasks
   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C");
@@ -52,7 +52,7 @@ AliAnalysisTaskChargedJetsPA* AddTaskChargedJetsPA(
 
   // #### Define analysis task
   AliAnalysisTaskChargedJetsPA *task = NULL;
-  contHistos = manager->CreateContainer(myContName.Data(), TList::Class(), AliAnalysisManager::kOutputContainer, kFileName);
+  contHistos = manager->CreateContainer(myContName.Data(), TList::Class(), AliAnalysisManager::kOutputContainer, Form("%s:ChargedJetsPA", AliAnalysisManager::GetCommonFileName()));
   task = new AliAnalysisTaskChargedJetsPA(Form("AnalysisPA_%s_%s", jetFinderTask->GetName(), triggerName.Data()), usedTracks, usedClusters, jetFinderTask->GetName(),jetFinderTaskKT->GetName());
 
   // #### Task preferences

diff --git a/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C b/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C
index bb64852d7bc89fde95848a769b514f7603143b0b..1823942caa0e42876099d9726753f427856bcc5a 100644 (file)
--- a/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C
+++ b/PWGJE/EMCALJetTasks/macros/AddTaskJetPreparation.C
@@ -1,6 +1,6 @@
 // $Id$
 
-void AddTaskJetPreparation(
+AliAnalysisTaskSE* AddTaskJetPreparation(
   const char*    dataType           = "ESD",
   const char*    periodstr          = "LHC11h",
   const char*    usedTracks         = "PicoTracks",
@@ -92,4 +92,7 @@ void AddTaskJetPreparation(
     AliEmcalMCTrackSelector *mcPartTask = AddTaskMCTrackSelector(usedMCParticles, kFALSE, kFALSE);
     mcPartTask->SelectCollisionCandidates(pSel);
   }
+
+  // Return one task that represents the jet preparation on LEGO trains
+  return emcalParts;
 }