AliEveEventManager

[u/mrichter/AliRoot.git] / EVE / macros / alieve_init.C

diff --git a/EVE/macros/alieve_init.C b/EVE/macros/alieve_init.C
index 3efea1650556bfab74b90eb3e0214ec42ed27e42..93584fa4d7d68d51e8a4ee27e7e45b67a1e3d590 100644 (file)
--- a/EVE/macros/alieve_init.C
+++ b/EVE/macros/alieve_init.C
@@ -32,15 +32,16 @@ void alieve_init(const Text_t* path   = ".", Int_t event=0,
 
   AliEveEventManager::SetESDFileName(esdfile);
   AliEveEventManager::SetRawFileName(rawfile);
-  AliEveEventManager::SetAssertElements(assert_runloader, assert_esd, assert_raw);
   AliEveEventManager::SetCdbUri(cdburi);
+  AliEveEventManager::SetAssertElements(assert_runloader, assert_esd, assert_raw);
 
   // Open event
-  if(path != 0)
+  if (path != 0)
   {
     Info("alieve_init", "Opening event %d from '%s' ...", event, path);
-    gAliEveEvent = new AliEveEventManager(path, event);
-    gEve->AddEvent(gAliEveEvent);
+    TString name("Event"); // CINT has trouble with direct "Event".
+    new AliEveEventManager(name, path, event);
+    gEve->AddEvent(AliEveEventManager::GetMaster());
   }
 }
 
@@ -54,14 +55,15 @@ void alieve_init_import_macros()
 
   TFolder* f = gEve->GetMacroFolder();
   void* dirhandle = gSystem->OpenDirectory(macdir.Data());
-  if(dirhandle != 0) {
+  if (dirhandle != 0)
+  {
     char* filename;
     TPRegexp re("\.C$");
     std::list<string> names;
-    while((filename = gSystem->GetDirEntry(dirhandle)) != 0) {
-      if(re.Match(filename)) {
+    while ((filename = gSystem->GetDirEntry(dirhandle)) != 0)
+    {
+      if (re.Match(filename))
        names.push_back(filename);
-      }
     }
     names.sort();
     //PH The line below is replaced waiting for a fix in Root