In AliEveEventManager::AssertGeometry() remove a hack to bypass

geometry locking. This is now properly handled in TEveManager.
Call DefaultColors() on newly imported geometries.

Replace old, backup geometry alice-data/alice_fullgeo.root with a
recent one (colors sanitized manually). Register it as default
geometry in alieve initialization.

In geometry macros use the default geometry.

Weed-out all references to obsolete environment var REVESYS.

Fix raw-data macros for PMD and TOF so that they use
AliEveEventManager to get their hands on a raw-reader.

diff --git a/EVE/EveBase/AliEveEventManager.cxx b/EVE/EveBase/AliEveEventManager.cxx
index 2d163c507e0c39b3fdcdcb4724058b98e0c2f89b..05a7affe261d5e6fcf8eafbae6522178ca4b3182 100644 (file)
--- a/EVE/EveBase/AliEveEventManager.cxx
+++ b/EVE/EveBase/AliEveEventManager.cxx
@@ -513,13 +513,7 @@ TGeoManager* AliEveEventManager::AssertGeometry()
       ::Warning(kEH, "mismatch of alignable volumes. Proceeding.");
       // throw (kEH + "could not apply align objs.");
     }
-
-    // @@NEWROOT@@ Temporary fix.
-    // In AliEve several simplified geometries can be loaded at a later stage.
-    // Locking/unlocking is now handled properly in
-    // TEveManager::GetGeometry() but we're waiting for next root
-    // version due on 14.5.2008.
-    TGeoManager::UnlockGeometry();
+    AliGeomManager::GetGeometry()->DefaultColors();
   }
 
   gGeoManager = AliGeomManager::GetGeometry();

diff --git a/EVE/EveDet/AliEveTOFSector.cxx b/EVE/EveDet/AliEveTOFSector.cxx
index 9a0986bf51bef3f51570f220153149cfe257456d..d335cf8c37a0e39aadf99c603363af2f790b1e18 100644 (file)
--- a/EVE/EveDet/AliEveTOFSector.cxx
+++ b/EVE/EveDet/AliEveTOFSector.cxx
@@ -46,7 +46,7 @@ AliEveTOFSector::AliEveTOFSector(const Text_t* n, const Text_t* t) :
   for (Int_t ii=0; ii<5; ii++) fPlateFlag[ii]=kTRUE;
 
 
-  //fGeoManager = (TGeoManager*)gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  //fGeoManager = AliEveEventManager::AssertGeometry();
   if (!fGeoManager) {
     printf("ERROR: no TGeo\n");
   }

diff --git a/EVE/EveDet/AliEveTOFStrip.cxx b/EVE/EveDet/AliEveTOFStrip.cxx
index b788482ea5653ffb8b042ad4edadf73d0865fa66..1b28febd7c594f45acdfe05294254a4b896000d8 100644 (file)
--- a/EVE/EveDet/AliEveTOFStrip.cxx
+++ b/EVE/EveDet/AliEveTOFStrip.cxx
@@ -35,7 +35,7 @@ AliEveTOFStrip::AliEveTOFStrip(const Text_t* n, const Text_t* t) :
   fGeoManager(0)
 {
 
-  //fGeoManager = (TGeoManager*)gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  //fGeoManager = AliEveEventManager::AssertGeometry();
   if (!fGeoManager) printf("ERROR: no TGeo\n");
 
 }

diff --git a/EVE/alice-data/alice_fullgeo.root b/EVE/alice-data/alice_fullgeo.root
index a6213b3252e9a0f94c4ec16ddacd6e69e0719abc..81037661c06d8cef3f85bc21e3715bb447525bf6 100644 (file)
Binary files a/EVE/alice-data/alice_fullgeo.root and b/EVE/alice-data/alice_fullgeo.root differ

diff --git a/EVE/alice-macros/emcal_all.C b/EVE/alice-macros/emcal_all.C
index 79b7e7f1c5bbdb15f995eeb4ff0a911c2ae80eba..b515a749ad81a187ac0b7bae6451a9e3ba76dec5 100644 (file)
--- a/EVE/alice-macros/emcal_all.C
+++ b/EVE/alice-macros/emcal_all.C
@@ -51,7 +51,7 @@ void emcal_all(const UInt_t evtNum = 0, Bool_t digFile = 0,
   TTree* dt = rl->GetTreeD("EMCAL",false);
   TTree *rt = rl->GetTreeR("EMCAL",false);
 
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("XEN1_1");
   TGeoHMatrix* m = gGeoManager->GetCurrentMatrix();
   emcal_data = new AliEveEMCALData(rl,node,m);

diff --git a/EVE/alice-macros/emcal_digits.C b/EVE/alice-macros/emcal_digits.C
index d594c82f2fad5ba16c65357deb17c5080fb3604c..836bced5b048add02253b888e75c087da787e749 100644 (file)
--- a/EVE/alice-macros/emcal_digits.C
+++ b/EVE/alice-macros/emcal_digits.C
@@ -18,7 +18,7 @@ void emcal_digits()
   rl->LoadDigits("EMCAL");
   TTree* dt = rl->GetTreeD("EMCAL", kFALSE);
 
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("XEN1_1");
 
   TGeoBBox* bbbox = (TGeoBBox*) node->GetDaughter(0) ->GetVolume()->GetShape();

diff --git a/EVE/alice-macros/geom_all.C b/EVE/alice-macros/geom_all.C
index ffed6dd04e10d3cdbb2463caa8e9ddce5bc8f99d..0ad115b242c40e94345157d6fc6c5bf8b60d8a97 100644 (file)
--- a/EVE/alice-macros/geom_all.C
+++ b/EVE/alice-macros/geom_all.C
@@ -9,7 +9,7 @@
 
 void geom_all()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
 
   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 588bbe39c1231fc36d109333d166af2d2403a466..43ea6f506b3f81199b35385d1a4aec3a5813e61f 100644 (file)
--- a/EVE/alice-macros/geom_ddip.C
+++ b/EVE/alice-macros/geom_ddip.C
@@ -9,7 +9,8 @@
 
 void geom_ddip()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
+
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("DDIP_1");
 
   TEveGeoTopNode* re = new TEveGeoTopNode(gGeoManager, node);

diff --git a/EVE/alice-macros/geom_emcal.C b/EVE/alice-macros/geom_emcal.C
index 95ccebda182e637e2257992bb19bfaef5715b06e..6da499facd2475c51f1ca59911fb4d8db6a80ef3 100644 (file)
--- a/EVE/alice-macros/geom_emcal.C
+++ b/EVE/alice-macros/geom_emcal.C
@@ -9,7 +9,8 @@
 
 void geom_emcal()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
+
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("XEN1_1");
 
   TEveGeoTopNode* emcal_re = new TEveGeoTopNode(gGeoManager, node);

diff --git a/EVE/alice-macros/geom_gentle.C b/EVE/alice-macros/geom_gentle.C
index 09430a5e94b8eae90b0b5e0f2db7ad08ab91b44d..232f1f2fd220e5400dd63e9b99b5e879250a7709 100644 (file)
--- a/EVE/alice-macros/geom_gentle.C
+++ b/EVE/alice-macros/geom_gentle.C
@@ -9,7 +9,7 @@
 
 TEveGeoShape* geom_gentle()
 {
-  TFile f("$REVESYS/alice-data/gentle_geo.root");
+  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
   TEveGeoShape* gsre = TEveGeoShape::ImportShapeExtract(gse);
   gEve->AddGlobalElement(gsre);

diff --git a/EVE/alice-macros/geom_gentle_trd.C b/EVE/alice-macros/geom_gentle_trd.C
index efbe1bfcc2e313e1d328628f7aac2c4c82a0fa4f..e9f6cce9404f70beaf4e2ac1f36e426b1641eb27 100644 (file)
--- a/EVE/alice-macros/geom_gentle_trd.C
+++ b/EVE/alice-macros/geom_gentle_trd.C
@@ -9,7 +9,7 @@
 
 TEveGeoShape* geom_gentle_trd()
 {
-  TFile f("$REVESYS/alice-data/gentle_geo_trd.root");
+  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo_trd.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle TRD");
   TEveGeoShape* gsre = TEveGeoShape::ImportShapeExtract(gse);
   gEve->AddGlobalElement(gsre);

diff --git a/EVE/alice-macros/geom_hmpid.C b/EVE/alice-macros/geom_hmpid.C
index 7c980e694136cf3ba64cb2035e50f2d72e39fc16..48ee52cf2fadefa8797c6235072e1ae086ab7d46 100644 (file)
--- a/EVE/alice-macros/geom_hmpid.C
+++ b/EVE/alice-macros/geom_hmpid.C
@@ -9,7 +9,7 @@
 
 void geom_hmpid()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
 
   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 3e64e41922a067744f4ef595a33b0ed786622457..c62a661dca3a5f7df349dabc46b45c1cdfe61d94 100644 (file)
--- a/EVE/alice-macros/geom_its.C
+++ b/EVE/alice-macros/geom_its.C
@@ -9,7 +9,8 @@
 
 void geom_its()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
+
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("ITSV_1");
 
   TEveGeoTopNode* its_re = new TEveGeoTopNode(gGeoManager, node);

diff --git a/EVE/alice-macros/geom_phos.C b/EVE/alice-macros/geom_phos.C
index 93ce62c1011002dd7701e9c33d034fc55fec0aa7..e8b395a40d57fe1cfc72a8e956dc2119a03d1241 100644 (file)
--- a/EVE/alice-macros/geom_phos.C
+++ b/EVE/alice-macros/geom_phos.C
@@ -9,7 +9,7 @@
 
 void geom_phos()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
 
   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 c6e9839e9dcaf8e982917e45d97362ad901f8356..43dc09cee8987395ab10c3d0e05a717b32c7d1db 100644 (file)
--- a/EVE/alice-macros/geom_pmd.C
+++ b/EVE/alice-macros/geom_pmd.C
@@ -9,7 +9,7 @@
 
 void geom_pmd()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
 
   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_simple.C b/EVE/alice-macros/geom_simple.C
index 1b6c0ae0688adae9437df60f8c4ddd43440d77de..9b2fb053e70c2424fb36ee0837053d9bd2fea40f 100644 (file)
--- a/EVE/alice-macros/geom_simple.C
+++ b/EVE/alice-macros/geom_simple.C
@@ -9,7 +9,7 @@
 
 void geom_simple()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/simple_geo.root");
+  gGeoManager = gEve->GetGeometry("$ALICE_ROOT/EVE/alice-data/simple_geo.root");
 
   TEveGeoTopNode* topn_re = new TEveGeoTopNode(gGeoManager, gGeoManager->GetTopNode());
   gEve->AddGlobalElement(topn_re);

diff --git a/EVE/alice-macros/geom_t0.C b/EVE/alice-macros/geom_t0.C
index d2fe16c80a15aeedadba9f1ac907fbcbb53f2672..9fcdd907d4faa54ba91fa950c52d3143feba6ccf 100644 (file)
--- a/EVE/alice-macros/geom_t0.C
+++ b/EVE/alice-macros/geom_t0.C
@@ -9,7 +9,7 @@
 
 void geom_t0()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
 
   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 7bdb14aec96c9cc3f235c07d7359f0707db46dbb..66cfee2382710264cba3596d5105abf917071a3a 100644 (file)
--- a/EVE/alice-macros/geom_tpc.C
+++ b/EVE/alice-macros/geom_tpc.C
@@ -9,7 +9,8 @@
 
 void geom_tpc()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
+
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("TPC_M_1");
 
   TEveGeoTopNode* tpc_re = new TEveGeoTopNode(gGeoManager, node);

diff --git a/EVE/alice-macros/geom_trd_tof.C b/EVE/alice-macros/geom_trd_tof.C
index 2b2d6b23c081e46b2659cdd01cdd2bd3f179059f..53244210be4fcebb7aeb2c74ca1fb75f40ffc26c 100644 (file)
--- a/EVE/alice-macros/geom_trd_tof.C
+++ b/EVE/alice-macros/geom_trd_tof.C
@@ -9,7 +9,8 @@
 
 void geom_trd_tof()
 {
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
+
   TGeoNode* node = gGeoManager->GetTopVolume()->FindNode("B077_1");
 
   TEveGeoTopNode* its_re = new TEveGeoTopNode(gGeoManager, node);

diff --git a/EVE/alice-macros/geom_vzero.C b/EVE/alice-macros/geom_vzero.C
index 05ba6166f21aef21bbc11f067eaefccab6749599..9c9965580e963f7a92a08177011e8d8726c43dab 100644 (file)
--- a/EVE/alice-macros/geom_vzero.C
+++ b/EVE/alice-macros/geom_vzero.C
@@ -11,7 +11,7 @@ void geom_vzero()
 {
   static const TEveException kEH("geom_vzero() ");
 
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetDefaultGeometry();
 
   TEveElementList* list = new TEveElementList("VZero");
   gEve->AddGlobalElement(list);

diff --git a/EVE/alice-macros/pmd_raw.C b/EVE/alice-macros/pmd_raw.C
index d0715d9b655571642e8f28699e22760142ac0d89..56d5d3689e73839a29ee99042da984c15ff84d82 100644 (file)
--- a/EVE/alice-macros/pmd_raw.C
+++ b/EVE/alice-macros/pmd_raw.C
@@ -9,6 +9,8 @@
 // ---------------------------------------------------------------------- //
 void pmd_raw(Int_t mode = 0)
 {
+  AliRawReader *reader = AliEveEventManager::AssertRawReader();
+
   gStyle->SetPalette(1, 0);
 
 
@@ -19,9 +21,7 @@ void pmd_raw(Int_t mode = 0)
   TString sddl;
   TString bsddl="DDL";
 
-  Int_t ievt = 0;
-  AliRawReaderRoot reader("raw.root",ievt);
-  AliPMDRawStream stream(&reader);
+  AliPMDRawStream stream(reader);
 
   gEve->DisableRedraw();
 
@@ -86,13 +86,13 @@ void pmd_raw(Int_t mode = 0)
 
       Int_t iddl = -1;
 
-      while ((iddl = rawStream.DdlData(&pmdddlcont)) >=0) {
+      while ((iddl = stream.DdlData(pmdddlcont)) >=0) {
          if (iddl >= istartDDL && iddl < iendDDL){
              sddl = bsddl;
              sddl += iddl;
              TEveElementList* lddl = new TEveElementList(sddl.Data());
              //  l->SetMainColor(3);
-             gEve->AddElement(ddl, lplane);
+             lplane->AddElement(lddl);
              
              modnumber = iddl*6;
              
@@ -110,7 +110,7 @@ void pmd_raw(Int_t mode = 0)
                  AliEvePMDModule *lmodule = new AliEvePMDModule();
                  lmodule->SetPosition(0.,0.,zpos);
                  lmodule->DisplayRawData(modnumber,pmdddlcont);
-                 gEve->AddElement(lmodule, lddl);
+                 lddl->AddElement(lmodule);
                  modnumber++;
                  if (iddl == 4 && modnumber == 30) modnumber = 42;
              }
@@ -118,10 +118,8 @@ void pmd_raw(Int_t mode = 0)
              pmdddlcont->Clear();
          }
       }
-      
-      gEve->EnableRedraw();
     }
-  
+  gEve->EnableRedraw();
 }
 // ---------------------------------------------------------------------- //
   

diff --git a/EVE/alice-macros/tof_digits.C b/EVE/alice-macros/tof_digits.C
index 7694eaebad5ec36de7d28e8e4d94c15d357c6d5d..1e167e17bbc5c42ebdb3a33417715832328ffabc 100644 (file)
--- a/EVE/alice-macros/tof_digits.C
+++ b/EVE/alice-macros/tof_digits.C
@@ -12,7 +12,7 @@ void tof_digits()
 {  
   TClonesArray *array = 0x0;
 
-  TGeoManager *localGeoManager = (TGeoManager*)gEve->GetGeometry("./geometry.root");//"$REVESYS/alice-data/alice_fullgeo.root");
+  TGeoManager *localGeoManager = gEve->GetGeometry("./geometry.root");//  gGeoManager = gEve->GetDefaultGeometry();
   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 079f9f644af9c9366793e0645a35724533f7ce81..90ac7bc4f2cda4611ccf61536fb4cadcd50fd3c7 100644 (file)
--- a/EVE/alice-macros/tof_digits_sector.C
+++ b/EVE/alice-macros/tof_digits_sector.C
@@ -10,7 +10,7 @@
 void tof_digits_sector(Int_t sector=0)
 {
   
-  TGeoManager *localGeoManager = (TGeoManager*)gEve->GetGeometry("./geometry.root");//"$REVESYS/alice-data/alice_fullgeo.root");
+  TGeoManager *localGeoManager = gEve->GetGeometry("./geometry.root");//  gGeoManager = gEve->GetDefaultGeometry();
   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 fa6ae130c2e1c7283663ad08982f59cf259d4e6f..6be8c4b74528c7d2ca5b61cfd783f5b6826af751 100644 (file)
--- a/EVE/alice-macros/tof_digits_strips.C
+++ b/EVE/alice-macros/tof_digits_strips.C
@@ -13,7 +13,8 @@ void tof_digits_strips(Int_t selectedSector=-1)
 
   Int_t nDigitsInVolume[3] = {-1, -1, -1};
   Int_t nStrips=19;
-  TGeoManager *localGeoManager = (TGeoManager*)gEve->GetGeometry("./geometry.root");//"$REVESYS/alice-data/alice_fullgeo.root");
+  TGeoManager *localGeoManager = gEve->GetGeometry("./geometry.root");//  gGeoManager = gEve->GetDefaultGeometry();
+
   if (!localGeoManager) {
     printf("ERROR: no TGeo\n");
   }

diff --git a/EVE/alice-macros/tof_raw.C b/EVE/alice-macros/tof_raw.C
index a409fff44ee94577da0ae7a2a285b3aff5df01bc..b64b59bc9caa0bce62621cce0d3d6cb967e0914c 100644 (file)
--- a/EVE/alice-macros/tof_raw.C
+++ b/EVE/alice-macros/tof_raw.C
@@ -1,50 +1,16 @@
-void tof_raw(const char *input = "raw.root",
-            const char *geometry = "geometry.root",
-            Int_t  event = 0,
-            Bool_t newDecoder = kFALSE)
+void tof_raw(Bool_t newDecoder = kFALSE)
 {
+  AliRawReader *rawReader = AliEveEventManager::AssertRawReader();
 
   TClonesArray *array = 0x0;
 
-  if (gSystem->AccessPathName(input, kReadPermission))
-  {
-    Error("tof_raw", "file '%s' not found.", input);
-    return;
-  }
-
-  TGeoManager *localGeoManager = (TGeoManager*)gEve->GetGeometry(geometry);
+  TGeoManager *localGeoManager = gEve->GetDefaultGeometry();
   if (!localGeoManager) {
     printf("ERROR: no TGeo\n");
   }
 
-  AliRawReader *rawReader = NULL;
-  TString fileName(input);
-  if (fileName.EndsWith("/")) {
-    rawReader = new AliRawReaderFile(fileName);
-  } else if (fileName.EndsWith(".root")) {
-    rawReader = new AliRawReaderRoot(fileName);
-  } else if (!fileName.IsNull()) {
-    rawReader = new AliRawReaderDate(fileName);
-    rawReader->SelectEvents(7);
-  }
-
   AliEveTOFDigitsInfo* di = new AliEveTOFDigitsInfo();
-
-  for (Int_t ev=0; rawReader->NextEvent(); ev++) {
-    if (ev==event) {
-
-      if (di) {
-       di->Delete();
-       di = new AliEveTOFDigitsInfo();
-      }
-
-      di->ReadRaw(rawReader, newDecoder);
-      continue;
-    }
-
-    else continue;
-
-  }
+  di->ReadRaw(rawReader, newDecoder);
 
   AliTOFGeometry* g = new AliTOFGeometry();
  
@@ -67,5 +33,4 @@ void tof_raw(const char *input = "raw.root",
   }
 
   gEve->EnableRedraw();
-
 }

diff --git a/EVE/alieve_main/alieve_main.cxx b/EVE/alieve_main/alieve_main.cxx
index 940547f049a7a0ce81a0cdaeeee5887a99970672..563b161a961e11255af23ba2b37e123997ca4f68 100644 (file)
--- a/EVE/alieve_main/alieve_main.cxx
+++ b/EVE/alieve_main/alieve_main.cxx
@@ -24,25 +24,26 @@ int main(int argc, char **argv)
 {
   static const TEveException kEH("alieve::main");
 
-  if (gSystem->Getenv("REVESYS") == 0) {
-    if (gSystem->Getenv("ALICE_ROOT") != 0) {
-      Info(kEH.Data(), "setting REVESYS from ALICE_ROOT.");
-      gSystem->Setenv("REVESYS", Form("%s/EVE", gSystem->Getenv("ALICE_ROOT")));
-    } else {
-      Error(kEH.Data(), "REVESYS not defined, neither is ALICE_ROOT.");
-      gSystem->Exit(1);
-    }
+  if (gSystem->Getenv("ALICE_ROOT") == 0)
+  {
+    Error(kEH.Data(), "ALICE_ROOT is not defined, aborting.");
+    gSystem->Exit(1);
   }
-  if (gSystem->AccessPathName(gSystem->Getenv("REVESYS")) == kTRUE) {
-    Error(kEH.Data(), "REVESYS '%s' does not exist.", gSystem->Getenv("REVESYS"));
+
+  TString evedir(Form("%s/EVE", gSystem->Getenv("ALICE_ROOT")));
+
+  if (gSystem->AccessPathName(evedir) == kTRUE)
+  {
+    Error(kEH.Data(), "Directory $ALICE_ROOT/EVE does not exist.");
     gSystem->Exit(1);
   }
 
   TString macPath(gROOT->GetMacroPath());
-  macPath += Form(":%s/macros", gSystem->Getenv("REVESYS"));
-  gInterpreter->AddIncludePath(gSystem->Getenv("REVESYS"));
-  if (gSystem->Getenv("ALICE_ROOT") != 0) {
-    macPath += Form(":%s/alice-macros", gSystem->Getenv("REVESYS"));
+  macPath += Form(":%s/macros", evedir.Data());
+  gInterpreter->AddIncludePath(evedir);
+  if (gSystem->Getenv("ALICE_ROOT") != 0)
+  {
+    macPath += Form(":%s/alice-macros", evedir.Data());
     gInterpreter->AddIncludePath(Form("%s/EVE", gSystem->Getenv("ALICE_ROOT")));
     gInterpreter->AddIncludePath(Form("%s/include", gSystem->Getenv("ALICE_ROOT")));
     gInterpreter->AddIncludePath(gSystem->Getenv("ALICE_ROOT"));
@@ -56,6 +57,8 @@ int main(int argc, char **argv)
 
   TEveManager::Create();
 
+  gEve->RegisterGeometryAlias("Default", Form("%s/alice-data/alice_fullgeo.root", evedir.Data()));
+
   app.Run(); // Never returns.
 
   delete log;

diff --git a/EVE/hlt-macros/geom_hlt.C b/EVE/hlt-macros/geom_hlt.C
index 515ec59fdc5ff5fee9afeaba815f14db210af173..2b93099684a33c8853fb25b6edecc8772a86a8b9 100644 (file)
--- a/EVE/hlt-macros/geom_hlt.C
+++ b/EVE/hlt-macros/geom_hlt.C
@@ -22,7 +22,7 @@
 
 TEveGeoShape* geom_hlt()
 {
-  TFile f("$REVESYS/alice-data/gentle_geo.root");
+  TFile f("$ALICE_ROOT/EVE/alice-data/gentle_geo.root");
   TEveGeoShapeExtract* gse = (TEveGeoShapeExtract*) f.Get("Gentle");
   TEveGeoShape* gsre = TEveGeoShape::ImportShapeExtract(gse, 0);
   f.Close();

diff --git a/EVE/macros/alieve_init.C b/EVE/macros/alieve_init.C
index 09f3873701ab140e2b48f208e7342a2a502ab176..a82d3f827907f9e3b93add964570877cfe38f219 100644 (file)
--- a/EVE/macros/alieve_init.C
+++ b/EVE/macros/alieve_init.C
@@ -49,7 +49,7 @@ void alieve_init_import_macros()
   // Put macros in the list of browsables, add a macro browser to
   // top-level GUI.
 
-  TString macdir("$(REVESYS)/alice-macros");
+  TString macdir("$(ALICE_ROOT)/EVE/alice-macros");
   gSystem->ExpandPathName(macdir);
 
   TFolder* f = gEve->GetMacroFolder();

diff --git a/EVE/test-macros/geom_extr_trd.C b/EVE/test-macros/geom_extr_trd.C
index 5f6cdaddcbc6451ddb43cb343a1acd10b247ed85..a1c8172f671b95fe02b5fa465daf11ff6c1cf903 100644 (file)
--- a/EVE/test-macros/geom_extr_trd.C
+++ b/EVE/test-macros/geom_extr_trd.C
@@ -12,7 +12,7 @@ void geom_extr_trd()
   // Extract reasonably top-level mother-volumes of TRD and
   // store them as geo-shape-extract.
 
-  gGeoManager = gEve->GetGeometry("$REVESYS/alice-data/alice_fullgeo.root");
+  gGeoManager = gEve->GetGeometry("$ALICE_ROOT/EVE/alice-data/alice_fullgeo.root");
 
   TGeoNode* tnode = gGeoManager->GetTopVolume()->FindNode("B077_1");