Check if AliPhysics is installed; instantiate the EMCAL geometry

diff --git a/test/PbPbbench/aod.C b/test/PbPbbench/aod.C
index 249a626e4fbf2f0834996e0d98c1dfae8fd426c0..f3c8077471b128466276a465001e22d7698a67bb 100644 (file)
--- a/test/PbPbbench/aod.C
+++ b/test/PbPbbench/aod.C
@@ -2,12 +2,18 @@ void aod(){
 
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
-    gSystem->Load("libCORRFW");
+
+    if( gSystem->Load("libCORRFW") <0) {
+      cerr << "Error: AliPhysics is not installed, no AOD test is possible!" << endl;
+      return;
+    }
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
     gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
+    AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+
     gROOT->Macro("${ALICE_ROOT}/STEER/macros/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 3f0eef0374737a892bd8385e71e3f904a90e6f3a..b987f3e1b7a39090e0ce177787a3e414784e915c 100644 (file)
--- a/test/PbPbbench/recraw/aod.C
+++ b/test/PbPbbench/recraw/aod.C
@@ -2,12 +2,18 @@ void aod(){
 
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
-    gSystem->Load("libCORRFW");
+
+    if( gSystem->Load("libCORRFW") <0) {
+      cerr << "Error: AliPhysics is not installed, no AOD test is possible!" << endl;
+      return;
+    }
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
     gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
+    AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+
     gROOT->Macro("${ALICE_ROOT}/STEER/macros/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 249a626e4fbf2f0834996e0d98c1dfae8fd426c0..f3c8077471b128466276a465001e22d7698a67bb 100644 (file)
--- a/test/genkine/sim/aod.C
+++ b/test/genkine/sim/aod.C
@@ -2,12 +2,18 @@ void aod(){
 
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
-    gSystem->Load("libCORRFW");
+
+    if( gSystem->Load("libCORRFW") <0) {
+      cerr << "Error: AliPhysics is not installed, no AOD test is possible!" << endl;
+      return;
+    }
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
     gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
+    AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+
     gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAOD.root\",\"local://$ALICE_ROOT/OCDB\",\"local://.\")");
 }

diff --git a/test/gun/aod.C b/test/gun/aod.C
index 249a626e4fbf2f0834996e0d98c1dfae8fd426c0..f3c8077471b128466276a465001e22d7698a67bb 100644 (file)
--- a/test/gun/aod.C
+++ b/test/gun/aod.C
@@ -2,12 +2,18 @@ void aod(){
 
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
-    gSystem->Load("libCORRFW");
+
+    if( gSystem->Load("libCORRFW") <0) {
+      cerr << "Error: AliPhysics is not installed, no AOD test is possible!" << endl;
+      return;
+    }
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
     gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
+    AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+
     gROOT->Macro("${ALICE_ROOT}/STEER/macros/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 3f0eef0374737a892bd8385e71e3f904a90e6f3a..b987f3e1b7a39090e0ce177787a3e414784e915c 100644 (file)
--- a/test/gun/recraw/aod.C
+++ b/test/gun/recraw/aod.C
@@ -2,12 +2,18 @@ void aod(){
 
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
-    gSystem->Load("libCORRFW");
+
+    if( gSystem->Load("libCORRFW") <0) {
+      cerr << "Error: AliPhysics is not installed, no AOD test is possible!" << endl;
+      return;
+    }
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
     gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
+    AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+
     gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }

diff --git a/test/ppbench/aod.C b/test/ppbench/aod.C
index 249a626e4fbf2f0834996e0d98c1dfae8fd426c0..f3c8077471b128466276a465001e22d7698a67bb 100644 (file)
--- a/test/ppbench/aod.C
+++ b/test/ppbench/aod.C
@@ -2,12 +2,18 @@ void aod(){
 
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
-    gSystem->Load("libCORRFW");
+
+    if( gSystem->Load("libCORRFW") <0) {
+      cerr << "Error: AliPhysics is not installed, no AOD test is possible!" << endl;
+      return;
+    }
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
     gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
+    AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+
     gROOT->Macro("${ALICE_ROOT}/STEER/macros/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 3f0eef0374737a892bd8385e71e3f904a90e6f3a..b987f3e1b7a39090e0ce177787a3e414784e915c 100644 (file)
--- a/test/ppbench/recraw/aod.C
+++ b/test/ppbench/recraw/aod.C
@@ -2,12 +2,18 @@ void aod(){
 
     gSystem->Load("libANALYSIS");
     gSystem->Load("libANALYSISalice");
-    gSystem->Load("libCORRFW");
+
+    if( gSystem->Load("libCORRFW") <0) {
+      cerr << "Error: AliPhysics is not installed, no AOD test is possible!" << endl;
+      return;
+    }
     gSystem->Load("libPWGHFbase");
     gSystem->Load("libPWGmuon");
     gSystem->Load("libESDfilter");
     gSystem->Load("libTender");
     gSystem->Load("libPWGPP");
 
+    AliEMCALGeometry::GetInstance("EMCAL_COMPLETEV1");
+
     gROOT->Macro("${ALICE_ROOT}/STEER/macros/CreateAODfromESD.C(\"AliESDs.root\",\"AliAODs.root\",\"local://$ALICE_ROOT/OCDB\",\"local://..\",kFALSE)");
 }