Recover the AOD test

diff --git a/STEER/CreateAODfromESD.C b/STEER/CreateAODfromESD.C
index 5772a1f56f0801defff2fd499ea2e15bda03eb8b..cc31e2c3df79250117de750845129f94f5c6cfbd 100644 (file)
--- a/STEER/CreateAODfromESD.C
+++ b/STEER/CreateAODfromESD.C
@@ -1,3 +1,4 @@
+#include <cstring>
 #include <TChain.h>
 #include <TSystem.h>
 #include "AliAnalysisManager.h"
@@ -5,26 +6,15 @@
 #include "AliAODHandler.h"
 #include "AliAnalysisTaskESDfilter.h"
 #include "AliAnalysisDataContainer.h"
+#include "AliTaskCDBconnect.h"
 
 void CreateAODfromESD(const char *inFileName = "AliESDs.root",
                      const char *outFileName = "AliAOD.root",
+                     const char *cdbLocation = "raw://",
+                     const char *grpSpecific = "",
                      Bool_t bKineFilter = kTRUE) 
 {
   
-    // gSystem->Load("libTree");
-    // gSystem->Load("libGeom");
-    // gSystem->Load("libPhysics");
-    // gSystem->Load("libVMC");
-    // gSystem->Load("libSTEERBase");
-    // gSystem->Load("libESD");
-    // gSystem->Load("libAOD");
-    
-    // gSystem->Load("libANALYSIS");
-    // gSystem->Load("libANALYSISalice");
-    // gSystem->Load("libCORRFW");
-    // gSystem->Load("libPWGHFbase");
-    // gSystem->Load("libPWGmuon");
-
     TChain *chain = new TChain("esdTree");
     // Steering input chain
     chain->Add(inFileName);
@@ -34,6 +24,7 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     AliESDInputHandler* inpHandler = new AliESDInputHandler();
     inpHandler->SetReadFriends(kFALSE);
     inpHandler->SetReadTags();
+    inpHandler->NeedField();
     mgr->SetInputEventHandler  (inpHandler);
     // Output
     AliAODHandler* aodHandler   = new AliAODHandler();
@@ -53,6 +44,14 @@ void CreateAODfromESD(const char *inFileName = "AliESDs.root",
     // to the AODHandler, this will not be needed when
     // AODHandler goes to ANALYSISalice
     
+    // Connect CDB: needed by AliEMCALRecoUtils
+    Int_t run=-1; // Do not use 0, it is the default MC run
+    AliTaskCDBconnect *task= new AliTaskCDBconnect("CDBconnect", cdbLocation, run);
+    if (strlen(grpSpecific)>0) task->SetSpecificStorage("GRP/GRP/Data",grpSpecific);
+    mgr->AddTask(task);
+    AliAnalysisDataContainer *cinput0 = mgr->GetCommonInputContainer();    
+    mgr->ConnectInput(task,  0, cinput0);
+
     // Barrel Tracks
     AliAnalysisTaskESDfilter *filter = new AliAnalysisTaskESDfilter("Filter");
     mgr->AddTask(filter);

diff --git a/test/PbPbbench/aod.C b/test/PbPbbench/aod.C
index 46f64e4a6ed33023fdac16956497edcc7260f893..911379c34bdcf7791f4b5c9e989a3b7dd6166a78 100644 (file)
--- a/test/PbPbbench/aod.C
+++ b/test/PbPbbench/aod.C
@@ -5,6 +5,9 @@ void aod(){
     gSystem->Load("libCORRFW");
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C");
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }

diff --git a/test/PbPbbench/recraw/aod.C b/test/PbPbbench/recraw/aod.C
index 4835a68d03cd1551249dfd432d3ee55979ad3e28..55bfd5f804c1681f28a2bcc3ef46c67e136d9557 100644 (file)
--- a/test/PbPbbench/recraw/aod.C
+++ b/test/PbPbbench/recraw/aod.C
@@ -5,6 +5,9 @@ void aod(){
     gSystem->Load("libCORRFW");
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",kFALSE)");
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }

diff --git a/test/genkine/sim/aod.C b/test/genkine/sim/aod.C
index 46f64e4a6ed33023fdac16956497edcc7260f893..911379c34bdcf7791f4b5c9e989a3b7dd6166a78 100644 (file)
--- a/test/genkine/sim/aod.C
+++ b/test/genkine/sim/aod.C
@@ -5,6 +5,9 @@ void aod(){
     gSystem->Load("libCORRFW");
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C");
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }

diff --git a/test/gun/aod.C b/test/gun/aod.C
index 46f64e4a6ed33023fdac16956497edcc7260f893..911379c34bdcf7791f4b5c9e989a3b7dd6166a78 100644 (file)
--- a/test/gun/aod.C
+++ b/test/gun/aod.C
@@ -5,6 +5,9 @@ void aod(){
     gSystem->Load("libCORRFW");
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C");
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }

diff --git a/test/gun/recraw/aod.C b/test/gun/recraw/aod.C
index 4835a68d03cd1551249dfd432d3ee55979ad3e28..55bfd5f804c1681f28a2bcc3ef46c67e136d9557 100644 (file)
--- a/test/gun/recraw/aod.C
+++ b/test/gun/recraw/aod.C
@@ -5,6 +5,9 @@ void aod(){
     gSystem->Load("libCORRFW");
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",kFALSE)");
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }

diff --git a/test/merge/runtest.sh b/test/merge/runtest.sh
index 49b3f43b0f5c01fc5db73f4281774fd1bd9dfe5b..0c97834e2805ddba3094396e9f8a8ca3dcc34fae 100755 (executable)
--- a/test/merge/runtest.sh
+++ b/test/merge/runtest.sh
@@ -4,12 +4,12 @@ cd ./backgr
 aliroot -b -q sim.C\(2\) 2>&1 | tee sim.log
 aliroot -b -q rec.C      2>&1 | tee rec.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+aliroot -b -q aod.C 2>&1 | tee aod.log
 chmod a-w *.root
 cd ../signal
 aliroot -b -q sim.C\(6\) 2>&1 | tee sim.log
 aliroot -b -q rec.C      2>&1 | tee rec.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
+aliroot -b -q aod.C 2>&1 | tee aod.log
 
 

diff --git a/test/pileup/aod.C b/test/pileup/aod.C
index a87c0b34b1b1ebb75bfc856c3cf199ec2d4bd91c..64e6aae0f5ab7bad93b5aea47ddca39de2896bbc 100644 (file)
--- a/test/pileup/aod.C
+++ b/test/pileup/aod.C
@@ -1,16 +1,19 @@
 void aod(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
   gSystem->Load("liblhapdf");      // Parton density functions
   gSystem->Load("libEGPythia6");   // TGenerator interface
   gSystem->Load("libpythia6");     // Pythia
   gSystem->Load("libAliPythia6");  // ALICE specific implementations
   gSystem->Load("libdpmjet");
   gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CreateAODfromESD.C");
+ 
+  gSystem->Load("libANALYSIS");
+  gSystem->Load("libANALYSISalice");
+  gSystem->Load("libCORRFW");
+  gSystem->Load("libPWGHFbase");
+  gSystem->Load("libPWGmuon");
+  gSystem->Load("libESDfilter");
+  gSystem->Load("libTENDER");
+  gSystem->Load("libPWGPP");
+
+  gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }

diff --git a/test/pileup/runtest.sh b/test/pileup/runtest.sh
index 0b175ca78b66a05a0d15e206e43cd892144ec3a9..92904a31ac4e4260f4d85ee4aca65851f67b703b 100755 (executable)
--- a/test/pileup/runtest.sh
+++ b/test/pileup/runtest.sh
@@ -1,11 +1,5 @@
 #!/bin/sh
-if [ "$ALICE_TARGET" = "win32gcc" ]
-    then
-    REXE=root_exe.exe
-else
-    REXE=aliroot
-fi
-
+REXE=aliroot
 
 rm -rf *.root *.dat *.log fort* hlt hough raw* *.inp *.o
 ${REXE} -b -q sim.C      2>&1 | tee sim.log

diff --git a/test/ppbench/aod.C b/test/ppbench/aod.C
index 46f64e4a6ed33023fdac16956497edcc7260f893..911379c34bdcf7791f4b5c9e989a3b7dd6166a78 100644 (file)
--- a/test/ppbench/aod.C
+++ b/test/ppbench/aod.C
@@ -5,6 +5,9 @@ void aod(){
     gSystem->Load("libCORRFW");
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C");
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }

diff --git a/test/ppbench/recraw/aod.C b/test/ppbench/recraw/aod.C
index 4835a68d03cd1551249dfd432d3ee55979ad3e28..55bfd5f804c1681f28a2bcc3ef46c67e136d9557 100644 (file)
--- a/test/ppbench/recraw/aod.C
+++ b/test/ppbench/recraw/aod.C
@@ -5,6 +5,9 @@ void aod(){
     gSystem->Load("libCORRFW");
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
+    gSystem->Load("libESDfilter");
+    gSystem->Load("libTENDER");
+    gSystem->Load("libPWGPP");
 
-    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",kFALSE)");
+    gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }

diff --git a/test/pploadlibs/aod.C b/test/pploadlibs/aod.C
index ed9687f7c9b37119cf71a44e986edb20aa4c5393..a84ebd0b9621f3349dc15dda5daebb85c0f39cf5 100644 (file)
--- a/test/pploadlibs/aod.C
+++ b/test/pploadlibs/aod.C
@@ -7,6 +7,9 @@ void aod(){
   gSystem->Load("libCORRFW");
   gSystem->Load("libPWGHFbase");
   gSystem->Load("libPWGmuon");
-
-  gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C");
+  gSystem->Load("libESDfilter");
+  gSystem->Load("libTENDER");
+  gSystem->Load("libPWGPP");
+  
+  gROOT->Macro("${ALICE_ROOT}/STEER/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }