Changed location of AddTaskProtons.C to PWG2/SPECTRA/macros. Removed macro from ANALY...

diff --git a/ANALYSIS/macros/AddTaskProtons.C b/ANALYSIS/macros/AddTaskProtons.C
deleted file mode 100644 (file)
index 161f37e..0000000
--- a/ANALYSIS/macros/AddTaskProtons.C
+++ /dev/null
@@ -1,43 +0,0 @@
-AliAnalysisTaskProtons *AddTaskProtons(const char *analysisType="Hybrid",
-                                       const char *pidMode="Bayesian")
-{
-// Creates a proton analysis task and adds it to the analysis manager.
-   
-   // Get the pointer to the existing analysis manager via the static access method.
-   //==============================================================================
-   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
-   if (!mgr) {
-      Error("AddTaskESDFilter", "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("AddTaskProtons", "This task requires an input event handler");
-      return NULL;
-   }   
-   TString type = mgr->GetInputEventHandler()->GetDataType(); // can be "ESD" or "AOD"
-   gROOT->LoadMacro("$ALICE_ROOT/PWG2/configProtonAnalysis.C");
-   AliProtonAnalysis *pa = 0;
-   if (type=="ESD") pa = GetProtonAnalysisObject("ESD", analysisType, pidMode);
-   else if (type=="AOD") pa = GetProtonAnalysisObject("AOD", analysisType, pidMode);
-   else pa = GetProtonAnalysisObject("MC", analysisType, pidMode);
-
-   // Create the task, add it to manager and configure it.
-   //===========================================================================
-   AliAnalysisTaskProtons *taskproton = new AliAnalysisTaskProtons("TaskProtons");
-   mgr->AddTask(taskproton);
-   taskproton->SetAnalysisObject(pa);
-      
-   // Create ONLY the output containers for the data produced by the task.
-   // Get and connect other common input/output containers via the manager as below
-   //==============================================================================
-   AliAnalysisDataContainer *cout_proton = mgr->CreateContainer("protonhist", TList::Class(),
-                 AliAnalysisManager::kOutputContainer,"protonhist.root");                              
-   mgr->ConnectInput(taskproton, 0, mgr->GetCommonInputContainer());
-   mgr->ConnectOutput(taskproton, 0, cout_proton);
-
-   // Return task pointer at the end
-   return taskproton;
-}

diff --git a/ANALYSIS/macros/AnalysisTrainNew.C b/ANALYSIS/macros/AnalysisTrainNew.C
index 32ee29327ae740c0f532d3e5c028ba65195aac47..e0d33bbcbdc3c12f5d59402d333872d29b0049b9 100644 (file)
--- a/ANALYSIS/macros/AnalysisTrainNew.C
+++ b/ANALYSIS/macros/AnalysisTrainNew.C
@@ -630,7 +630,7 @@ AliAnalysisGrid* CreateAlienHandler(const char *plugin_mode)
 // Set the run mode (can be "full", "test", "offline", "submit" or "terminate")
    plugin->SetRunMode(plugin_mode);
    plugin->SetNtestFiles(1);
-   plugin->SetPreferedSE("ALICE::NIHAM::FILE");
+//   plugin->SetPreferedSE("ALICE::NIHAM::FILE");
 // Set versions of used packages
    plugin->SetAPIVersion("V2.4");
    plugin->SetROOTVersion(root_version);
@@ -686,7 +686,7 @@ AliAnalysisGrid* CreateAlienHandler(const char *plugin_mode)
 //   plugin->SetOutputArchive("log_archive.zip:stdout,stderr@ALICE::NIHAM::File root_archive.zip:*.root@ALICE::NIHAM::File");
    plugin->SetOutputArchive("log_archive.zip:stdout,stderr");
 // Optionally set a name for the generated analysis macro (default MyAnalysis.C)
-   plugin->SetAnalysisMacro("testAnalysis.C");
+   plugin->SetAnalysisMacro("AnalysisTrainGrid.C");
 // Optionally set maximum number of input files/subjob (default 100, put 0 to ignore)
    plugin->SetSplitMaxInputFileNumber(50);
 // Optionally set number of failed jobs that will trigger killing waiting sub-jobs.
@@ -698,7 +698,9 @@ AliAnalysisGrid* CreateAlienHandler(const char *plugin_mode)
 // Optionally set input format (default xml-single)
    plugin->SetInputFormat("xml-single");
 // Optionally modify the name of the generated JDL (default analysis.jdl)
-   plugin->SetJDLName("testAnalysis.jdl");
+   plugin->SetJDLName("AnalysisTrain.jdl");
+// Optionally modify the executable name (default analysis.sh)
+   plugin->SetExecutable("AnalysisTrain.sh");
 // Optionally modify job price (default 1)
    plugin->SetPrice(1);      
 // Optionally modify split mode (default 'se')