Solve bug #89021 - macros do not neet to do gEve->GetDefaultGeometry() but AliEveEven...

diff --git a/EVE/alice-macros/aod_HF.C b/EVE/alice-macros/aod_HF.C
index ade99e1c0012db2014562a31967fd2ee62ce7093..5460c0df5623ccf899d007b16811a9b21fd91ac0 100644 (file)
--- a/EVE/alice-macros/aod_HF.C
+++ b/EVE/alice-macros/aod_HF.C
@@ -24,9 +24,9 @@
 #include <AliAODMCParticle.h>
 #include <AliESDtrack.h>
 #include <AliESDEvent.h>
-#include <PWG3/vertexingHF/AliAODRecoDecayHF.h>
-#include <PWG3/vertexingHF/AliAODRecoDecayHF2Prong.h>
-#include <PWG3/vertexingHF/macros/LoadLibraries.C>
+#include <PWGHF/vertexingHF/AliAODRecoDecayHF.h>
+#include <PWGHF/vertexingHF/AliAODRecoDecayHF2Prong.h>
+#include <PWGHF/vertexingHF/macros/LoadLibraries.C>
 #include <AliEveHF.h>
 #include <AliEveEventManager.h>
 #else
@@ -83,7 +83,7 @@ AliEveHFList* aod_HF()
 {
   Bool_t useParFiles=kFALSE;
   
-  TEveUtil::LoadMacro("$ALICE_ROOT/PWG3/vertexingHF/macros/LoadLibraries.C+");
+  TEveUtil::LoadMacro("$ALICE_ROOT/PWGHF/vertexingHF/macros/LoadLibraries.C+");
   LoadLibraries(useParFiles);
   
   AliAODEvent* aod = AliEveEventManager::AssertAOD();

diff --git a/EVE/alice-macros/geom_acorde.C b/EVE/alice-macros/geom_acorde.C
index 468d2b6dfbde721f9e75f53bf7f64c7f8d4779af..76148135b0bee2874866261743fad8615cfede3d 100644 (file)
--- a/EVE/alice-macros/geom_acorde.C
+++ b/EVE/alice-macros/geom_acorde.C
@@ -20,7 +20,6 @@
 void geom_acorde()
 {
   AliEveEventManager::AssertGeometry();
-  //gEve->GetDefaultGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("ACORDE_1");
   if (!node) {

diff --git a/EVE/alice-macros/geom_all.C b/EVE/alice-macros/geom_all.C
index 83be8d37fadd3f1053cf259dd121e6f939bd44a1..ffd589ad7d085ab55420ab403e901f876e0019e3 100644 (file)
--- a/EVE/alice-macros/geom_all.C
+++ b/EVE/alice-macros/geom_all.C
@@ -12,11 +12,13 @@
 #include <TGeoNode.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_all()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TEveGeoTopNode* topn_re = new TEveGeoTopNode(gGeoManager, gGeoManager->GetTopNode());
   gEve->AddGlobalElement(topn_re);

diff --git a/EVE/alice-macros/geom_ddip.C b/EVE/alice-macros/geom_ddip.C
index d4ad06ce1a476001ba95b40fd3d21cb6157027b4..bd6d4b4dedfe8eda7db61515bdaf72226eb57034 100644 (file)
--- a/EVE/alice-macros/geom_ddip.C
+++ b/EVE/alice-macros/geom_ddip.C
@@ -12,13 +12,19 @@
 #include <TGeoNode.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_ddip()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("DDIP_1");
+  if (!node) {
+    Warning("geom_ddip()", "Node DDIP_1 not found.");
+    return;
+  }  
 
   TEveGeoTopNode* re = new TEveGeoTopNode(gGeoManager, node);
   re->UseNodeTrans();

diff --git a/EVE/alice-macros/geom_emcal.C b/EVE/alice-macros/geom_emcal.C
index 00120c9ef700e4d0e3d1ef15b3c25945eff58002..29e9b0e37d4c39fca7146b11403f5871f645051e 100644 (file)
--- a/EVE/alice-macros/geom_emcal.C
+++ b/EVE/alice-macros/geom_emcal.C
@@ -12,14 +12,20 @@
 #include <TGeoNode.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_emcal()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("XEN1_1");
-
+  if (!node) {
+    Warning("geom_emcal()", "Node XEN1_1 not found.");
+    return;
+  }
+  
   TEveGeoTopNode* emcal_re = new TEveGeoTopNode(gGeoManager, node);
   gEve->AddGlobalElement(emcal_re);
   gEve->Redraw3D();

diff --git a/EVE/alice-macros/geom_hmpid.C b/EVE/alice-macros/geom_hmpid.C
index d7e0f55ace4c5cb16539f21897841506d1bcbca2..b97f2061d3b619985bfe1bfb8519e0137b537d4b 100644 (file)
--- a/EVE/alice-macros/geom_hmpid.C
+++ b/EVE/alice-macros/geom_hmpid.C
@@ -11,11 +11,13 @@
 #include <TGeoManager.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_hmpid()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TEveElementList* list = new TEveElementList("HMPID");
   gEve->AddGlobalElement(list);

diff --git a/EVE/alice-macros/geom_its.C b/EVE/alice-macros/geom_its.C
index 5fe369516476a25977e3bc9cc8444d8c594bbc7f..41f4569c3961dd79042dd3ae29bd4965a00b05ec 100644 (file)
--- a/EVE/alice-macros/geom_its.C
+++ b/EVE/alice-macros/geom_its.C
@@ -11,11 +11,13 @@
 #include <TGeoManager.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_its()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("ITSV_1");
 
@@ -25,7 +27,7 @@ void geom_its()
 
 void geom_its_spd()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("ITSV_1");
   node = node->GetVolume()->FindNode("ITSSPD_1");
@@ -37,7 +39,7 @@ void geom_its_spd()
 
 void geom_its_sdd()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   //TEveGeoTopNode *its_re;
   TGeoNode       *n1, *n2;
@@ -55,7 +57,7 @@ void geom_its_sdd()
 
 void geom_its_ssd()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   //TEveGeoTopNode *its_re;
   TGeoNode       *n1, *n2;

diff --git a/EVE/alice-macros/geom_phos.C b/EVE/alice-macros/geom_phos.C
index a57fe07a6388f350c7719451146de13271af06f4..becc16a7c2d0318103f2a3b74c00ccd15cafa0d3 100644 (file)
--- a/EVE/alice-macros/geom_phos.C
+++ b/EVE/alice-macros/geom_phos.C
@@ -11,11 +11,13 @@
 #include <TGeoManager.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_phos()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TEveElementList* list = new TEveElementList("PHOS");
   gEve->AddGlobalElement(list);

diff --git a/EVE/alice-macros/geom_pmd.C b/EVE/alice-macros/geom_pmd.C
index 2be4d8260b721a275352bdc726bd426cdf8b4ad2..0bcd817d4f170d64f94d8530eae065c8afba90c5 100644 (file)
--- a/EVE/alice-macros/geom_pmd.C
+++ b/EVE/alice-macros/geom_pmd.C
@@ -11,11 +11,13 @@
 #include <TGeoManager.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_pmd()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   for(Int_t i=1; i<=4; ++i) {
     //PH The line below is replaced waiting for a fix in Root

diff --git a/EVE/alice-macros/geom_t0.C b/EVE/alice-macros/geom_t0.C
index 0b3dc431ac908323cc776faf2beba126c8ecc18e..79a3703b73ca4f18d27d61a5d38e53ddf64d2c3e 100644 (file)
--- a/EVE/alice-macros/geom_t0.C
+++ b/EVE/alice-macros/geom_t0.C
@@ -13,11 +13,13 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_t0()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TEveElementList* list = new TEveElementList("T0");
   gEve->AddGlobalElement(list);

diff --git a/EVE/alice-macros/geom_tpc.C b/EVE/alice-macros/geom_tpc.C
index c1428c2cc3aef554e7fbcd3d23ac1293928acf8d..3539c9d7883a9792346a98c2d416497f23bb63cc 100644 (file)
--- a/EVE/alice-macros/geom_tpc.C
+++ b/EVE/alice-macros/geom_tpc.C
@@ -12,11 +12,13 @@
 #include <TGeoNode.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_tpc()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("TPC_M_1");
 

diff --git a/EVE/alice-macros/geom_trd_tof.C b/EVE/alice-macros/geom_trd_tof.C
index 3d8ffbd8eacd82e68f16e14bfd8afd048ccf288c..cdb466730d4a03048b16d1b3a2787035f5d24e2e 100644 (file)
--- a/EVE/alice-macros/geom_trd_tof.C
+++ b/EVE/alice-macros/geom_trd_tof.C
@@ -12,11 +12,13 @@
 #include <TGeoNode.h>
 #include <TEveManager.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_trd_tof()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("B077_1");
 

diff --git a/EVE/alice-macros/geom_vzero.C b/EVE/alice-macros/geom_vzero.C
index 75218a0a08dee2a89a6ce49cac3192e6379696a1..604d588aa274e76a231f0401d156e5613d4a3f2c 100644 (file)
--- a/EVE/alice-macros/geom_vzero.C
+++ b/EVE/alice-macros/geom_vzero.C
@@ -13,13 +13,15 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_vzero()
 {
   static const TEveException kEH("geom_vzero() ");
 
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TEveElementList* list = new TEveElementList("VZero");
   gEve->AddGlobalElement(list);

diff --git a/EVE/alice-macros/geom_zdc.C b/EVE/alice-macros/geom_zdc.C
index be85ffe38e33be46aac71fcab40388bb7f381e2d..125f546eb44be868db634384bdcb02b05a35bd74 100644 (file)
--- a/EVE/alice-macros/geom_zdc.C
+++ b/EVE/alice-macros/geom_zdc.C
@@ -13,11 +13,13 @@
 #include <TEveManager.h>
 #include <TEveElement.h>
 #include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
 #endif
 
 void geom_zdc()
 {
-  gGeoManager = gEve->GetDefaultGeometry();
+  AliEveEventManager::AssertGeometry();
 
   TEveElementList* list = new TEveElementList("ZDC");
   gEve->AddGlobalElement(list);

diff --git a/EVE/alice-macros/tof_digits.C b/EVE/alice-macros/tof_digits.C
index b165a5d790fbbcd116acdd15c3b491815d708143..6ff79dae0eba24462e5645aab1c5f284ae96ef8a 100644 (file)
--- a/EVE/alice-macros/tof_digits.C
+++ b/EVE/alice-macros/tof_digits.C
@@ -26,7 +26,7 @@ void tof_digits()
 {  
   TClonesArray *array = 0x0;
 
-  TGeoManager *localGeoManager = gEve->GetGeometry("./geometry.root");//  gGeoManager = gEve->GetDefaultGeometry();
+  TGeoManager *localGeoManager = AliEveEventManager::AssertGeometry();
   if (!localGeoManager) {
     printf("ERROR: no TGeo\n");
   }

diff --git a/EVE/alice-macros/tof_digits_sector.C b/EVE/alice-macros/tof_digits_sector.C
index 8c35562a65075d6b4499ce54000734a4ff46ac87..2efcdf5d1bde0434e7fcf66b4f748e7199c52c0b 100644 (file)
--- a/EVE/alice-macros/tof_digits_sector.C
+++ b/EVE/alice-macros/tof_digits_sector.C
@@ -24,7 +24,7 @@
 void tof_digits_sector(Int_t sector=0)
 {
   
-  TGeoManager *localGeoManager = gEve->GetGeometry("./geometry.root");//  gGeoManager = gEve->GetDefaultGeometry();
+  TGeoManager *localGeoManager = AliEveEventManager::AssertGeometry(); //gEve->GetGeometry("./geometry.root");
   if (!localGeoManager) {
     printf("ERROR: no TGeo\n");
   }

diff --git a/EVE/alice-macros/tof_digits_strips.C b/EVE/alice-macros/tof_digits_strips.C
index 5deb20b19546a9468b19c4eb82377a5bdc802222..143818d4233f1305daef38e5777717e21c8684e5 100644 (file)
--- a/EVE/alice-macros/tof_digits_strips.C
+++ b/EVE/alice-macros/tof_digits_strips.C
@@ -28,7 +28,7 @@ void tof_digits_strips(Int_t selectedSector=-1)
 
  // Int_t nDigitsInVolume[3] = {-1, -1, -1};
   Int_t nStrips=19;
-  TGeoManager *localGeoManager = gEve->GetGeometry("./geometry.root");//  gGeoManager = gEve->GetDefaultGeometry();
+  TGeoManager *localGeoManager = AliEveEventManager::AssertGeometry();//gEve->GetGeometry("./geometry.root");
 
   if (!localGeoManager) {
     printf("ERROR: no TGeo\n");

diff --git a/EVE/alice-macros/tof_raw.C b/EVE/alice-macros/tof_raw.C
index a26e8791c60dad9eb70bddbe8d7c7402c5ca09ab..2cf471041d9b5897f40f214917318bbbf96f2bfa 100644 (file)
--- a/EVE/alice-macros/tof_raw.C
+++ b/EVE/alice-macros/tof_raw.C
@@ -23,7 +23,7 @@ void tof_raw(Int_t newDecoder = 2)
 
   TClonesArray *array = 0x0;
 
-  TGeoManager *localGeoManager = gEve->GetDefaultGeometry();
+  TGeoManager *localGeoManager = AliEveEventManager::AssertGeometry();
   if (!localGeoManager) {
     printf("ERROR: no TGeo\n");
   }

diff --git a/EVE/alice-macros/trd_qaRec.C b/EVE/alice-macros/trd_qaRec.C
index 692d8ce7de48457f0b140382d24f12122a56b41a..def686659b11a2d8adc3edea8fa556bd078eb542 100644 (file)
--- a/EVE/alice-macros/trd_qaRec.C
+++ b/EVE/alice-macros/trd_qaRec.C
@@ -20,7 +20,8 @@
 void trd_qaRec()
 {
   gSystem->Load("libANALYSIS.so");
-  gSystem->Load("libTRDqaRec.so");
+  gSystem->Load("libTENDER.so");
+  gSystem->Load("libPWGPP.so");
 
   if(!TFile::Open("TRD.DebugInfoGen.root")){
     printf("No debug file for InfoGen task.\n");