X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EVE%2Falice-macros%2Fgeom_emcal.C;h=29e9b0e37d4c39fca7146b11403f5871f645051e;hb=e3300604235737260fe4d7b31fc0761e8a960afc;hp=f14e91c0d5304a96170743ce19e6fca470165c84;hpb=d810d0de85db24ed8bd73f51aad50e97da98c374;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EVE/alice-macros/geom_emcal.C b/EVE/alice-macros/geom_emcal.C
index f14e91c0d53..29e9b0e37d4 100644
--- a/EVE/alice-macros/geom_emcal.C
+++ b/EVE/alice-macros/geom_emcal.C
@@ -4,14 +4,28 @@
 /**************************************************************************
  * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
  * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
- * full copyright notice.                                                 * 
+ * full copyright notice.                                                 *
  **************************************************************************/
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+#include <TGeoManager.h>
+#include <TGeoNode.h>
+#include <TEveManager.h>
+#include <TEveGeoNode.h>
+
+#include <AliEveEventManager.h>
+#endif
+
 void geom_emcal()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
-  TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("XEN1_1");
+  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();