adapt macros

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEmcalClusTrackMatcher.C b/PWGGA/EMCALTasks/macros/AddTaskEmcalClusTrackMatcher.C
index 80659b999a81aedcb31a2a530d13ee48d078b8b4..39be03a80d6378c0b0e71f69bcd0300768ff07ec 100644 (file)
--- a/PWGGA/EMCALTasks/macros/AddTaskEmcalClusTrackMatcher.C
+++ b/PWGGA/EMCALTasks/macros/AddTaskEmcalClusTrackMatcher.C
@@ -3,6 +3,7 @@
 AliEmcalClusTrackMatcherTask* AddTaskEmcalClusTrackMatcher(
   const char *nTracks    = "Tracks",
   const char *nClusters  = "CaloClusters",
+  Double_t maxDist       = 0.1,
   Bool_t doClusTrack     = kTRUE,
   Bool_t doTrackClus     = kFALSE
 )
@@ -28,11 +29,13 @@ AliEmcalClusTrackMatcherTask* AddTaskEmcalClusTrackMatcher(
   // Init the task and do settings
   //-------------------------------------------------------
   TString name(Form("ClusTrackMatcher_%s_%s",nTracks,nClusters));
-  AliEmcalClusTrackMatcherTask* matcher = new AliEmcalClusTrackMatcherTask(name);//name.Data());
+  AliEmcalClusTrackMatcherTask* matcher = new AliEmcalClusTrackMatcherTask(name);
   matcher->SetTracksName(nTracks);
   matcher->SetClusName(nClusters);
   matcher->SetDoClusTrackMatching(doClusTrack);
   matcher->SetDoTrackClusMatching(doTrackClus);
+  matcher->SetMaxDistance(maxDist);
+  matcher->SetAnaType(AliAnalysisTaskEmcal::kEMCAL);
 
   //-------------------------------------------------------
   // Final settings, pass to manager and set the containers

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEmcalParticleMaker.C b/PWGGA/EMCALTasks/macros/AddTaskEmcalParticleMaker.C
new file mode 100644 (file)
index 0000000..69ad741
--- /dev/null
+++ b/PWGGA/EMCALTasks/macros/AddTaskEmcalParticleMaker.C
@@ -0,0 +1,49 @@
+// $Id$
+
+AliEmcalParticleMaker* AddTaskEmcalParticleMaker(
+  const char *taskName            = "AliEmcalParticleMaker",
+  const char *tracksName          = "PicoTracks",
+  const char *clustersName        = "CaloClusters",
+  const char *tracksOutName       = "EmcalTracks",
+  const char *clustersOutName     = "EmcalClusters"
+)
+{  
+  // Get the pointer to the existing analysis manager via the static access method.
+  //==============================================================================
+  AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+  if (!mgr)
+  {
+    ::Error("AddTaskEmcalParticleMaker", "No analysis manager to connect to.");
+    return NULL;
+  }  
+  
+  // Check the analysis type using the event handlers connected to the analysis manager.
+  //==============================================================================
+  if (!mgr->GetInputEventHandler())
+  {
+    ::Error("AddTaskEmcalParticleMaker", "This task requires an input event handler");
+    return NULL;
+  }
+  
+  //-------------------------------------------------------
+  // Init the task and do settings
+  //-------------------------------------------------------
+
+  AliEmcalParticleMaker *eTask = new AliEmcalParticleMaker(taskName);
+  eTask->SetTracksName(tracksName);
+  eTask->SetClusName(clustersName);
+  eTask->SetTracksOutName(tracksOutName);
+  eTask->SetClusOutName(clustersOutName);
+  eTask->SetAnaType(AliAnalysisTaskEmcal::kEMCAL);
+
+  //-------------------------------------------------------
+  // Final settings, pass to manager and set the containers
+  //-------------------------------------------------------
+  mgr->AddTask(eTask);
+  
+  // Create containers for input/output
+  AliAnalysisDataContainer *cinput1  = mgr->GetCommonInputContainer();
+  mgr->ConnectInput  (eTask, 0,  cinput1 );
+  
+  return eTask;
+}

diff --git a/PWGGA/EMCALTasks/macros/AddTaskEmcalPicoTrackMaker.C b/PWGGA/EMCALTasks/macros/AddTaskEmcalPicoTrackMaker.C
index af08fff04ae7348de103099027b1a6e6a7e12dd6..978af018cd4a80a59ef72baf413a21e4ba8058f6 100644 (file)
--- a/PWGGA/EMCALTasks/macros/AddTaskEmcalPicoTrackMaker.C
+++ b/PWGGA/EMCALTasks/macros/AddTaskEmcalPicoTrackMaker.C
@@ -36,7 +36,7 @@ AliEmcalPicoTrackMaker* AddTaskEmcalPicoTrackMaker(
   }
   else {
     if (!cuts)
-      AliWarning(Form("Run period %s not known. AOD filter bit not set.", renPeriod));
+      ::Warning(Form("Run period %s not known. AOD filter bit not set.", runPeriod));
   }
   eTask->SetESDtrackCuts(cuts);