More fixes for running on the grid

diff --git a/PWG4/totEt/macros/CreateAlienHandlerCaloEtSim.C b/PWG4/totEt/macros/CreateAlienHandlerCaloEtSim.C
index 58710f3213fc03c23c0f953c788459c729cf273c..293b9584ad64874a0750241890807b5444b118f7 100644 (file)
--- a/PWG4/totEt/macros/CreateAlienHandlerCaloEtSim.C
+++ b/PWG4/totEt/macros/CreateAlienHandlerCaloEtSim.C
@@ -17,7 +17,7 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
   // Set versions of used packages
    plugin->SetAPIVersion("V1.1x");
    plugin->SetROOTVersion("v5-28-00a");
-   plugin->SetAliROOTVersion("v4-21-17b-AN");
+   plugin->SetAliROOTVersion("v4-21-18a-AN");
   // Declare input data to be processed.
 
   // Method 1: Create automatically XML collections using alien 'find' command.
@@ -58,9 +58,9 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
   plugin->AddIncludePath("-I. -I$ALICE_ROOT/EMCAL -I$ALICE_ROOT/ANALYSIS");
 
   // No need for output file names. Procedure is automatic. <-- not true
-  plugin->SetDefaultOutputs(kFALSE);
+  //plugin->SetDefaultOutputs(kFALSE);
   //plugin->SetOutputFiles(outputName.Data());
-  plugin->SetOutputFiles("Et.ESD.sim.EMCAL.root event_stat.root");
+  //plugin->SetOutputFiles("Et.ESD.sim.EMCAL.root event_stat.root");
   // No need define the files to be archived. Note that this is handled automatically by the plugin.
   //   plugin->SetOutputArchive("log_archive.zip:stdout,stderr");
   // Set a name for the generated analysis macro (default MyAnalysis.C) Make this unique !
@@ -71,7 +71,7 @@ AliAnalysisGrid* CreateAlienHandlerCaloEtSim(TString outputDir, TString outputNa
   // Optionally set number of failed jobs that will trigger killing waiting sub-jobs.
   plugin->SetMaxInitFailed(5);
   // Optionally resubmit threshold.
-  plugin->SetMasterResubmitThreshold(90);
+  //plugin->SetMasterResubmitThreshold(10);
   // Optionally set time to live (default 30000 sec)
   plugin->SetTTL(20000);
   // Optionally set input format (default xml-single)

diff --git a/PWG4/totEt/macros/runCaloEt.C b/PWG4/totEt/macros/runCaloEt.C
index 5eb887ce7bb26056599ec7b2843e209711074147..649650b58b843d2e02c4cd24dbb3afa13fd2a10b 100644 (file)
--- a/PWG4/totEt/macros/runCaloEt.C
+++ b/PWG4/totEt/macros/runCaloEt.C
@@ -7,7 +7,7 @@
 void runCaloEt(bool submit = false, // true or false 
               const char *dataType="sim", // "sim" or "real" etc.
               const char *pluginRunMode="full", // "test" or "full" or "terminate"
-              const char *det = "PHOS") // "PHOS" or "EMCAL"
+              const char *det = "EMCAL") // "PHOS" or "EMCAL"
 {
   TStopwatch timer;
   timer.Start();
@@ -118,6 +118,7 @@ void runCaloEt(bool submit = false, // true or false
   gROOT->ProcessLine(".L $ALICE_ROOT/ANALYSIS/macros/AddTaskPhysicsSelection.C");
   
   AliPhysicsSelectionTask *physicsSelectionTask = AddTaskPhysicsSelection(isMc);//isMC is true when processing monte carlo
+
   if(isPb){     
     gROOT->ProcessLine(".L $ALICE_ROOT/ANALYSIS/macros/AddTaskCentrality.C");
     gROOT->ProcessLine(".L AliCentralitySelectionTask.cxx++g");
@@ -134,11 +135,6 @@ void runCaloEt(bool submit = false, // true or false
   //____________________________________________//
   mgr->ConnectInput(task1,0,cinput1);
   mgr->ConnectOutput(task1,1,coutput1);
-
-
-    AliAnalysisDataContainer *coutput1 = mgr->CreateContainer("out2", TList::Class(), AliAnalysisManager::kOutputContainer,"event_stat.root");
-    mgr->ConnectInput(physicsSelectionTask,0,cinput1);
-    mgr->ConnectOutput(physicsSelectionTask,1,coutput1);
   
   mgr->SetDebugLevel(0);